Merge pull request #252 from cgavalos/async-stop

Deactivate VSCode extension asynchronously
tgjones · Jul 30, 2023 · 3cb3e76 · 3cb3e76
2 parents 3638d7f + 1cb6692
commit 3cb3e76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/ShaderTools.VSCode/src/main.ts b/src/ShaderTools.VSCode/src/main.ts
@@ -8,4 +8,8 @@ var sessionManager: SessionManager = undefined;
 export function activate(context: vscode.ExtensionContext): void {
     context.subscriptions.push(sessionManager = new SessionManager());
     sessionManager.start();
+}
+
+export function deactivate(): Promise<void> {
+    return sessionManager.stop();
 }
diff --git a/src/ShaderTools.VSCode/src/session.ts b/src/ShaderTools.VSCode/src/session.ts
@@ -35,7 +35,7 @@ export class SessionManager {
         this.startEditorServices();
     }
 
-    public stop() {
+    public stop(): Promise<void> {
         if (this.sessionStatus === SessionStatus.Failed) {
             // Before moving further, clear out the client and process if
             // the process is already dead (i.e. it crashed)
@@ -44,13 +44,17 @@ export class SessionManager {
 
         this.sessionStatus = SessionStatus.Stopping;
 
+        var promise = Promise.resolve();
+
         // Close the language server client
         if (this.languageServerClient !== undefined) {
-            this.languageServerClient.stop();
+            promise = this.languageServerClient.stop();
             this.languageServerClient = undefined;
         }
 
         this.sessionStatus = SessionStatus.NotStarted;
+
+        return promise;
     }
 
     public dispose() : void {