added xml.restart.language.server command

package.json

@@ -94,7 +94,7 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
     "path-exists": "^4.0.0",
-    "vscode-languageclient": "^7.0.0",
+    "vscode-languageclient": "^8.0.1",
     "yauzl": "^2.10.0"
   },
   "contributes": {
@@ -613,6 +613,11 @@
         "command": "xml.command.bind.grammar",
         "title": "Bind to grammar/schema file",
         "category": "XML"
+      },
+      {
+        "command": "xml.restart.language.server",
+        "title": "Restart Language Server",
+        "category": "XML"
       }
     ],
     "menus": {

src/client/clientErrorHandler.ts

@@ -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 { ClientCommandConstants } from "../commands/commandConstants";
 import { HEAP_DUMP_LOCATION } from "../server/java/jvmArguments";
 import { Telemetry } from "../telemetry";
@@ -28,11 +28,13 @@ 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{
     this.restarts.push(Date.now());
     const heapProfileGlob = new glob.GlobSync(`${this.heapDumpFolder}/java_*.hprof`);
     if (heapProfileGlob.found.length) {
@@ -44,18 +46,26 @@ export class ClientErrorHandler implements ErrorHandler {
       cleanUpHeapDumps(this.context);
       Telemetry.sendTelemetry(Telemetry.JAVA_OOM_EVT, { 'jvm.xmx': getXmxFromSettings() });
       showOOMMessage();
-      return CloseAction.DoNotRestart;
+      return {
+        action: CloseAction.DoNotRestart
+      }
     }
     if (this.restarts.length < 5) {
-      return CloseAction.Restart;
+      return {
+        action: CloseAction.Restart
+      }
     } else {
       const diff = this.restarts[this.restarts.length - 1] - this.restarts[0];
       if (diff <= 10 * 60 * 1000) {
         window.showErrorMessage(`The ${this.name} language server crashed 5 times in the last 10 minutes. The server will not be restarted.`);
-        return CloseAction.DoNotRestart;
+        return {
+          action: CloseAction.DoNotRestart
+        }
       }
       this.restarts.shift();
-      return CloseAction.Restart;
+      return {
+        action: CloseAction.Restart
+      }
     }
   }
 

src/client/xmlClient.ts

@@ -44,8 +44,7 @@ export async function startLanguageClient(context: ExtensionContext, executable:
     return Telemetry.sendTelemetry(e.name, e.properties);
   });
 
-  context.subscriptions.push(languageClient.start());
-  await languageClient.onReady();
+  await languageClient.start();
 
   // ---
 
@@ -145,8 +144,7 @@ function getLanguageClientOptions(
         },
         actionableNotificationSupport: true,
         openSettingsCommandSupport: true,
-        bindingWizardSupport: true,
-        shouldLanguageServerExitOnShutdown: true
+        bindingWizardSupport: true
       }
     },
     errorHandler: new ClientErrorHandler('XML', context),
@@ -157,8 +155,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/commands/commandConstants.ts

@@ -74,6 +74,11 @@ export namespace ClientCommandConstants {
    * Client command to execute an XML command on XML Language Server side.
    */
   export const EXECUTE_WORKSPACE_COMMAND = 'xml.workspace.executeCommand';
+
+  /**
+   * Command to restart connection to language server.
+   */
+  export const RESTART_LANGUAGE_SERVER = 'xml.restart.language.server';
 }
 
 /**

src/commands/registerCommands.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { commands, ExtensionContext, OpenDialogOptions, Position, QuickPickItem, Uri, window, workspace, WorkspaceEdit, Disposable, ConfigurationTarget, TextDocument, WorkspaceFolder } from "vscode";
+import { commands, ExtensionContext, OpenDialogOptions, Position, QuickPickItem, Uri, window, workspace, WorkspaceEdit, ConfigurationTarget, TextDocument } from "vscode";
 import { CancellationToken, ExecuteCommandParams, ExecuteCommandRequest, ReferencesRequest, TextDocumentIdentifier, TextDocumentEdit } from "vscode-languageclient";
 import { LanguageClient } from 'vscode-languageclient/node';
 import { markdownPreviewProvider } from "../markdownPreviewProvider";
@@ -28,6 +28,7 @@ export async function registerClientServerCommands(context: ExtensionContext, la
   registerCodeLensReferencesCommands(context, languageClient);
   registerValidationCommands(context);
   registerAssociationCommands(context, languageClient);
+  registerRestartLanguageServerCommand(context, languageClient);
 
   // Register client command to execute custom XML Language Server command
   context.subscriptions.push(commands.registerCommand(ClientCommandConstants.EXECUTE_WORKSPACE_COMMAND, (command, ...rest) => {
@@ -322,4 +323,16 @@ async function checkCanBindGrammar(documentURI: Uri) {
   }
 
   return result
-}
+}
+
+/**
+ * Register command to restart the connection to the language server
+ *
+ * @param context the extension context
+ * @param languageClient the language client
+ */
+function registerRestartLanguageServerCommand(context: ExtensionContext, languageClient: LanguageClient) {
+  context.subscriptions.push(commands.registerCommand(ClientCommandConstants.RESTART_LANGUAGE_SERVER, async () => {
+    languageClient.restart();
+  }));
+}

src/extension.ts

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