Fix initial configuration of RLS mode (#277)

Author: KalitaAlexey

src/components/configuration/Rustup.ts

@@ -36,7 +36,7 @@ export class Rustup {
     /**
      * Components received by invoking rustup
      */
-    private components: { [toolchain: string]: string[] };
+    private components: { [toolchain: string]: string[] | undefined };
 
     /**
      * Toolchains received by invoking rustup
@@ -321,6 +321,10 @@ export class Rustup {
             return false;
         }
         const components = this.components[nightlyToolchain.toString(true, false)];
+        if (!components) {
+            logger.error('no components');
+            return false;
+        }
         const rlsComponent = components.find(component => component.startsWith(Rustup.getRlsComponentName()));
         if (!rlsComponent) {
             return false;
@@ -373,6 +377,10 @@ export class Rustup {
             return false;
         }
         const components = this.components[nightlyToolchain.toString(true, false)];
+        if (!components) {
+            logger.error('no components');
+            return false;
+        }
         const component: string | undefined = components.find(c => c.startsWith(Rustup.getRustAnalysisComponentName()));
         if (!component) {
             return false;
@@ -517,6 +525,9 @@ export class Rustup {
     private getInstalledComponents(toolchain: Toolchain): string[] {
         const toolchainAsString = toolchain.toString(true, false);
         const components = this.components[toolchainAsString];
+        if (!components) {
+            return [];
+        }
         const installedComponents = components.filter(component => {
             return component.endsWith(Rustup.getSuffixForInstalledComponent());
         });

src/extension.ts

@@ -66,7 +66,6 @@ async function askPermissionToInstall(what: string): Promise<boolean> {
  */
 async function handleMissingNightlyToolchain(logger: ChildLogger, rustup: Rustup): Promise<boolean> {
     const functionLogger = logger.createChildLogger('handleMissingNightlyToolchain: ');
-    await window.showInformationMessage('The nightly toolchain is not installed, but is required to install RLS');
     const permissionGranted = await askPermissionToInstall('the nightly toolchain');
     functionLogger.debug(`permissionGranted=${permissionGranted}`);
     if (!permissionGranted) {
@@ -78,7 +77,12 @@ async function handleMissingNightlyToolchain(logger: ChildLogger, rustup: Rustup
     if (!toolchainInstalled) {
         return false;
     }
-    await rustup.updateComponents(<Toolchain>Toolchain.parse('nightly'));
+    const nightlyToolchain = rustup.getNightlyToolchain(functionLogger);
+    if (!nightlyToolchain) {
+        functionLogger.error('the nightly toolchain has not been installed');
+        return false;
+    }
+    await rustup.updateComponents(nightlyToolchain);
     return true;
 }