From b985898c0545625d5411c92b16ff1753178ea15c Mon Sep 17 00:00:00 2001 From: Justin Chen Date: Tue, 4 Aug 2020 11:52:34 -0700 Subject: [PATCH] fixed client dependencies/packages --- package.json | 3 ++- src/features/Console.ts | 3 ++- src/features/CustomViews.ts | 3 ++- src/features/DebugSession.ts | 3 ++- src/features/ExtensionCommands.ts | 3 ++- src/features/GetCommands.ts | 3 ++- src/features/HelpCompletion.ts | 3 ++- src/features/NewFileOrProject.ts | 3 ++- src/features/PowerShellNotebooks.ts | 2 +- src/features/UpdatePowerShell.ts | 3 ++- src/languageClientConsumer.ts | 2 +- src/session.ts | 5 +++-- 12 files changed, 23 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 916da39268..6462aff2fc 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/features/Console.ts b/src/features/Console.ts index e0ded7190a..7880589199 100644 --- a/src/features/Console.ts +++ b/src/features/Console.ts @@ -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"); diff --git a/src/features/CustomViews.ts b/src/features/CustomViews.ts index d0e4990de1..4613cba13a 100644 --- a/src/features/CustomViews.ts +++ b/src/features/CustomViews.ts @@ -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 { diff --git a/src/features/DebugSession.ts b/src/features/DebugSession.ts index 0b185948b8..d5b988e375 100644 --- a/src/features/DebugSession.ts +++ b/src/features/DebugSession.ts @@ -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"; diff --git a/src/features/ExtensionCommands.ts b/src/features/ExtensionCommands.ts index 7bc004482c..3579e683e6 100644 --- a/src/features/ExtensionCommands.ts +++ b/src/features/ExtensionCommands.ts @@ -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"; diff --git a/src/features/GetCommands.ts b/src/features/GetCommands.ts index a050bfbdd0..6719bbb03f 100644 --- a/src/features/GetCommands.ts +++ b/src/features/GetCommands.ts @@ -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"; diff --git a/src/features/HelpCompletion.ts b/src/features/HelpCompletion.ts index cf7cd391b3..5675d37f4a 100644 --- a/src/features/HelpCompletion.ts +++ b/src/features/HelpCompletion.ts @@ -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"; diff --git a/src/features/NewFileOrProject.ts b/src/features/NewFileOrProject.ts index 38c2649a6b..7be0ae819b 100644 --- a/src/features/NewFileOrProject.ts +++ b/src/features/NewFileOrProject.ts @@ -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 { diff --git a/src/features/PowerShellNotebooks.ts b/src/features/PowerShellNotebooks.ts index b35ce4c7bc..ea161212bc 100644 --- a/src/features/PowerShellNotebooks.ts +++ b/src/features/PowerShellNotebooks.ts @@ -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 { diff --git a/src/features/UpdatePowerShell.ts b/src/features/UpdatePowerShell.ts index f5c5e81620..84dfca4398 100644 --- a/src/features/UpdatePowerShell.ts +++ b/src/features/UpdatePowerShell.ts @@ -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"; diff --git a/src/languageClientConsumer.ts b/src/languageClientConsumer.ts index e518cc7ec6..bda7788a4d 100644 --- a/src/languageClientConsumer.ts +++ b/src/languageClientConsumer.ts @@ -3,7 +3,7 @@ *--------------------------------------------------------*/ import { window } from "vscode"; -import { LanguageClient } from "vscode-languageclient"; +import { LanguageClient } from "vscode-languageclient/node"; export abstract class LanguageClientConsumer { diff --git a/src/session.ts b/src/session.ts index 778ba26944..15aa666ac8 100644 --- a/src/session.ts +++ b/src/session.ts @@ -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 {