Skip to content

Commit ad3e641

Browse files
TylerLeonhardtTylerLeonhardt
authored
update language server client (#3047)
1 parent 1a2603a commit ad3e641

14 files changed

+644
-644
lines changed

‎package-lock.json

Lines changed: 604 additions & 604 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
@@ -55,8 +55,8 @@
5555
"semver": "^7.3.2",
5656
"uuid": "^8.3.1",
5757
"vscode-extension-telemetry": "~0.1.6",
58-
"vscode-languageclient": "^7.0.0-next.9",
59-
"vscode-languageserver-protocol": "^3.16.0-next.7"
58+
"vscode-languageclient": "^7.0.0-next.12",
59+
"vscode-languageserver-protocol": "^3.16.0-next.10"
6060
},
6161
"devDependencies": {
6262
"@types/glob": "^7.1.3",

‎src/features/Console.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ import { Logger } from "../logging";
1010
import Settings = require("../settings");
1111
import { LanguageClientConsumer } from "../languageClientConsumer";
1212

13-
export const EvaluateRequestType = new RequestType<IEvaluateRequestArguments, void, void, void>("evaluate");
14-
export const OutputNotificationType = new NotificationType<IOutputNotificationBody, void>("output");
13+
export const EvaluateRequestType = new RequestType<IEvaluateRequestArguments, void, void>("evaluate");
14+
export const OutputNotificationType = new NotificationType<IOutputNotificationBody>("output");
1515
export const ExecutionStatusChangedNotificationType =
16-
new NotificationType<IExecutionStatusDetails, void>("powerShell/executionStatusChanged");
16+
new NotificationType<IExecutionStatusDetails>("powerShell/executionStatusChanged");
1717

1818
export const ShowChoicePromptRequestType =
1919
new RequestType<IShowChoicePromptRequestArgs,
20-
IShowChoicePromptResponseBody, string, void>("powerShell/showChoicePrompt");
20+
IShowChoicePromptResponseBody, string>("powerShell/showChoicePrompt");
2121

2222
export const ShowInputPromptRequestType =
2323
new RequestType<IShowInputPromptRequestArgs,
24-
IShowInputPromptResponseBody, string, void>("powerShell/showInputPrompt");
24+
IShowInputPromptResponseBody, string>("powerShell/showInputPrompt");
2525

2626
export interface IEvaluateRequestArguments {
2727
expression: string;

‎src/features/CustomViews.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ enum CustomViewType {
240240
}
241241

242242
export const NewCustomViewRequestType =
243-
new RequestType<INewCustomViewRequestArguments, void, void, void>(
243+
new RequestType<INewCustomViewRequestArguments, void, void>(
244244
"powerShell/newCustomView");
245245

246246
interface INewCustomViewRequestArguments {
@@ -250,7 +250,7 @@ interface INewCustomViewRequestArguments {
250250
}
251251

252252
export const ShowCustomViewRequestType =
253-
new RequestType<IShowCustomViewRequestArguments, void, void, void>(
253+
new RequestType<IShowCustomViewRequestArguments, void, void>(
254254
"powerShell/showCustomView");
255255

256256
interface IShowCustomViewRequestArguments {
@@ -259,15 +259,15 @@ interface IShowCustomViewRequestArguments {
259259
}
260260

261261
export const CloseCustomViewRequestType =
262-
new RequestType<ICloseCustomViewRequestArguments, void, void, void>(
262+
new RequestType<ICloseCustomViewRequestArguments, void, void>(
263263
"powerShell/closeCustomView");
264264

265265
interface ICloseCustomViewRequestArguments {
266266
id: string;
267267
}
268268

269269
export const SetHtmlContentViewRequestType =
270-
new RequestType<ISetHtmlContentViewRequestArguments, void, void, void>(
270+
new RequestType<ISetHtmlContentViewRequestArguments, void, void>(
271271
"powerShell/setHtmlViewContent");
272272

273273
interface IHtmlContent {
@@ -282,7 +282,7 @@ interface ISetHtmlContentViewRequestArguments {
282282
}
283283

284284
export const AppendHtmlOutputViewRequestType =
285-
new RequestType<IAppendHtmlOutputViewRequestArguments, void, void, void>(
285+
new RequestType<IAppendHtmlOutputViewRequestArguments, void, void>(
286286
"powerShell/appendHtmlViewContent");
287287

288288
interface IAppendHtmlOutputViewRequestArguments {

‎src/features/DebugSession.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { Logger } from "../logging";
1717
import { LanguageClientConsumer } from "../languageClientConsumer";
1818

1919
export const StartDebuggerNotificationType =
20-
new NotificationType<void, void>("powerShell/startDebugger");
20+
new NotificationType<void>("powerShell/startDebugger");
2121

2222
export class DebugSessionFeature extends LanguageClientConsumer
2323
implements DebugConfigurationProvider, vscode.DebugAdapterDescriptorFactory {
@@ -383,7 +383,7 @@ interface IPSHostProcessInfo {
383383
}
384384

385385
export const GetPSHostProcessesRequestType =
386-
new RequestType<any, IGetPSHostProcessesResponseBody, string, void>("powerShell/getPSHostProcesses");
386+
new RequestType<any, IGetPSHostProcessesResponseBody, string>("powerShell/getPSHostProcesses");
387387

388388
interface IGetPSHostProcessesResponseBody {
389389
hostProcesses: IPSHostProcessInfo[];
@@ -458,7 +458,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
458458
}
459459

460460
private pickPSHostProcess(): Thenable<string> {
461-
return this.languageClient.sendRequest(GetPSHostProcessesRequestType, null).then((hostProcesses) => {
461+
return this.languageClient.sendRequest(GetPSHostProcessesRequestType, {}).then((hostProcesses) => {
462462
// Start with the current PowerShell process in the list.
463463
const items: IProcessItem[] = [{
464464
label: "Current",
@@ -518,7 +518,7 @@ interface IRunspace {
518518
}
519519

520520
export const GetRunspaceRequestType =
521-
new RequestType<any, IRunspace[], string, void>("powerShell/getRunspace");
521+
new RequestType<any, IRunspace[], string>("powerShell/getRunspace");
522522

523523
export class PickRunspaceFeature extends LanguageClientConsumer {
524524

‎src/features/ExpandAlias.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { RequestType } from "vscode-languageclient";
88
import { Logger } from "../logging";
99
import { LanguageClientConsumer } from "../languageClientConsumer";
1010

11-
export const ExpandAliasRequestType = new RequestType<any, any, void, void>("powerShell/expandAlias");
11+
export const ExpandAliasRequestType = new RequestType<any, any, void>("powerShell/expandAlias");
1212

1313
export class ExpandAliasFeature extends LanguageClientConsumer {
1414
private command: vscode.Disposable;

‎src/features/ExtensionCommands.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export interface IExtensionCommandQuickPickItem extends vscode.QuickPickItem {
2323
}
2424

2525
export const InvokeExtensionCommandRequestType =
26-
new RequestType<IInvokeExtensionCommandRequestArguments, void, void, void>(
26+
new RequestType<IInvokeExtensionCommandRequestArguments, void, void>(
2727
"powerShell/invokeExtensionCommand");
2828

2929
export interface IEditorContext {
@@ -40,7 +40,7 @@ export interface IInvokeExtensionCommandRequestArguments {
4040
}
4141

4242
export const ExtensionCommandAddedNotificationType =
43-
new NotificationType<IExtensionCommandAddedNotificationBody, void>(
43+
new NotificationType<IExtensionCommandAddedNotificationBody>(
4444
"powerShell/extensionCommandAdded");
4545

4646
export interface IExtensionCommandAddedNotificationBody {
@@ -91,7 +91,7 @@ function asCodePosition(value: Position): vscode.Position {
9191
}
9292

9393
export const GetEditorContextRequestType =
94-
new RequestType<IGetEditorContextRequestArguments, IEditorContext, void, void>(
94+
new RequestType<IGetEditorContextRequestArguments, IEditorContext, void>(
9595
"editor/getEditorContext");
9696

9797
// tslint:disable-next-line:no-empty-interface
@@ -104,7 +104,7 @@ enum EditorOperationResponse {
104104
}
105105

106106
export const InsertTextRequestType =
107-
new RequestType<IInsertTextRequestArguments, EditorOperationResponse, void, void>(
107+
new RequestType<IInsertTextRequestArguments, EditorOperationResponse, void>(
108108
"editor/insertText");
109109

110110
export interface IInsertTextRequestArguments {
@@ -114,15 +114,15 @@ export interface IInsertTextRequestArguments {
114114
}
115115

116116
export const SetSelectionRequestType =
117-
new RequestType<ISetSelectionRequestArguments, EditorOperationResponse, void, void>(
117+
new RequestType<ISetSelectionRequestArguments, EditorOperationResponse, void>(
118118
"editor/setSelection");
119119

120120
export interface ISetSelectionRequestArguments {
121121
selectionRange: Range;
122122
}
123123

124124
export const OpenFileRequestType =
125-
new RequestType<IOpenFileDetails, EditorOperationResponse, void, void>(
125+
new RequestType<IOpenFileDetails, EditorOperationResponse, void>(
126126
"editor/openFile");
127127

128128
export interface IOpenFileDetails {
@@ -131,31 +131,31 @@ export interface IOpenFileDetails {
131131
}
132132

133133
export const NewFileRequestType =
134-
new RequestType<string, EditorOperationResponse, void, void>(
134+
new RequestType<string, EditorOperationResponse, void>(
135135
"editor/newFile");
136136

137137
export const CloseFileRequestType =
138-
new RequestType<string, EditorOperationResponse, void, void>(
138+
new RequestType<string, EditorOperationResponse, void>(
139139
"editor/closeFile");
140140

141141
export const SaveFileRequestType =
142-
new RequestType<ISaveFileDetails, EditorOperationResponse, void, void>(
142+
new RequestType<ISaveFileDetails, EditorOperationResponse, void>(
143143
"editor/saveFile");
144144

145145
export const ShowErrorMessageRequestType =
146-
new RequestType<string, EditorOperationResponse, void, void>(
146+
new RequestType<string, EditorOperationResponse, void>(
147147
"editor/showErrorMessage");
148148

149149
export const ShowWarningMessageRequestType =
150-
new RequestType<string, EditorOperationResponse, void, void>(
150+
new RequestType<string, EditorOperationResponse, void>(
151151
"editor/showWarningMessage");
152152

153153
export const ShowInformationMessageRequestType =
154-
new RequestType<string, EditorOperationResponse, void, void>(
154+
new RequestType<string, EditorOperationResponse, void>(
155155
"editor/showInformationMessage");
156156

157157
export const SetStatusBarMessageRequestType =
158-
new RequestType<IStatusBarMessageDetails, EditorOperationResponse, void, void>(
158+
new RequestType<IStatusBarMessageDetails, EditorOperationResponse, void>(
159159
"editor/setStatusBarMessage");
160160

161161
export const ClearTerminalNotificationType =

‎src/features/FindModule.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import QuickPickItem = vscode.QuickPickItem;
88
import { LanguageClientConsumer } from "../languageClientConsumer";
99

1010
export const FindModuleRequestType =
11-
new RequestType<any, any, void, void>("powerShell/findModule");
11+
new RequestType<any, any, void>("powerShell/findModule");
1212

1313
export const InstallModuleRequestType =
14-
new RequestType<string, void, void, void>("powerShell/installModule");
14+
new RequestType<string, void, void>("powerShell/installModule");
1515

1616
export class FindModuleFeature extends LanguageClientConsumer {
1717

‎src/features/GetCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ interface ICommand {
1919
* RequestType sent over to PSES.
2020
* Expects: ICommand to be returned
2121
*/
22-
export const GetCommandRequestType = new RequestType0<ICommand[], void, void>("powerShell/getCommand");
22+
export const GetCommandRequestType = new RequestType0<ICommand[], void>("powerShell/getCommand");
2323

2424
/**
2525
* A PowerShell Command listing feature. Implements a treeview control.

‎src/features/HelpCompletion.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Settings = require("../settings");
1111
import { LanguageClientConsumer } from "../languageClientConsumer";
1212

1313
export const CommentHelpRequestType =
14-
new RequestType<any, any, void, void>("powerShell/getCommentHelp");
14+
new RequestType<any, any, void>("powerShell/getCommentHelp");
1515

1616
interface ICommentHelpRequestParams {
1717
documentUri: string;

‎src/features/NewFileOrProject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ interface ITemplateDetails {
186186
}
187187

188188
export const GetProjectTemplatesRequestType =
189-
new RequestType<IGetProjectTemplatesRequestArgs, IGetProjectTemplatesResponseBody, string, void>(
189+
new RequestType<IGetProjectTemplatesRequestArgs, IGetProjectTemplatesResponseBody, string>(
190190
"powerShell/getProjectTemplates");
191191

192192
interface IGetProjectTemplatesRequestArgs {
@@ -199,7 +199,7 @@ interface IGetProjectTemplatesResponseBody {
199199
}
200200

201201
export const NewProjectFromTemplateRequestType =
202-
new RequestType<any, INewProjectFromTemplateResponseBody, string, void>(
202+
new RequestType<any, INewProjectFromTemplateResponseBody, string>(
203203
"powerShell/newProjectFromTemplate");
204204

205205
interface INewProjectFromTemplateRequestArgs {

‎src/features/RemoteFiles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface IDidSaveTextDocumentParams {
1919
}
2020

2121
export const DidSaveTextDocumentNotificationType =
22-
new NotificationType<IDidSaveTextDocumentParams, void>(
22+
new NotificationType<IDidSaveTextDocumentParams>(
2323
"textDocument/didSave");
2424

2525
export class RemoteFilesFeature extends LanguageClientConsumer {

‎src/features/ShowHelp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Logger } from "../logging";
88
import { LanguageClientConsumer } from "../languageClientConsumer";
99

1010
export const ShowHelpNotificationType =
11-
new NotificationType<any, void>("powerShell/showHelp");
11+
new NotificationType<any>("powerShell/showHelp");
1212

1313
export class ShowHelpFeature extends LanguageClientConsumer {
1414
private command: vscode.Disposable;

‎src/session.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,11 +775,11 @@ class SessionMenuItem implements vscode.QuickPickItem {
775775
}
776776

777777
export const PowerShellVersionRequestType =
778-
new RequestType0<IPowerShellVersionDetails, void, void>(
778+
new RequestType0<IPowerShellVersionDetails, void>(
779779
"powerShell/getVersion");
780780

781781
export const RunspaceChangedEventType =
782-
new NotificationType<IRunspaceDetails, void>(
782+
new NotificationType<IRunspaceDetails>(
783783
"powerShell/runspaceChanged");
784784

785785
export enum RunspaceType {

0 commit comments

Comments
 (0)