Skip to content

Commit 9f32875

Browse files
testforstephenrgrunber
authored andcommitted
Update language client to 7.0.0 to adopt LSP 3.16 features
Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>
1 parent 22d4624 commit 9f32875

21 files changed

Lines changed: 100 additions & 73 deletions

package-lock.json

Lines changed: 39 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@
10651065
"mocha": "^8.1.1",
10661066
"ts-loader": "^5.3.1",
10671067
"tslint": "^5.11.0",
1068-
"typescript": "^3.7.3",
1068+
"typescript": "^4.2.4",
10691069
"typescript-tslint-plugin": "^0.3.1",
10701070
"vscode-test": "^1.4.0",
10711071
"webpack": "^5.28.0",
@@ -1077,7 +1077,7 @@
10771077
"fmtr": "^1.1.2",
10781078
"fs-extra": "^8.1.0",
10791079
"glob": "^7.1.3",
1080-
"vscode-languageclient": "6.0.0-next.9",
1080+
"vscode-languageclient": "7.0.0",
10811081
"winreg-utf8": "^0.1.1",
10821082
"winston": "^3.2.1",
10831083
"winston-daily-rotate-file": "^3.10.0"

src/documentSymbols.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
DocumentSymbol,
66
DocumentSymbolParams,
77
DocumentSymbolRequest,
8-
LanguageClient,
98
SymbolInformation
109
} from "vscode-languageclient";
10+
import { LanguageClient } from "vscode-languageclient/node";
1111
import { getActiveLanguageClient } from "./extension";
1212

1313
type DocumentSymbolsResponse = DocumentSymbol[] | SymbolInformation[] | null;

src/extension.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import * as os from 'os';
55
import * as fs from 'fs';
66
import * as fse from 'fs-extra';
77
import { workspace, extensions, ExtensionContext, window, commands, ViewColumn, Uri, languages, IndentAction, InputBoxOptions, Selection, Position, EventEmitter, OutputChannel, TextDocument, RelativePattern, ConfigurationTarget, WorkspaceConfiguration, env, UIKind } from 'vscode';
8-
import { ExecuteCommandParams, ExecuteCommandRequest, LanguageClient, LanguageClientOptions, RevealOutputChannelOn, ErrorHandler, Message, ErrorAction, CloseAction, DidChangeConfigurationNotification, CancellationToken } from 'vscode-languageclient';
8+
import { ExecuteCommandParams, ExecuteCommandRequest, LanguageClientOptions, RevealOutputChannelOn, ErrorHandler, Message, ErrorAction, CloseAction, DidChangeConfigurationNotification, CancellationToken } from 'vscode-languageclient';
9+
import { LanguageClient } from 'vscode-languageclient/node';
910
import { collectJavaExtensions } from './plugin';
1011
import { prepareExecutable } from './javaServerStarter';
1112
import * as requirements from './requirements';

src/fileEventHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { lstatSync } from 'fs-extra';
44
import * as path from 'path';
55
import { workspace, FileCreateEvent, ExtensionContext, window, TextDocument, SnippetString, commands, Uri, FileRenameEvent, ProgressLocation, WorkspaceEdit as CodeWorkspaceEdit, FileWillRenameEvent, Position, FileType, ConfigurationTarget, Disposable } from 'vscode';
6-
import { LanguageClient, WorkspaceEdit as LsWorkspaceEdit } from 'vscode-languageclient';
6+
import { LanguageClient } from 'vscode-languageclient/node';
77
import { ListCommandResult } from './buildpath';
88
import { Commands } from './commands';
99
import { WillRenameFiles } from './protocol';

src/goToDefinition.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
Location,
66
LocationLink,
77
DefinitionParams,
8-
DefinitionRequest,
9-
LanguageClient,
8+
DefinitionRequest
109
} from 'vscode-languageclient';
10+
import { LanguageClient } from 'vscode-languageclient/node';
1111
import { getActiveLanguageClient } from './extension';
1212

1313
type GoToDefinitionResponse = Location | Location[] | LocationLink[] | null;

src/hoverAction.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
'use strict';
22

33
import { HoverProvider, CancellationToken, Hover, Position, TextDocument, MarkdownString, MarkedString, Command } from "vscode";
4-
import { LanguageClient, TextDocumentPositionParams, HoverRequest } from "vscode-languageclient";
4+
import { TextDocumentPositionParams, HoverRequest } from "vscode-languageclient";
5+
import { LanguageClient } from 'vscode-languageclient/node';
56
import { Commands as javaCommands } from "./commands";
67
import { FindLinks } from "./protocol";
78
import { provideHoverCommandFn } from "./extension.api";

src/javaServerStarter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as net from 'net';
44
import * as glob from 'glob';
55
import * as os from 'os';
66
import * as fs from 'fs';
7-
import { StreamInfo, Executable, ExecutableOptions } from 'vscode-languageclient';
7+
import { StreamInfo, Executable, ExecutableOptions } from 'vscode-languageclient/node';
88
import { RequirementsData } from './requirements';
99
import { getJavaEncoding, IS_WORKSPACE_VMARGS_ALLOWED, getKey, getJavaagentFlag } from './settings';
1010
import { logger } from './log';

src/pasteAction.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
'use strict';
22

33
import { commands, env, ExtensionContext, Range, TextEditor, window } from 'vscode';
4-
import { LanguageClient } from 'vscode-languageclient';
4+
import { LanguageClient } from 'vscode-languageclient/node';
5+
56
import { Commands } from './commands';
67

78
export function registerCommands(languageClient: LanguageClient, context: ExtensionContext) {

0 commit comments

Comments
 (0)