Fix restartLS command disposal (#18993)

microsoft · Apr 25, 2022 · 707e8b6 · 707e8b6
1 parent 4e20c2b
commit 707e8b6
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/client/activation/node/manager.ts b/src/client/activation/node/manager.ts
@@ -35,18 +35,21 @@ export class NodeLanguageServerManager implements ILanguageServerManager {
 
     private started = false;
 
+    private static commandDispose: IDisposable;
+
     constructor(
         private readonly serviceContainer: IServiceContainer,
         private readonly analysisOptions: ILanguageServerAnalysisOptions,
         private readonly languageServerProxy: ILanguageServerProxy,
         commandManager: ICommandManager,
         private readonly extensions: IExtensions,
     ) {
-        this.disposables.push(
-            commandManager.registerCommand(Commands.RestartLS, () => {
-                this.restartLanguageServer().ignoreErrors();
-            }),
-        );
+        if (NodeLanguageServerManager.commandDispose) {
+            NodeLanguageServerManager.commandDispose.dispose();
+        }
+        NodeLanguageServerManager.commandDispose = commandManager.registerCommand(Commands.RestartLS, () => {
+            this.restartLanguageServer().ignoreErrors();
+        });
     }
 
     private static versionTelemetryProps(instance: NodeLanguageServerManager) {
@@ -59,6 +62,7 @@ export class NodeLanguageServerManager implements ILanguageServerManager {
         if (this.languageProxy) {
             this.languageProxy.dispose();
         }
+        NodeLanguageServerManager.commandDispose.dispose();
         this.disposables.forEach((d) => d.dispose());
     }