Update language client to 7.0.0 to adopt LSP 3.16 features

Signed-off-by: Jinbo Wang <[email protected]>

package.json

@@ -1065,7 +1065,7 @@
     "mocha": "^8.1.1",
     "ts-loader": "^5.3.1",
     "tslint": "^5.11.0",
-    "typescript": "^3.7.3",
+    "typescript": "^4.2.4",
     "typescript-tslint-plugin": "^0.3.1",
     "vscode-test": "^1.4.0",
     "webpack": "^5.28.0",
@@ -1077,7 +1077,7 @@
     "fmtr": "^1.1.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.3",
-    "vscode-languageclient": "6.0.0-next.9",
+    "vscode-languageclient": "7.0.0",
     "winreg-utf8": "^0.1.1",
     "winston": "^3.2.1",
     "winston-daily-rotate-file": "^3.10.0"

src/documentSymbols.ts

@@ -5,9 +5,9 @@ import {
     DocumentSymbol,
     DocumentSymbolParams,
     DocumentSymbolRequest,
-    LanguageClient,
     SymbolInformation
 } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 import { getActiveLanguageClient } from "./extension";
 
 type DocumentSymbolsResponse = DocumentSymbol[] | SymbolInformation[] | null;

src/extension.ts

@@ -5,7 +5,8 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as fse from 'fs-extra';
 import { workspace, extensions, ExtensionContext, window, commands, ViewColumn, Uri, languages, IndentAction, InputBoxOptions, Selection, Position, EventEmitter, OutputChannel, TextDocument, RelativePattern, ConfigurationTarget, WorkspaceConfiguration, env, UIKind } from 'vscode';
-import { ExecuteCommandParams, ExecuteCommandRequest, LanguageClient, LanguageClientOptions, RevealOutputChannelOn, ErrorHandler, Message, ErrorAction, CloseAction, DidChangeConfigurationNotification, CancellationToken } from 'vscode-languageclient';
+import { ExecuteCommandParams, ExecuteCommandRequest, LanguageClientOptions, RevealOutputChannelOn, ErrorHandler, Message, ErrorAction, CloseAction, DidChangeConfigurationNotification, CancellationToken } from 'vscode-languageclient';
+import { LanguageClient } from 'vscode-languageclient/node';
 import { collectJavaExtensions } from './plugin';
 import { prepareExecutable } from './javaServerStarter';
 import * as requirements from './requirements';

src/fileEventHandler.ts

@@ -3,7 +3,7 @@
 import { lstatSync } from 'fs-extra';
 import * as path from 'path';
 import { workspace, FileCreateEvent, ExtensionContext, window, TextDocument, SnippetString, commands, Uri, FileRenameEvent, ProgressLocation, WorkspaceEdit as CodeWorkspaceEdit, FileWillRenameEvent, Position, FileType, ConfigurationTarget, Disposable } from 'vscode';
-import { LanguageClient, WorkspaceEdit as LsWorkspaceEdit } from 'vscode-languageclient';
+import { LanguageClient } from 'vscode-languageclient/node';
 import { ListCommandResult } from './buildpath';
 import { Commands } from './commands';
 import { WillRenameFiles } from './protocol';

src/goToDefinition.ts

@@ -5,9 +5,9 @@ import {
 	Location,
 	LocationLink,
 	DefinitionParams,
-	DefinitionRequest,
-	LanguageClient,
+	DefinitionRequest
 } from 'vscode-languageclient';
+import { LanguageClient } from 'vscode-languageclient/node';
 import { getActiveLanguageClient } from './extension';
 
 type GoToDefinitionResponse = Location | Location[] | LocationLink[] | null;

src/hoverAction.ts

@@ -1,7 +1,8 @@
 'use strict';
 
 import { HoverProvider, CancellationToken, Hover, Position, TextDocument, MarkdownString, MarkedString, Command } from "vscode";
-import { LanguageClient, TextDocumentPositionParams, HoverRequest } from "vscode-languageclient";
+import { TextDocumentPositionParams, HoverRequest } from "vscode-languageclient";
+import { LanguageClient } from 'vscode-languageclient/node';
 import { Commands as javaCommands } from "./commands";
 import { FindLinks } from "./protocol";
 import { provideHoverCommandFn } from "./extension.api";

src/javaServerStarter.ts

@@ -4,7 +4,7 @@ import * as net from 'net';
 import * as glob from 'glob';
 import * as os from 'os';
 import * as fs from 'fs';
-import { StreamInfo, Executable, ExecutableOptions } from 'vscode-languageclient';
+import { StreamInfo, Executable, ExecutableOptions } from 'vscode-languageclient/node';
 import { RequirementsData } from './requirements';
 import { getJavaEncoding, IS_WORKSPACE_VMARGS_ALLOWED, getKey, getJavaagentFlag } from './settings';
 import { logger } from './log';

src/pasteAction.ts

@@ -1,7 +1,8 @@
 'use strict';
 
 import { commands, env, ExtensionContext, Range, TextEditor, window } from 'vscode';
-import { LanguageClient } from 'vscode-languageclient';
+import { LanguageClient } from 'vscode-languageclient/node';
+
 import { Commands } from './commands';
 
 export function registerCommands(languageClient: LanguageClient, context: ExtensionContext) {