diff --git a/CHANGELOG.md b/CHANGELOG.md index b170a864..b93a2672 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [2.1.0] - 2020-08-XX - Upcoming release +- [#44](https://github.com/estruyf/vscode-front-matter/issues/45): Added article creation command +- [#45](https://github.com/estruyf/vscode-front-matter/issues/45): WSL support added - [#46](https://github.com/estruyf/vscode-front-matter/issues/46): Make the tag pickers render in full width ## [2.0.1] - 2020-07-27 diff --git a/src/commands/Folders.ts b/src/commands/Folders.ts index 17351c3d..1f553c0a 100644 --- a/src/commands/Folders.ts +++ b/src/commands/Folders.ts @@ -3,7 +3,6 @@ import { CONFIG_KEY, EXTENSION_NAME, SETTINGS_CONTENT_FOLDERS } from "../constan import { basename } from "path"; import { ContentFolder } from "../models"; import uniqBy = require("lodash.uniqby"); -import { VscodeCollapsible } from "@bendera/vscode-webview-elements/dist/vscode-collapsible"; import { Template } from "./Template"; export class Folders { diff --git a/src/extension.ts b/src/extension.ts index fe8c2b60..70be28e9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -73,14 +73,26 @@ export async function activate({ subscriptions, extensionUri }: vscode.Extension triggerShowDraftStatus(); }); - // Register project folders - const registerFolder = vscode.commands.registerCommand(`frontMatter.registerFolder`, Folders.register); + // Register project folders + const registerFolder = vscode.commands.registerCommand(`frontMatter.registerFolder`, Folders.register); - const unregisterFolder = vscode.commands.registerCommand(`frontMatter.unregisterFolder`, Folders.unregister); + const unregisterFolder = vscode.commands.registerCommand(`frontMatter.unregisterFolder`, Folders.unregister); - const createContent = vscode.commands.registerCommand(`frontMatter.createContent`, Folders.create); + const createContent = vscode.commands.registerCommand(`frontMatter.createContent`, Folders.create); - Folders.updateVsCodeCtx(); + try { + const allPaths = await vscode.commands.executeCommand("_workbench.getRecentlyOpened"); + + console.log(vscode.window.activeTextEditor?.document.uri) + console.log(vscode.Uri.parse(`vscode-remote:///home`)) + + console.log(`remoteName`, vscode.env.remoteName); + console.log(`appRoot`, vscode.env.appRoot); + } catch (e) { + console.log(e?.message || e) + } + + Folders.updateVsCodeCtx(); // Create the status bar frontMatterStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 100); diff --git a/src/webview/ExplorerView.ts b/src/webview/ExplorerView.ts index 9c7b8cc2..736c2147 100644 --- a/src/webview/ExplorerView.ts +++ b/src/webview/ExplorerView.ts @@ -111,7 +111,11 @@ export class ExplorerView implements WebviewViewProvider, Disposable { commands.executeCommand('workbench.action.openSettings', '@ext:eliostruyf.vscode-front-matter'); break; case CommandToCode.openFile: - commands.executeCommand('revealFileInOS'); + if (os.type() === "Linux" && vscodeEnv.remoteName?.toLowerCase() === "wsl") { + commands.executeCommand('remote-wsl.revealInExplorer'); + } else { + commands.executeCommand('revealFileInOS'); + } break; case CommandToCode.runCustomScript: this.runCustomScript(msg); @@ -124,6 +128,8 @@ export class ExplorerView implements WebviewViewProvider, Disposable { exec(`open ${wsPath}`); } else if (os.type() === "Windows_NT") { exec(`explorer ${wsPath}`); + } else if (os.type() === "Linux" && vscodeEnv.remoteName?.toLowerCase() === "wsl") { + exec('explorer.exe `wslpath -w "$PWD"`'); } else { exec(`xdg-open ${wsPath}`); }