Merge pull request #943 from BetterThanTomorrow/fix/orphaned_lsp_proc…

…esses Fix orphaned lsp processes
BetterThanTomorrow · Jan 12, 2021 · 55495af · 55495af
2 parents b26879b + 57b359d
commit 55495af
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Changes to Calva.
 
 ## [Unreleased]
 - Fix: [calva.jackInEnv does not resolve `${env:...}`](https://github.com/BetterThanTomorrow/calva/issues/933)
+- Update clojure-lsp to version 2021.01.12-02.18.26. Fix: [clojure-lsp processes left running/orphaned if VS Code is closed while the lsp server is starting](https://github.com/BetterThanTomorrow/calva/issues/906)
 
 ## [2.0.148] - 2021-01-07
 - Update clojure-lsp to version 2021.01.07-20.02.02

diff --git a/clojure-lsp.jar b/clojure-lsp.jar
diff --git a/download-lsp.js b/download-lsp.js
@@ -1,7 +1,7 @@
 const { createWriteStream } = require('fs');
 const { https } = require('follow-redirects');
 
-const clojureLspVersion = '2021.01.07-20.02.02';
+const clojureLspVersion = '2021.01.12-02.18.26';
 const fileName = "./clojure-lsp.jar"
 
 const file = createWriteStream(fileName);

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/extension.ts b/src/extension.ts
@@ -310,12 +310,12 @@ function activate(context: vscode.ExtensionContext) {
     }
 }
 
-async function deactivate() {
+function deactivate(): Promise<void> | undefined {
     state.analytics().logEvent("LifeCycle", "Deactivated").send();
     jackIn.calvaJackout();
     paredit.deactivate();
     if (lspClient) {
-        await lspClient.stop();
+        return lspClient.stop();
     }
 }
 

diff --git a/src/lsp.ts b/src/lsp.ts
@@ -192,7 +192,7 @@ function activate(context: vscode.ExtensionContext): LanguageClient {
     }, (_progress, _token) => {
         return client.onReady();
     });
-    context.subscriptions.push(client.start());
+    client.start();
 
     // The title of this command is dictated by clojure-lsp and is executed when the user clicks the references code lens above a symbol
     context.subscriptions.push(vscode.commands.registerCommand('code-lens-references', async (_, line, character) => {