update language client to 8.0.2

Signed-off-by: Shi Chen <[email protected]>

Author: CsCherrYY

package-lock.json

@@ -1414,7 +1414,7 @@
     "htmlparser2": "6.0.1",
     "jdk-utils": "^0.4.4",
     "semver": "^7.3.5",
-    "vscode-languageclient": "8.0.0-next.4",
+    "vscode-languageclient": "^8.0.2",
     "winreg-utf8": "^0.1.1",
     "winston": "^3.2.1",
     "winston-daily-rotate-file": "^3.10.0"

package.json

@@ -1,5 +1,5 @@
 import { window, commands } from "vscode";
-import { ErrorHandler, Message, ErrorAction, CloseAction } from "vscode-languageclient";
+import { ErrorHandler, Message, ErrorAction, CloseAction, ErrorHandlerResult, CloseHandlerResult } from "vscode-languageclient";
 import { Commands } from "./commands";
 import { logger } from "./log";
 
@@ -10,21 +10,27 @@ export class ClientErrorHandler implements ErrorHandler {
 		this.restarts = [];
 	}
 
-	public error(_error: Error, _message: Message, count: number): ErrorAction {
+	public error(_error: Error, _message: Message, count: number): ErrorHandlerResult {
 		if (count && count <= 3) {
 			logger.error(`${this.name} server encountered error: ${_message}, ${_error && _error.toString()}`);
-			return ErrorAction.Continue;
+			return {
+				action: ErrorAction.Continue
+			};
 		}
 
 		logger.error(`${this.name} server encountered error and will shut down: ${_message}, ${_error && _error.toString()}`);
-		return ErrorAction.Shutdown;
+		return {
+			action: ErrorAction.Shutdown
+		};
 	}
 
-	public closed(): CloseAction {
+	public closed(): CloseHandlerResult {
 		this.restarts.push(Date.now());
 		if (this.restarts.length < 5) {
 			logger.error(`The ${this.name} server crashed and will restart.`);
-			return CloseAction.Restart;
+			return {
+				action: CloseAction.Restart
+			};
 		} else {
 			const diff = this.restarts[this.restarts.length - 1] - this.restarts[0];
 			if (diff <= 3 * 60 * 1000) {
@@ -36,12 +42,16 @@ export class ClientErrorHandler implements ErrorHandler {
 						commands.executeCommand(Commands.OPEN_LOGS);
 					}
 				});
-				return CloseAction.DoNotRestart;
+				return {
+					action: CloseAction.DoNotRestart
+				};
 			}
 
 			logger.error(`The ${this.name} server crashed and will restart.`);
 			this.restarts.shift();
-			return CloseAction.Restart;
+			return {
+				action: CloseAction.Restart
+			};
 		}
 	}
 }

src/clientErrorHandler.ts

@@ -6,7 +6,7 @@ import * as fse from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
 import { CodeActionContext, CodeActionTriggerKind, commands, ConfigurationTarget, Diagnostic, env, EventEmitter, ExtensionContext, extensions, IndentAction, InputBoxOptions, languages, RelativePattern, TextDocument, UIKind, Uri, ViewColumn, window, workspace, WorkspaceConfiguration } from 'vscode';
-import { CancellationToken, CodeActionParams, CodeActionRequest, Command, DidChangeConfigurationNotification, ExecuteCommandParams, ExecuteCommandRequest, LanguageClientOptions, RevealOutputChannelOn } from 'vscode-languageclient';
+import { CancellationToken, CodeActionParams, CodeActionRequest, Command, DidChangeConfigurationNotification, ExecuteCommandParams, ExecuteCommandRequest, LanguageClientOptions, RevealOutputChannelOn, State } from 'vscode-languageclient';
 import { LanguageClient } from 'vscode-languageclient/node';
 import { apiManager } from './apiManager';
 import { ClientErrorHandler } from './clientErrorHandler';
@@ -184,12 +184,12 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 					},
 					// https://github.com/redhat-developer/vscode-java/issues/2130
 					// include all diagnostics for the current line in the CodeActionContext params for the performance reason
