Update vscode-languageclient to 7.0.0

This allows for `textDocument/linkedEditingRange` to be used. Replaces #426 Signed-off-by: David Thompson <[email protected]>
redhat-developer · Apr 16, 2021 · c248ffb · c248ffb
1 parent 70cad4d
commit c248ffb
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
     "path-exists": "^4.0.0",
-    "vscode-languageclient": "^5.2.1",
+    "vscode-languageclient": "^7.0.0",
     "yauzl": "^2.10.0"
   },
   "contributes": {

diff --git a/src/api/xmlExtensionApiImplementation.ts b/src/api/xmlExtensionApiImplementation.ts
@@ -1,4 +1,4 @@
-import { DidChangeConfigurationNotification, LanguageClient } from "vscode-languageclient";
+import { DidChangeConfigurationNotification, LanguageClient } from "vscode-languageclient/node";
 import { ExternalXmlSettings } from "../settings/externalXmlSettings";
 import { getXMLSettings, onConfigurationChange } from "../settings/settings";
 import { RequirementsData } from "../server/requirements";

diff --git a/src/client/xmlClient.ts b/src/client/xmlClient.ts
@@ -1,6 +1,6 @@
 import { TelemetryEvent } from '@redhat-developer/vscode-redhat-telemetry/lib';
 import { commands, ExtensionContext, extensions, Position, TextDocument, TextEditor, Uri, window, workspace } from 'vscode';
-import { Command, ConfigurationParams, ConfigurationRequest, DidChangeConfigurationNotification, Executable, ExecuteCommandParams, LanguageClient, LanguageClientOptions, MessageType, NotificationType, RequestType, RevealOutputChannelOn, TextDocumentPositionParams } from "vscode-languageclient";
+import { Command, ConfigurationParams, ConfigurationRequest, DidChangeConfigurationNotification, Executable, ExecuteCommandParams, LanguageClient, LanguageClientOptions, MessageType, NotificationType, RequestType, RevealOutputChannelOn, TextDocumentPositionParams } from "vscode-languageclient/node";
 import { XMLFileAssociation } from '../api/xmlExtensionApi';
 import { CommandConstants } from '../commands/commandConstants';
 import { registerCommands } from '../commands/registerCommands';
@@ -14,11 +14,11 @@ import { ClientErrorHandler } from './clientErrorHandler';
 import { activateTagClosing, AutoCloseResult } from './tagClosing';
 
 namespace ExecuteClientCommandRequest {
-  export const type: RequestType<ExecuteCommandParams, any, void, void> = new RequestType('xml/executeClientCommand');
+  export const type: RequestType<ExecuteCommandParams, any, void> = new RequestType('xml/executeClientCommand');
 }
 
 namespace TagCloseRequest {
-  export const type: RequestType<TextDocumentPositionParams, AutoCloseResult, any, any> = new RequestType('xml/closeTag');
+  export const type: RequestType<TextDocumentPositionParams, AutoCloseResult, any> = new RequestType('xml/closeTag');
 }
 
 interface ActionableMessage {
@@ -29,7 +29,7 @@ interface ActionableMessage {
 }
 
 namespace ActionableNotification {
-  export const type = new NotificationType<ActionableMessage, void>('xml/actionableNotification');
+  export const type = new NotificationType<ActionableMessage>('xml/actionableNotification');
 }
 
 let languageClient: LanguageClient;

diff --git a/src/commands/registerCommands.ts b/src/commands/registerCommands.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { commands, ExtensionContext, Position, Uri, window, workspace } from "vscode";
-import { CancellationToken, ExecuteCommandParams, ExecuteCommandRequest, LanguageClient, ReferencesRequest, TextDocumentIdentifier } from "vscode-languageclient";
+import { CancellationToken, ExecuteCommandParams, ExecuteCommandRequest, LanguageClient, ReferencesRequest, TextDocumentIdentifier } from "vscode-languageclient/node";
 import { markdownPreviewProvider } from "../markdownPreviewProvider";
 import { CommandConstants } from "./commandConstants";
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -13,7 +13,7 @@
 import * as os from 'os';
 import * as path from 'path';
 import { ExtensionContext, extensions, languages } from "vscode";
-import { Executable, LanguageClient } from 'vscode-languageclient';
+import { Executable, LanguageClient } from 'vscode-languageclient/node';
 import { getXmlExtensionApiImplementation } from './api/xmlExtensionApiImplementation';
 import { getIndentationRules } from './client/indentation';
 import { startLanguageClient } from './client/xmlClient';

diff --git a/src/server/binary/binaryServerStarter.ts b/src/server/binary/binaryServerStarter.ts
@@ -6,7 +6,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { Readable } from 'stream';
 import { ExtensionContext, extensions, ProgressLocation, ProgressOptions, window, WorkspaceConfiguration } from "vscode";
-import { Executable } from "vscode-languageclient";
+import { Executable } from "vscode-languageclient/node";
 import * as yauzl from 'yauzl';
 import { getProxySettings, getProxySettingsAsEnvironmentVariables, ProxySettings } from '../../settings/proxySettings';
 import { getXMLConfiguration } from "../../settings/settings";

diff --git a/src/server/java/javaServerStarter.ts b/src/server/java/javaServerStarter.ts
@@ -1,7 +1,7 @@
 import * as os from 'os';
 import * as path from 'path';
 import { ExtensionContext, workspace } from 'vscode';
-import { Executable } from 'vscode-languageclient';
+import { Executable } from 'vscode-languageclient/node';
 import { RequirementsData } from '../requirements';
 import { getJavaagentFlag, getKey, getXMLConfiguration, IS_WORKSPACE_VMARGS_XML_ALLOWED, xmlServerVmargs } from '../../settings/settings';
 import { getProxySettings, getProxySettingsAsJVMArgs, ProxySettings, jvmArgsContainsProxySettings } from '../../settings/proxySettings';

diff --git a/src/server/serverStarter.ts b/src/server/serverStarter.ts
@@ -1,5 +1,5 @@
 import { commands, ConfigurationTarget, ExtensionContext, window } from "vscode";
-import { Executable } from "vscode-languageclient";
+import { Executable } from "vscode-languageclient/node";
 import { prepareBinaryExecutable, ABORTED_ERROR } from "./binary/binaryServerStarter";
 import { prepareJavaExecutable } from "./java/javaServerStarter";
 import { getOpenJDKDownloadLink, RequirementsData } from "./requirements";