Merge pull request #460 from rescript-lang/upgrade-lsp

Upgrade LSP related packages

Author: zth

client/package-lock.json

@@ -7,6 +7,6 @@
   "author": "chenglou",
   "license": "MIT",
   "dependencies": {
-    "vscode-languageclient": "^7.0.0"
+    "vscode-languageclient": "^8.0.1"
   }
 }

client/package.json

@@ -12,6 +12,7 @@ import {
   LanguageClient,
   LanguageClientOptions,
   ServerOptions,
+  State,
   TransportKind,
 } from "vscode-languageclient/node";
 
@@ -113,19 +114,23 @@ export function activate(context: ExtensionContext) {
     // compilation has finished, and the most reliable source for that is the LS
     // server, that already keeps track of when the compiler finishes in order to
     // other provide fresh diagnostics.
-    client.onReady().then(() => {
-      context.subscriptions.push(
-        client.onNotification("rescript/compilationFinished", () => {
-          if (inCodeAnalysisState.active === true) {
-            customCommands.codeAnalysisWithReanalyze(
-              inCodeAnalysisState.activatedFromDirectory,
-              diagnosticsCollection,
-              diagnosticsResultCodeActions
-            );
-          }
-        })
-      );
-    });
+    context.subscriptions.push(
+      client.onDidChangeState(({ newState }) => {
+        if (newState === State.Running) {
+          context.subscriptions.push(
+            client.onNotification("rescript/compilationFinished", () => {
+              if (inCodeAnalysisState.active === true) {
+                customCommands.codeAnalysisWithReanalyze(
+                  inCodeAnalysisState.activatedFromDirectory,
+                  diagnosticsCollection,
+                  diagnosticsResultCodeActions
+                );
+              }
+            })
+          );
+        }
+      })
+    );
 
     return client;
   }
@@ -223,12 +228,12 @@ export function activate(context: ExtensionContext) {
   commands.registerCommand("rescript-vscode.restart_language_server", () => {
     client.stop().then(() => {
       client = createLanguageClient();
-      context.subscriptions.push(client.start());
+      client.start();
     });
   });
 
   // Start the client. This will also launch the server
-  context.subscriptions.push(client.start());
+  client.start();
 
   // Autostart code analysis if wanted
   if (

client/src/extension.ts

@@ -21,7 +21,7 @@
 		"language-server"
 	],
 	"engines": {
-		"vscode": "^1.55.0"
+		"vscode": "^1.68.0"
 	},
 	"activationEvents": [
 		"onLanguage:rescript"
@@ -164,7 +164,7 @@
 	},
 	"devDependencies": {
 		"@types/node": "^14.14.41",
-		"@types/vscode": "1.55.0",
-		"typescript": "^4.2.4"
+		"@types/vscode": "1.68.0",
+		"typescript": "^4.7.3"
 	}
 }