-					provideCodeActions: (document, range, context, token, next) => {
+					provideCodeActions: async (document, range, context, token, next) => {
 						const client: LanguageClient = standardClient.getClient();
 						const params: CodeActionParams = {
 							textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
 							range: client.code2ProtocolConverter.asRange(range),
-							context: client.code2ProtocolConverter.asCodeActionContext(context)
+							context: await client.code2ProtocolConverter.asCodeActionContext(context)
 						};
 						const showAt  = getJavaConfiguration().get<string>("quickfix.showAt");
 						if (showAt === 'line' && range.start.line === range.end.line && range.start.character === range.end.character) {
@@ -210,7 +210,7 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 									only: context.only,
 									triggerKind: context.triggerKind,
 								};
-								params.context = client.code2ProtocolConverter.asCodeActionContext(codeActionContext);
+								params.context = await client.code2ProtocolConverter.asCodeActionContext(codeActionContext);
 							}
 						}
 						return client.sendRequest(CodeActionRequest.type, params, token).then((values) => {
@@ -248,13 +248,15 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 			// no need to pass `resolve` into any code past this point,
 			// since `resolve` is a no-op from now on
 
+			const serverOptions = prepareExecutable(requirements, syntaxServerWorkspacePath, getJavaConfig(requirements.java_home), context, true);
 			if (requireSyntaxServer) {
 				if (process.env['SYNTAXLS_CLIENT_PORT']) {
 					syntaxClient.initialize(requirements, clientOptions);
 				} else {
-					syntaxClient.initialize(requirements, clientOptions, prepareExecutable(requirements, syntaxServerWorkspacePath, getJavaConfig(requirements.java_home), context, true));
+					syntaxClient.initialize(requirements, clientOptions, serverOptions);
 				}
-				syntaxClient.start();
+				await syntaxClient.start();
+				syntaxClient.registerSyntaxClientActions(resolve, serverOptions);
 				serverStatusBarProvider.showLightWeightStatus();
 			}
 
@@ -429,7 +431,8 @@ async function startStandardServer(context: ExtensionContext, requirements: requ
 		apiManager.fireDidServerModeChange(ServerMode.hybrid);
 	}
 	await standardClient.initialize(context, requirements, clientOptions, workspacePath, jdtEventEmitter);
-	standardClient.start();
+	await standardClient.start();
+	standardClient.registerLanguageClientActions(context, await fse.pathExists(path.join(workspacePath, ".metadata", ".plugins")), jdtEventEmitter);
 	serverStatusBarProvider.showStandardStatus();
 }
 
@@ -527,12 +530,10 @@ export async function getActiveLanguageClient(): Promise<LanguageClient | undefi
 		languageClient = syntaxClient.getClient();
 	}
 
-	if (!languageClient) {
+	if (!languageClient || languageClient.state !== State.Running) {
 		return undefined;
 	}
 
-	await languageClient.onReady();
-
 	return languageClient;
 }
 

src/extension.ts

@@ -94,7 +94,7 @@ class PasteEditProvider implements DocumentPasteEditProvider {
 			if (pasteResponse) {
 				return {
 					insertText: pasteResponse.insertText,
-					additionalEdit: pasteResponse.additionalEdit ? this.languageClient.protocol2CodeConverter.asWorkspaceEdit(pasteResponse.additionalEdit) : undefined
+					additionalEdit: pasteResponse.additionalEdit ? await this.languageClient.protocol2CodeConverter.asWorkspaceEdit(pasteResponse.additionalEdit) : undefined
 				} as VDocumentPasteEdit;
 			}
 		} catch (e) {

src/pasteEventHandler.ts

@@ -214,7 +214,7 @@ async function applyRefactorEdit(languageClient: LanguageClient, refactorEdit: R
     }
 
     if (refactorEdit.edit) {
-        const edit = languageClient.protocol2CodeConverter.asWorkspaceEdit(refactorEdit.edit);
+        const edit = await languageClient.protocol2CodeConverter.asWorkspaceEdit(refactorEdit.edit);
         if (edit) {
             await workspace.applyEdit(edit);
         }

src/refactorAction.ts

@@ -385,7 +385,7 @@ function registerGenerateDelegateMethodsCommand(languageClient: LanguageClient,
 }
 
 async function revealWorkspaceEdit(workspaceEdit: WorkspaceEdit, languageClient: LanguageClient): Promise<void> {
-    const codeWorkspaceEdit = languageClient.protocol2CodeConverter.asWorkspaceEdit(workspaceEdit);
+    const codeWorkspaceEdit = await languageClient.protocol2CodeConverter.asWorkspaceEdit(workspaceEdit);
     if (!codeWorkspaceEdit) {
         return;
     }