revert: use workspace.name for single folder projects

lfurzewaddock · Jan 25, 2019 · a99d9a5 · a99d9a5
1 parent 7abfdd8
commit a99d9a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "vscode-wsl-workspacefolder",
   "displayName": "WSL workspaceFolder",
-  "description": "Translates `workspaceFolder` path into WSL path format.\n\nUse this where WSL format workspaceFolder path is required, e.g. 'remoteRoot' property in launch config for debug, etc.",
-  "version": "1.1.1",
+  "description": "Translates `workspaceFolder` path into WSL path format.\n\nUseful where WSL format workspaceFolder path is required, e.g. for debug 'remoteRoot' property in launch config, etc.",
+  "version": "1.1.2",
   "publisher": "lfurzewaddock",
   "icon": "public/assets/images/vscode-wsl-workspacefolder.png",
   "galleryBanner": {

diff --git a/src/directory.js b/src/directory.js
@@ -15,5 +15,6 @@ export function getWorkspaceFolderByName(workspaceFolders, workspaceFolderName)
   debug("vscode-wsl-workspacefolder:directory")(
     `getWorkspaceFolderByName workspaceFolderName: ${workspaceFolderName}`,
   );
-  return workspaceFolders.find(f => f.name.toLowerCase() === workspaceFolderName).uri.fsPath;
+  return workspaceFolders.find(f => f.name.toLowerCase() === workspaceFolderName.toLowerCase()).uri
+    .fsPath;
 }
diff --git a/src/index.js b/src/index.js
@@ -39,16 +39,18 @@ function activate(context) {
       debug("vscode-wsl-workspacefolder:index")(`env.isWin: ${vars.isWin}`);
       debug("vscode-wsl-workspacefolder:index")(`env.isWsl: ${vars.isWsl}`);
       debug("vscode-wsl-workspacefolder:index")(`env.isExtensionDebug: ${vars.isExtensionDebug}`);
-      window.showInformationMessage(`env.isLinux: ${vars.isLinux}`);
-      window.showInformationMessage(`env.isWin: ${vars.isWin}`);
-      window.showInformationMessage(`env.isWsl: ${vars.isWsl}`);
-      window.showInformationMessage(`env.isExtensionDebug: ${vars.isExtensionDebug}`);
+      // window.showInformationMessage(`env.isLinux: ${vars.isLinux}`);
+      // window.showInformationMessage(`env.isWin: ${vars.isWin}`);
+      // window.showInformationMessage(`env.isWsl: ${vars.isWsl}`);
+      // window.showInformationMessage(`env.isExtensionDebug: ${vars.isExtensionDebug}`);
 
       const { workspaceFolders } = workspace;
-      let workspaceName = args[0].name.toLowerCase();
+      let workspaceName = (Array.isArray(workspaceFolders) && workspaceFolders.length > 1)
+        ? args[0].name
+        : workspace.name;
 
       if (
-        typeof workspaceFolders.find(x => x.name.toLowerCase() === workspaceName) === "undefined"
+        typeof workspaceFolders.find(x => x.name.toLowerCase() === workspaceName.toLowerCase()) === "undefined"
       ) {
         try {
           workspaceName = await getWorkspaceFolderName();