Fix stop/start support for Rust Analyzer

Author: Xanewok

src/extension.ts

@@ -200,8 +200,6 @@ export class ClientWorkspace {
   }
 
   public async start() {
-    this._progress.value = { state: 'progress', message: 'Starting' };
-
     const { createLanguageClient, setupClient, setupProgress } =
       this.config.engine === 'rls' ? rls : rustAnalyzer;
 
@@ -218,6 +216,15 @@ export class ClientWorkspace {
       rustAnalyzer: { releaseTag: '2020-05-04' },
     });
 
+    client.onDidChangeState(({ newState }) => {
+      if (newState === lc.State.Starting) {
+        this._progress.value = { state: 'progress', message: 'Starting' };
+      }
+      if (newState === lc.State.Stopped) {
+        this._progress.value = { state: 'standby' };
+      }
+    });
+
     setupProgress(client, this._progress);
 
     this.disposables.push(activateTaskProvider(this.folder));
@@ -230,8 +237,6 @@ export class ClientWorkspace {
   public async stop() {
     if (this.lc) {
       await this.lc.stop();
-      this.lc = null;
-      this._progress.value = { state: 'standby' };
     }
 
     this.disposables.forEach(d => d.dispose());

src/rustAnalyzer.ts

@@ -226,30 +226,28 @@ export async function createLanguageClient(
 }
 
 async function setupGlobalProgress(client: lc.LanguageClient) {
-  client.onDidChangeState(({ newState }) => {
+  client.onDidChangeState(async ({ newState }) => {
     if (newState === lc.State.Starting) {
-      PROGRESS.value = { state: 'progress', message: 'Starting' };
+      await client.onReady();
+
+      const RUST_ANALYZER_PROGRESS = 'rustAnalyzer/startup';
+      client.onProgress(
+        new lc.ProgressType<{
+          kind: 'begin' | 'report' | 'end';
+          message?: string;
+        }>(),
+        RUST_ANALYZER_PROGRESS,
+        ({ kind, message: msg }) => {
+          if (kind === 'report') {
+            PROGRESS.value = { state: 'progress', message: msg || '' };
+          }
+          if (kind === 'end') {
+            PROGRESS.value = { state: 'ready' };
+          }
+        },
+      );
     }
   });
-
-  await client.onReady();
-
-  const RUST_ANALYZER_PROGRESS = 'rustAnalyzer/startup';
-  client.onProgress(
-    new lc.ProgressType<{
-      kind: 'begin' | 'report' | 'end';
-      message?: string;
-    }>(),
-    RUST_ANALYZER_PROGRESS,
-    ({ kind, message: msg }) => {
-      if (kind === 'report') {
-        PROGRESS.value = { state: 'progress', message: msg || '' };
-      }
-      if (kind === 'end') {
-        PROGRESS.value = { state: 'ready' };
-      }
-    },
-  );
 }
 
 export function setupClient(