Skip to content

Commit fd0abf5

Browse files
justinytchenJustin Chen
and
Justin Chen
authored
Update LSP Client to use new Semantic Highlighting APIs (#2861)
Co-authored-by: Justin Chen <[email protected]>
1 parent b1139e5 commit fd0abf5

12 files changed

+23
-13
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
"semver": "^7.3.2",
5353
"uuid": "^8.3.0",
5454
"vscode-extension-telemetry": "~0.1.6",
55-
"vscode-languageclient": "~6.1.3"
55+
"vscode-languageclient": "^7.0.0-next.8",
56+
"vscode-languageserver-protocol": "^3.16.0-next.6"
5657
},
5758
"devDependencies": {
5859
"@types/glob": "^7.1.3",

src/features/Console.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
*--------------------------------------------------------*/
44

55
import vscode = require("vscode");
6-
import { LanguageClient, NotificationType, RequestType } from "vscode-languageclient";
6+
import { NotificationType, RequestType } from "vscode-languageclient";
7+
import { LanguageClient } from "vscode-languageclient/node";
78
import { ICheckboxQuickPickItem, showCheckboxQuickPick } from "../controls/checkboxQuickPick";
89
import { Logger } from "../logging";
910
import Settings = require("../settings");

src/features/CustomViews.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import * as path from "path";
66
import * as vscode from "vscode";
7-
import { LanguageClient, RequestType } from "vscode-languageclient";
7+
import { RequestType } from "vscode-languageclient";
8+
import { LanguageClient } from "vscode-languageclient/node";
89
import { LanguageClientConsumer } from "../languageClientConsumer";
910

1011
export class CustomViewsFeature extends LanguageClientConsumer {

src/features/DebugSession.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import vscode = require("vscode");
66
import { CancellationToken, DebugConfiguration, DebugConfigurationProvider,
77
ExtensionContext, WorkspaceFolder } from "vscode";
8-
import { LanguageClient, NotificationType, RequestType } from "vscode-languageclient";
8+
import { NotificationType, RequestType } from "vscode-languageclient";
9+
import { LanguageClient } from "vscode-languageclient/node";
910
import { getPlatformDetails, OperatingSystem } from "../platform";
1011
import { PowerShellProcess} from "../process";
1112
import { SessionManager, SessionStatus } from "../session";

src/features/ExtensionCommands.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import * as fs from "fs";
66
import * as os from "os";
77
import * as path from "path";
88
import * as vscode from "vscode";
9-
import { LanguageClient, NotificationType, NotificationType0,
9+
import { NotificationType, NotificationType0,
1010
Position, Range, RequestType } from "vscode-languageclient";
11+
import { LanguageClient } from "vscode-languageclient/node";
1112
import { Logger } from "../logging";
1213
import Settings = require("../settings");
1314
import { LanguageClientConsumer } from "../languageClientConsumer";

src/features/GetCommands.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* Copyright (C) Microsoft Corporation. All rights reserved.
33
*--------------------------------------------------------*/
44
import * as vscode from "vscode";
5-
import { LanguageClient, RequestType0 } from "vscode-languageclient";
5+
import { RequestType0 } from "vscode-languageclient";
6+
import { LanguageClient } from "vscode-languageclient/node";
67
import { Logger } from "../logging";
78
import { LanguageClientConsumer } from "../languageClientConsumer";
89

src/features/HelpCompletion.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import { Disposable, EndOfLine, Position, Range, SnippetString,
66
TextDocument, TextDocumentChangeEvent, window, workspace } from "vscode";
7-
import { LanguageClient, RequestType } from "vscode-languageclient";
7+
import { RequestType } from "vscode-languageclient";
8+
import { LanguageClient } from "vscode-languageclient/node";
89
import { Logger } from "../logging";
910
import Settings = require("../settings");
1011
import { LanguageClientConsumer } from "../languageClientConsumer";

src/features/NewFileOrProject.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
*--------------------------------------------------------*/
44

55
import vscode = require("vscode");
6-
import { LanguageClient, RequestType } from "vscode-languageclient";
6+
import { RequestType } from "vscode-languageclient";
7+
import { LanguageClient } from "vscode-languageclient/node";
78
import { LanguageClientConsumer } from "../languageClientConsumer";
89

910
export class NewFileOrProjectFeature extends LanguageClientConsumer {

src/features/PowerShellNotebooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { EvaluateRequestType } from "./Console";
88
import { LanguageClientConsumer } from "../languageClientConsumer";
99
import Settings = require("../settings");
1010
import { ILogger } from "../logging";
11-
import { LanguageClient } from "vscode-languageclient";
11+
import { LanguageClient } from "vscode-languageclient/node";
1212

1313
export class PowerShellNotebooksFeature extends LanguageClientConsumer {
1414

src/features/UpdatePowerShell.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import * as semver from "semver";
1111
import * as stream from "stream";
1212
import * as util from "util";
1313
import { MessageItem, ProgressLocation, window } from "vscode";
14-
import { LanguageClient } from "vscode-languageclient";
14+
15+
import { LanguageClient } from "vscode-languageclient/node";
1516
import { SessionManager } from "../session";
1617
import * as Settings from "../settings";
1718
import { isMacOS, isWindows } from "../utils";

src/languageClientConsumer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*--------------------------------------------------------*/
44

55
import { window } from "vscode";
6-
import { LanguageClient } from "vscode-languageclient";
6+
import { LanguageClient } from "vscode-languageclient/node";
77

88
export abstract class LanguageClientConsumer {
99

src/session.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import Settings = require("./settings");
1515
import utils = require("./utils");
1616

1717
import {
18-
CloseAction, DocumentSelector, ErrorAction, LanguageClient, LanguageClientOptions,
18+
CloseAction, DocumentSelector, ErrorAction, LanguageClientOptions,
1919
Middleware, NotificationType, RequestType0,
20-
ResolveCodeLensSignature, RevealOutputChannelOn, StreamInfo } from "vscode-languageclient";
20+
ResolveCodeLensSignature, RevealOutputChannelOn } from "vscode-languageclient";
21+
import { LanguageClient, StreamInfo } from "vscode-languageclient/node";
2122

2223
import { GitHubReleaseInformation, InvokePowerShellUpdateCheck } from "./features/UpdatePowerShell";
2324
import {

0 commit comments

Comments
 (0)