Merge pull request #719 from ejgallego/code_fix_restart_async

[code] Wait for shutdown to complete before we start the client again.
ejgallego · May 17, 2024 · 5c98534 · 5c98534
2 parents 004bde6 + 970aa54
commit 5c98534
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -135,6 +135,8 @@
    the scheduler for the visible area of the document; combined with
    the new lazy checking mode, this provides checking on scroll, a
    feature inspired from Isabelle IDE (@ejgallego, #717)
+ - Have VSCode wait for full LSP client shutdown on server restart
+   (@ejgallgo, #719)
 
 # coq-lsp 0.1.8.1: Spring fix
 -----------------------------

diff --git a/editor/code/src/client.ts b/editor/code/src/client.ts
@@ -123,7 +123,7 @@ export function activateCoqLSP(
     return settings;
   }
 
-  function coqCommand(command: string, fn: () => void) {
+  function coqCommand(command: string, fn: () => void | Promise<void>) {
     let disposable = commands.registerCommand("coq-lsp." + command, fn);
     context.subscriptions.push(disposable);
   }
@@ -165,7 +165,7 @@ export function activateCoqLSP(
 
   const stop = () => {
     if (client && client.isRunning()) {
-      client
+      return client
         .dispose(2000)
         .finally(updateStatusBar)
         .finally(() => {
@@ -174,7 +174,7 @@ export function activateCoqLSP(
           perfDataHook.dispose();
           heatMap.dispose();
         });
-    }
+    } else return Promise.resolve();
   };
 
   const start = () => {
@@ -204,35 +204,36 @@ export function activateCoqLSP(
       resolve(client);
     });
 
-    cP.then((client) =>
-      client
-        .start()
-        .then(updateStatusBar)
-        .then(() => {
-          if (window.activeTextEditor) {
-            goalsCall(
-              window.activeTextEditor,
-              TextEditorSelectionChangeKind.Command
-            );
-          }
-        })
-    ).catch((error) => {
-      let emsg = error.toString();
-      console.log(`Error in coq-lsp start: ${emsg}`);
-      setFailedStatuBar(emsg);
-    });
+    return cP
+      .then((client) =>
+        client
+          .start()
+          .then(updateStatusBar)
+          .then(() => {
+            if (window.activeTextEditor) {
+              goalsCall(
+                window.activeTextEditor,
+                TextEditorSelectionChangeKind.Command
+              );
+            }
+          })
+      )
+      .catch((error) => {
+        let emsg = error.toString();
+        console.log(`Error in coq-lsp start: ${emsg}`);
+        setFailedStatuBar(emsg);
+      });
   };
 
-  const restart = () => {
-    stop();
-    start();
+  const restart = async () => {
+    await stop().finally(start);
   };
 
-  const toggle = () => {
+  const toggle = async () => {
     if (client && client.isRunning()) {
-      stop();
+      await stop();
     } else {
-      start();
+      await start();
     }
   };