Move to vscode-languageclient 8.0.1

Fixes #711

Signed-off-by: azerr <[email protected]>

Author: angelozerr

package-lock.json

@@ -89,7 +89,7 @@
     "minimist": ">=1.2.6",
     "serialize-javascript": "^4.0.0",
     "ts-loader": "^9.3.1",
-    "typescript": "^4.7.4",
+    "typescript": "^4.9.4",
     "vscode-test": "^1.2.0",
     "webpack": "^5.28.0",
     "webpack-cli": "^4.6.0"
@@ -101,7 +101,7 @@
     "glob": "^7.1.4",
     "jdk-utils": "^0.4.3",
     "path-exists": "^4.0.0",
-    "vscode-languageclient": "^7.0.0",
+    "vscode-languageclient": "^8.0.1",
     "yauzl": "^2.10.0"
   },
   "contributes": {

package.json

@@ -1,6 +1,6 @@
 import * as fs from "fs-extra";
 import { commands, ConfigurationTarget, ExtensionContext, window, workspace } from "vscode";
-import { CloseAction, ErrorAction, ErrorHandler, Message } from "vscode-languageclient";
+import { CloseAction, CloseHandlerResult, ErrorAction, ErrorHandler, ErrorHandlerResult, Message } from "vscode-languageclient";
 import * as ClientCommandConstants from "../commands/clientCommandConstants";
 import { HEAP_DUMP_LOCATION } from "../server/java/jvmArguments";
 import * as Telemetry from "../telemetry";
@@ -28,11 +28,19 @@ export class ClientErrorHandler implements ErrorHandler {
     this.heapDumpFolder = getHeapDumpFolderFromSettings() || context.globalStorageUri.fsPath;
   }
 
-  error(_error: Error, _message: Message, _count: number): ErrorAction {
-    return ErrorAction.Continue;
+  error(_error: Error, _message: Message, _count: number): ErrorHandlerResult {
+    return {
+      action: ErrorAction.Continue
+    };
   }
 
-  closed(): CloseAction {
+  closed(): CloseHandlerResult {
+    return {
+      action: this.doClosed()
+    }
+  }
+
+  doClosed(): CloseAction {
     this.restarts.push(Date.now());
     const heapProfileGlob = new glob.GlobSync(`${this.heapDumpFolder}/java_*.hprof`);
     if (heapProfileGlob.found.length) {

src/client/clientErrorHandler.ts

@@ -52,8 +52,7 @@ export async function startLanguageClient(context: ExtensionContext, executable:
     }
   });
 
-  context.subscriptions.push(languageClient.start());
-  await languageClient.onReady();
+  await languageClient.start();
 
   // ---
 
@@ -146,8 +145,7 @@ function getLanguageClientOptions(
         },
         actionableNotificationSupport: true,
         openSettingsCommandSupport: true,
-        bindingWizardSupport: true,
-        shouldLanguageServerExitOnShutdown: true
+        bindingWizardSupport: true
       }
     },
     errorHandler: new ClientErrorHandler('XML', context),
@@ -158,8 +156,9 @@ function getLanguageClientOptions(
     middleware: {
       workspace: {
         didChangeConfiguration: () => {
-          languageClient.sendNotification(DidChangeConfigurationNotification.type, { settings: getXMLSettings(requirementsData.java_home, logfile, externalXmlSettings) });
+          const result = languageClient.sendNotification(DidChangeConfigurationNotification.type, { settings: getXMLSettings(requirementsData.java_home, logfile, externalXmlSettings) });
           onConfigurationChange();
+          return result;
         }
       }
     }

src/client/xmlClient.ts

@@ -66,5 +66,6 @@ export async function activate(context: ExtensionContext): Promise<XMLExtensionA
 export async function deactivate(): Promise<void> {
   if (languageClient) {
     await languageClient.stop();
+    languageClient = undefined;
   }
 }