Skip to content

Update LSP Client to work with vscode-languageclient ^7.0.0-next.8 #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"semver": "^7.3.2",
"uuid": "^8.3.0",
"vscode-extension-telemetry": "~0.1.6",
"vscode-languageclient": "~6.1.3"
"vscode-languageclient": "^7.0.0-next.8",
"vscode-languageserver-protocol": "^3.16.0-next.6"
},
"devDependencies": {
"@types/glob": "^7.1.3",
Expand Down
3 changes: 2 additions & 1 deletion src/features/Console.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*--------------------------------------------------------*/

import vscode = require("vscode");
import { LanguageClient, NotificationType, RequestType } from "vscode-languageclient";
import { NotificationType, RequestType } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { ICheckboxQuickPickItem, showCheckboxQuickPick } from "../controls/checkboxQuickPick";
import { Logger } from "../logging";
import Settings = require("../settings");
Expand Down
3 changes: 2 additions & 1 deletion src/features/CustomViews.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import * as path from "path";
import * as vscode from "vscode";
import { LanguageClient, RequestType } from "vscode-languageclient";
import { RequestType } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { LanguageClientConsumer } from "../languageClientConsumer";

export class CustomViewsFeature extends LanguageClientConsumer {
Expand Down
3 changes: 2 additions & 1 deletion src/features/DebugSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import vscode = require("vscode");
import { CancellationToken, DebugConfiguration, DebugConfigurationProvider,
ExtensionContext, WorkspaceFolder } from "vscode";
import { LanguageClient, NotificationType, RequestType } from "vscode-languageclient";
import { NotificationType, RequestType } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { getPlatformDetails, OperatingSystem } from "../platform";
import { PowerShellProcess} from "../process";
import { SessionManager, SessionStatus } from "../session";
Expand Down
3 changes: 2 additions & 1 deletion src/features/ExtensionCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import * as fs from "fs";
import * as os from "os";
import * as path from "path";
import * as vscode from "vscode";
import { LanguageClient, NotificationType, NotificationType0,
import { NotificationType, NotificationType0,
Position, Range, RequestType } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { Logger } from "../logging";
import Settings = require("../settings");
import { LanguageClientConsumer } from "../languageClientConsumer";
Expand Down
3 changes: 2 additions & 1 deletion src/features/GetCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
* Copyright (C) Microsoft Corporation. All rights reserved.
*--------------------------------------------------------*/
import * as vscode from "vscode";
import { LanguageClient, RequestType0 } from "vscode-languageclient";
import { RequestType0 } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { Logger } from "../logging";
import { LanguageClientConsumer } from "../languageClientConsumer";

Expand Down
3 changes: 2 additions & 1 deletion src/features/HelpCompletion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import { Disposable, EndOfLine, Position, Range, SnippetString,
TextDocument, TextDocumentChangeEvent, window, workspace } from "vscode";
import { LanguageClient, RequestType } from "vscode-languageclient";
import { RequestType } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { Logger } from "../logging";
import Settings = require("../settings");
import { LanguageClientConsumer } from "../languageClientConsumer";
Expand Down
3 changes: 2 additions & 1 deletion src/features/NewFileOrProject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*--------------------------------------------------------*/

import vscode = require("vscode");
import { LanguageClient, RequestType } from "vscode-languageclient";
import { RequestType } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { LanguageClientConsumer } from "../languageClientConsumer";

export class NewFileOrProjectFeature extends LanguageClientConsumer {
Expand Down
2 changes: 1 addition & 1 deletion src/features/PowerShellNotebooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { EvaluateRequestType } from "./Console";
import { LanguageClientConsumer } from "../languageClientConsumer";
import Settings = require("../settings");
import { ILogger } from "../logging";
import { LanguageClient } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";

export class PowerShellNotebooksFeature extends LanguageClientConsumer {

Expand Down
3 changes: 2 additions & 1 deletion src/features/UpdatePowerShell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import * as semver from "semver";
import * as stream from "stream";
import * as util from "util";
import { MessageItem, ProgressLocation, window } from "vscode";
import { LanguageClient } from "vscode-languageclient";

import { LanguageClient } from "vscode-languageclient/node";
import { SessionManager } from "../session";
import * as Settings from "../settings";
import { isMacOS, isWindows } from "../utils";
Expand Down
2 changes: 1 addition & 1 deletion src/languageClientConsumer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*--------------------------------------------------------*/

import { window } from "vscode";
import { LanguageClient } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";

export abstract class LanguageClientConsumer {

Expand Down
5 changes: 3 additions & 2 deletions src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import Settings = require("./settings");
import utils = require("./utils");

import {
CloseAction, DocumentSelector, ErrorAction, LanguageClient, LanguageClientOptions,
CloseAction, DocumentSelector, ErrorAction, LanguageClientOptions,
Middleware, NotificationType, RequestType0,
ResolveCodeLensSignature, RevealOutputChannelOn, StreamInfo } from "vscode-languageclient";
ResolveCodeLensSignature, RevealOutputChannelOn } from "vscode-languageclient";
import { LanguageClient, StreamInfo } from "vscode-languageclient/node";

import { GitHubReleaseInformation, InvokePowerShellUpdateCheck } from "./features/UpdatePowerShell";
import {
Expand Down