update language server client lib

package.json

@@ -55,8 +55,8 @@
     "semver": "^7.3.2",
     "uuid": "^8.3.1",
     "vscode-extension-telemetry": "~0.1.6",
-    "vscode-languageclient": "^7.0.0-next.9",
-    "vscode-languageserver-protocol": "^3.16.0-next.7"
+    "vscode-languageclient": "^7.0.0-next.12",
+    "vscode-languageserver-protocol": "^3.16.0-next.10"
   },
   "devDependencies": {
     "@types/glob": "^7.1.3",

src/features/Console.ts

@@ -10,18 +10,18 @@ import { Logger } from "../logging";
 import Settings = require("../settings");
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
-export const EvaluateRequestType = new RequestType<IEvaluateRequestArguments, void, void, void>("evaluate");
-export const OutputNotificationType = new NotificationType<IOutputNotificationBody, void>("output");
+export const EvaluateRequestType = new RequestType<IEvaluateRequestArguments, void, void>("evaluate");
+export const OutputNotificationType = new NotificationType<IOutputNotificationBody>("output");
 export const ExecutionStatusChangedNotificationType =
-    new NotificationType<IExecutionStatusDetails, void>("powerShell/executionStatusChanged");
+    new NotificationType<IExecutionStatusDetails>("powerShell/executionStatusChanged");
 
 export const ShowChoicePromptRequestType =
     new RequestType<IShowChoicePromptRequestArgs,
-                    IShowChoicePromptResponseBody, string, void>("powerShell/showChoicePrompt");
+                    IShowChoicePromptResponseBody, string>("powerShell/showChoicePrompt");
 
 export const ShowInputPromptRequestType =
     new RequestType<IShowInputPromptRequestArgs,
-                    IShowInputPromptResponseBody, string, void>("powerShell/showInputPrompt");
+                    IShowInputPromptResponseBody, string>("powerShell/showInputPrompt");
 
 export interface IEvaluateRequestArguments {
     expression: string;

src/features/CustomViews.ts

@@ -240,7 +240,7 @@ enum CustomViewType {
 }
 
 export const NewCustomViewRequestType =
-    new RequestType<INewCustomViewRequestArguments, void, void, void>(
+    new RequestType<INewCustomViewRequestArguments, void, void>(
         "powerShell/newCustomView");
 
 interface INewCustomViewRequestArguments {
@@ -250,7 +250,7 @@ interface INewCustomViewRequestArguments {
 }
 
 export const ShowCustomViewRequestType =
-    new RequestType<IShowCustomViewRequestArguments, void, void, void>(
+    new RequestType<IShowCustomViewRequestArguments, void, void>(
         "powerShell/showCustomView");
 
 interface IShowCustomViewRequestArguments {
@@ -259,15 +259,15 @@ interface IShowCustomViewRequestArguments {
 }
 
 export const CloseCustomViewRequestType =
-    new RequestType<ICloseCustomViewRequestArguments, void, void, void>(
+    new RequestType<ICloseCustomViewRequestArguments, void, void>(
         "powerShell/closeCustomView");
 
 interface ICloseCustomViewRequestArguments {
     id: string;
 }
 
 export const SetHtmlContentViewRequestType =
-    new RequestType<ISetHtmlContentViewRequestArguments, void, void, void>(
+    new RequestType<ISetHtmlContentViewRequestArguments, void, void>(
         "powerShell/setHtmlViewContent");
 
 interface IHtmlContent {
@@ -282,7 +282,7 @@ interface ISetHtmlContentViewRequestArguments {
 }
 
 export const AppendHtmlOutputViewRequestType =
-    new RequestType<IAppendHtmlOutputViewRequestArguments, void, void, void>(
+    new RequestType<IAppendHtmlOutputViewRequestArguments, void, void>(
         "powerShell/appendHtmlViewContent");
 
 interface IAppendHtmlOutputViewRequestArguments {

src/features/DebugSession.ts

@@ -17,7 +17,7 @@ import { Logger } from "../logging";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
 export const StartDebuggerNotificationType =
-    new NotificationType<void, void>("powerShell/startDebugger");
+    new NotificationType<void>("powerShell/startDebugger");
 
 export class DebugSessionFeature extends LanguageClientConsumer
     implements DebugConfigurationProvider, vscode.DebugAdapterDescriptorFactory {
@@ -383,7 +383,7 @@ interface IPSHostProcessInfo {
 }
 
 export const GetPSHostProcessesRequestType =
-    new RequestType<any, IGetPSHostProcessesResponseBody, string, void>("powerShell/getPSHostProcesses");
+    new RequestType<any, IGetPSHostProcessesResponseBody, string>("powerShell/getPSHostProcesses");
 
 interface IGetPSHostProcessesResponseBody {
     hostProcesses: IPSHostProcessInfo[];
@@ -458,7 +458,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
     }
 
     private pickPSHostProcess(): Thenable<string> {
-        return this.languageClient.sendRequest(GetPSHostProcessesRequestType, null).then((hostProcesses) => {
+        return this.languageClient.sendRequest(GetPSHostProcessesRequestType, {}).then((hostProcesses) => {
             // Start with the current PowerShell process in the list.
             const items: IProcessItem[] = [{
                 label: "Current",
@@ -518,7 +518,7 @@ interface IRunspace {
 }
 
 export const GetRunspaceRequestType =
-    new RequestType<any, IRunspace[], string, void>("powerShell/getRunspace");
+    new RequestType<any, IRunspace[], string>("powerShell/getRunspace");
 
 export class PickRunspaceFeature extends LanguageClientConsumer {
 

src/features/ExpandAlias.ts

@@ -8,7 +8,7 @@ import { RequestType } from "vscode-languageclient";
 import { Logger } from "../logging";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
-export const ExpandAliasRequestType = new RequestType<any, any, void, void>("powerShell/expandAlias");
+export const ExpandAliasRequestType = new RequestType<any, any, void>("powerShell/expandAlias");
 
 export class ExpandAliasFeature extends LanguageClientConsumer {
     private command: vscode.Disposable;

src/features/ExtensionCommands.ts

@@ -23,7 +23,7 @@ export interface IExtensionCommandQuickPickItem extends vscode.QuickPickItem {
 }
 
 export const InvokeExtensionCommandRequestType =
-    new RequestType<IInvokeExtensionCommandRequestArguments, void, void, void>(
+    new RequestType<IInvokeExtensionCommandRequestArguments, void, void>(
         "powerShell/invokeExtensionCommand");
 
 export interface IEditorContext {
@@ -40,7 +40,7 @@ export interface IInvokeExtensionCommandRequestArguments {
 }
 
 export const ExtensionCommandAddedNotificationType =
-    new NotificationType<IExtensionCommandAddedNotificationBody, void>(
+    new NotificationType<IExtensionCommandAddedNotificationBody>(
         "powerShell/extensionCommandAdded");
 
 export interface IExtensionCommandAddedNotificationBody {
@@ -91,7 +91,7 @@ function asCodePosition(value: Position): vscode.Position {
 }
 
 export const GetEditorContextRequestType =
-    new RequestType<IGetEditorContextRequestArguments, IEditorContext, void, void>(
+    new RequestType<IGetEditorContextRequestArguments, IEditorContext, void>(
         "editor/getEditorContext");
 
 // tslint:disable-next-line:no-empty-interface
@@ -104,7 +104,7 @@ enum EditorOperationResponse {
 }
 
 export const InsertTextRequestType =
-    new RequestType<IInsertTextRequestArguments, EditorOperationResponse, void, void>(
+    new RequestType<IInsertTextRequestArguments, EditorOperationResponse, void>(
         "editor/insertText");
 
 export interface IInsertTextRequestArguments {
@@ -114,15 +114,15 @@ export interface IInsertTextRequestArguments {
 }
 
 export const SetSelectionRequestType =
-    new RequestType<ISetSelectionRequestArguments, EditorOperationResponse, void, void>(
+    new RequestType<ISetSelectionRequestArguments, EditorOperationResponse, void>(
         "editor/setSelection");
 
 export interface ISetSelectionRequestArguments {
     selectionRange: Range;
 }
 
 export const OpenFileRequestType =
-    new RequestType<IOpenFileDetails, EditorOperationResponse, void, void>(
+    new RequestType<IOpenFileDetails, EditorOperationResponse, void>(
         "editor/openFile");
 
 export interface IOpenFileDetails {
@@ -131,31 +131,31 @@ export interface IOpenFileDetails {
 }
 
 export const NewFileRequestType =
-    new RequestType<string, EditorOperationResponse, void, void>(
+    new RequestType<string, EditorOperationResponse, void>(
         "editor/newFile");
 
 export const CloseFileRequestType =
-    new RequestType<string, EditorOperationResponse, void, void>(
+    new RequestType<string, EditorOperationResponse, void>(
         "editor/closeFile");
 
 export const SaveFileRequestType =
-    new RequestType<ISaveFileDetails, EditorOperationResponse, void, void>(
+    new RequestType<ISaveFileDetails, EditorOperationResponse, void>(
         "editor/saveFile");
 
 export const ShowErrorMessageRequestType =
-    new RequestType<string, EditorOperationResponse, void, void>(
+    new RequestType<string, EditorOperationResponse, void>(
         "editor/showErrorMessage");
 
 export const ShowWarningMessageRequestType =
-    new RequestType<string, EditorOperationResponse, void, void>(
+    new RequestType<string, EditorOperationResponse, void>(
         "editor/showWarningMessage");
 
 export const ShowInformationMessageRequestType =
-    new RequestType<string, EditorOperationResponse, void, void>(
+    new RequestType<string, EditorOperationResponse, void>(
         "editor/showInformationMessage");
 
 export const SetStatusBarMessageRequestType =
-    new RequestType<IStatusBarMessageDetails, EditorOperationResponse, void, void>(
+    new RequestType<IStatusBarMessageDetails, EditorOperationResponse, void>(
         "editor/setStatusBarMessage");
 
 export const ClearTerminalNotificationType =

src/features/FindModule.ts

@@ -8,10 +8,10 @@ import QuickPickItem = vscode.QuickPickItem;
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
 export const FindModuleRequestType =
-    new RequestType<any, any, void, void>("powerShell/findModule");
+    new RequestType<any, any, void>("powerShell/findModule");
 
 export const InstallModuleRequestType =
-    new RequestType<string, void, void, void>("powerShell/installModule");
+    new RequestType<string, void, void>("powerShell/installModule");
 
 export class FindModuleFeature extends LanguageClientConsumer {
 

src/features/GetCommands.ts

@@ -19,7 +19,7 @@ interface ICommand {
  * RequestType sent over to PSES.
  * Expects: ICommand to be returned
  */
-export const GetCommandRequestType = new RequestType0<ICommand[], void, void>("powerShell/getCommand");
+export const GetCommandRequestType = new RequestType0<ICommand[], void>("powerShell/getCommand");
 
 /**
  * A PowerShell Command listing feature. Implements a treeview control.

src/features/HelpCompletion.ts

@@ -11,7 +11,7 @@ import Settings = require("../settings");
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
 export const CommentHelpRequestType =
-    new RequestType<any, any, void, void>("powerShell/getCommentHelp");
+    new RequestType<any, any, void>("powerShell/getCommentHelp");
 
 interface ICommentHelpRequestParams {
     documentUri: string;

src/features/NewFileOrProject.ts

@@ -186,7 +186,7 @@ interface ITemplateDetails {
 }
 
 export const GetProjectTemplatesRequestType =
-    new RequestType<IGetProjectTemplatesRequestArgs, IGetProjectTemplatesResponseBody, string, void>(
+    new RequestType<IGetProjectTemplatesRequestArgs, IGetProjectTemplatesResponseBody, string>(
         "powerShell/getProjectTemplates");
 
 interface IGetProjectTemplatesRequestArgs {
@@ -199,7 +199,7 @@ interface IGetProjectTemplatesResponseBody {
 }
 
 export const NewProjectFromTemplateRequestType =
-    new RequestType<any, INewProjectFromTemplateResponseBody, string, void>(
+    new RequestType<any, INewProjectFromTemplateResponseBody, string>(
         "powerShell/newProjectFromTemplate");
 
 interface INewProjectFromTemplateRequestArgs {

src/features/RemoteFiles.ts

@@ -19,7 +19,7 @@ export interface IDidSaveTextDocumentParams {
 }
 
 export const DidSaveTextDocumentNotificationType =
-    new NotificationType<IDidSaveTextDocumentParams, void>(
+    new NotificationType<IDidSaveTextDocumentParams>(
         "textDocument/didSave");
 
 export class RemoteFilesFeature extends LanguageClientConsumer {

src/features/ShowHelp.ts

@@ -8,7 +8,7 @@ import { Logger } from "../logging";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
 export const ShowHelpNotificationType =
-    new NotificationType<any, void>("powerShell/showHelp");
+    new NotificationType<any>("powerShell/showHelp");
 
 export class ShowHelpFeature extends LanguageClientConsumer {
     private command: vscode.Disposable;

src/session.ts

@@ -775,11 +775,11 @@ class SessionMenuItem implements vscode.QuickPickItem {
 }
 
 export const PowerShellVersionRequestType =
-    new RequestType0<IPowerShellVersionDetails, void, void>(
+    new RequestType0<IPowerShellVersionDetails, void>(
         "powerShell/getVersion");
 
 export const RunspaceChangedEventType =
-    new NotificationType<IRunspaceDetails, void>(
+    new NotificationType<IRunspaceDetails>(
         "powerShell/runspaceChanged");
 
 export enum RunspaceType {