Make sure progress is cleared

Author: MikhailArkhipov

src/client/activation/languageServer.ts

@@ -179,6 +179,9 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
     }
 
     private async startLanguageClient(): Promise<void> {
+        if (this.progressReporting) {
+            this.progressReporting.dispose();
+        }
         this.context.subscriptions.push(this.languageClient!.start());
         await this.serverReady();
         this.progressReporting = new ProgressReporting(this.languageClient!);

src/client/activation/progress.ts

@@ -5,7 +5,7 @@ import { Progress, ProgressLocation, window } from 'vscode';
 import { Disposable, LanguageClient } from 'vscode-languageclient';
 import { createDeferred, Deferred } from '../../utils/async';
 
-export class ProgressReporting {
+export class ProgressReporting implements Disposable {
   private statusBarMessage: Disposable | undefined;
   private progress: Progress<{ message?: string; increment?: number }> | undefined;
   private progressDeferred: Deferred<void> | undefined;
@@ -19,6 +19,7 @@ export class ProgressReporting {
     });
 
     this.languageClient.onNotification('python/beginProgress', async _ => {
+      this.clearProgress();
       this.progressDeferred = createDeferred<void>();
       window.withProgress({
         location: ProgressLocation.Window,
@@ -36,11 +37,17 @@ export class ProgressReporting {
       this.progress.report({ message: m });
     });
 
-    this.languageClient.onNotification('python/endProgress', _ => {
-      if (this.progressDeferred) {
-        this.progressDeferred.resolve();
-        this.progressDeferred = undefined;
-      }
-    });
+    this.languageClient.onNotification('python/endProgress', _ => this.clearProgress());
+  }
+
+  public dispose(): void {
+    this.clearProgress();
+  }
+
+  private clearProgress(): void {
+    if (this.progressDeferred) {
+      this.progressDeferred.resolve();
+      this.progressDeferred = undefined;
+    }
   }
 }