Merge pull request #555 from Xanewok/wsl-path

Decode URL under WSL on Windows

Author: Xanewok

src/extension.ts

@@ -254,14 +254,11 @@ class ClientWorkspace {
           console.log(`code2Protocol for path ${uri.fsPath} -> ${res}`);
           return res;
         },
-        protocol2Code: (wslPath: string) => {
-          if (wslPath.startsWith('file://')) {
-            wslPath = wslPath.substr('file://'.length);
-          }
-
-          const res = Uri.file(uriWslToWindows(wslPath));
-          console.log(`protocol2Code for path ${wslPath} -> ${res.fsPath}`);
-          return res;
+        protocol2Code: (wslUri: string) => {
+          const urlDecodedPath = Uri.parse(wslUri).path;
+          const winPath = Uri.file(uriWslToWindows(urlDecodedPath));
+          console.log(`protocol2Code for path ${wslUri} -> ${winPath.fsPath}`);
+          return winPath;
         },
       };
     }

src/rustup.ts

@@ -90,9 +90,14 @@ async function hasToolchain(config: RustupConfig): Promise<boolean> {
     return stdout.includes(config.channel);
   } catch (e) {
     console.log(e);
-    // rustup not present
+    const rustupFoundButNotInWSLMode =
+      config.useWSL && (await hasRustup({ useWSL: false, ...config }));
+
     window.showErrorMessage(
-      'Rustup not available. Install from https://www.rustup.rs/',
+      rustupFoundButNotInWSLMode
+        ? `Rustup is installed but can't be found under WSL. Ensure that
+        invoking \`wsl rustup\` works correctly.`
+        : 'Rustup not available. Install from https://www.rustup.rs/',
     );
     throw e;
   }
@@ -144,6 +149,7 @@ async function hasRlsComponents(config: RustupConfig): Promise<boolean> {
   } catch (e) {
     console.log(e);
     window.showErrorMessage(`Can't detect RLS components: ${e.message}`);
+    stopSpinner("Can't detect RLS components");
     throw e;
   }
 }
@@ -218,14 +224,11 @@ export function parseActiveToolchain(rustupOutput: string): string {
   throw new Error(`couldn't find active toolchains`);
 }
 
-export async function getVersion(
-  cwd: string,
-  config: RustupConfig,
-): Promise<string> {
+export async function getVersion(config: RustupConfig): Promise<string> {
   const versionRegex = /rustup ([0-9]+\.[0-9]+\.[0-9]+)/;
   const execFile = withWsl(config.useWSL).execFile;
 
-  const output = await execFile(config.path, ['--version'], { cwd });
+  const output = await execFile(config.path, ['--version']);
   const versionMatch = output.stdout.toString().match(versionRegex);
   if (versionMatch && versionMatch.length >= 2) {
     return versionMatch[1];
@@ -234,6 +237,15 @@ export async function getVersion(
   }
 }
 
+/**
+ * Returns whether Rustup is invokable and available.
+ */
+export function hasRustup(config: RustupConfig): Promise<boolean> {
+  return getVersion(config)
+    .then(() => true)
+    .catch(() => false);
+}
+
 /**
  * Returns active (including local overrides) toolchain, as specified by rustup.
  * May throw if rustup at specified path can't be executed.

src/test/rustup.test.ts

@@ -16,7 +16,7 @@ const config: rustup.RustupConfig = {
 
 suite('Rustup Tests', () => {
   test('getVersion', async () => {
-    const version = await rustup.getVersion('.', config);
+    const version = await rustup.getVersion(config);
     assert(rustupVersion.includes(`rustup ${version}`));
   });
   test('getActiveChannel', async () => {