vscode-languageserver-protocol 3.15.0-next.9 → 3.15.3

package/lib/protocol.configuration.js

@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const messages_1 = require("./messages");
 /**
  * The 'workspace/configuration' request is sent from the server to the client to fetch a certain
  * configuration setting.
@@ -16,5 +16,5 @@ const vscode_jsonrpc_1 = require("vscode-jsonrpc");
  */
 var ConfigurationRequest;
 (function (ConfigurationRequest) {
-    ConfigurationRequest.type = new vscode_jsonrpc_1.RequestType('workspace/configuration');
+    ConfigurationRequest.type = new messages_1.ProtocolRequestType('workspace/configuration');
 })(ConfigurationRequest = exports.ConfigurationRequest || (exports.ConfigurationRequest = {}));

package/lib/protocol.d.ts

@@ -1,13 +1,15 @@
-import { RequestType, RequestType0, NotificationType, NotificationType0, ProgressToken, ProgressType } from 'vscode-jsonrpc';
-import { TextDocumentContentChangeEvent, Position, Range, Location, LocationLink, Diagnostic, Command, TextEdit, WorkspaceEdit, DocumentUri, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, TextDocumentSaveReason, CompletionItem, CompletionList, Hover, SignatureHelp, ReferenceContext, DocumentHighlight, SymbolInformation, CodeLens, CodeActionContext, FormattingOptions, DocumentLink, MarkupKind, SymbolKind, CompletionItemKind, CodeAction, CodeActionKind, DocumentSymbol, CompletionItemTag, DiagnosticTag } from 'vscode-languageserver-types';
-import { ImplementationRequest, ImplementationClientCapabilities, ImplementationOptions, ImplementationRegistrationOptions } from './protocol.implementation';
-import { TypeDefinitionRequest, TypeDefinitionClientCapabilities, TypeDefinitionOptions, TypeDefinitionRegistrationOptions } from './protocol.typeDefinition';
+import { ProgressToken, ProgressType } from 'vscode-jsonrpc';
+import { ProtocolRequestType, ProtocolRequestType0, ProtocolNotificationType, ProtocolNotificationType0 } from './messages';
+import { Position, Range, Location, LocationLink, Diagnostic, Command, TextEdit, WorkspaceEdit, DocumentUri, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, CompletionItem, CompletionList, Hover, SignatureHelp, ReferenceContext, DocumentHighlight, SymbolInformation, CodeLens, CodeActionContext, FormattingOptions, DocumentLink, MarkupKind, SymbolKind, CompletionItemKind, CodeAction, CodeActionKind, DocumentSymbol, CompletionItemTag, DiagnosticTag } from 'vscode-languageserver-types';
+import { ImplementationRequest, ImplementationClientCapabilities, ImplementationOptions, ImplementationRegistrationOptions, ImplementationParams } from './protocol.implementation';
+import { TypeDefinitionRequest, TypeDefinitionClientCapabilities, TypeDefinitionOptions, TypeDefinitionRegistrationOptions, TypeDefinitionParams } from './protocol.typeDefinition';
 import { WorkspaceFoldersRequest, DidChangeWorkspaceFoldersNotification, DidChangeWorkspaceFoldersParams, WorkspaceFolder, WorkspaceFoldersChangeEvent, WorkspaceFoldersInitializeParams, WorkspaceFoldersClientCapabilities, WorkspaceFoldersServerCapabilities } from './protocol.workspaceFolders';
 import { ConfigurationRequest, ConfigurationParams, ConfigurationItem, ConfigurationClientCapabilities } from './protocol.configuration';
 import { DocumentColorRequest, ColorPresentationRequest, DocumentColorOptions, DocumentColorParams, ColorPresentationParams, DocumentColorClientCapabilities, DocumentColorRegistrationOptions } from './protocol.colorProvider';
 import { FoldingRangeClientCapabilities, FoldingRangeOptions, FoldingRangeRequest, FoldingRangeParams, FoldingRangeRegistrationOptions } from './protocol.foldingRange';
-import { DeclarationClientCapabilities, DeclarationRequest, DeclarationOptions, DeclarationRegistrationOptions } from './protocol.declaration';
+import { DeclarationClientCapabilities, DeclarationRequest, DeclarationOptions, DeclarationRegistrationOptions, DeclarationParams } from './protocol.declaration';
 import { SelectionRangeClientCapabilities, SelectionRangeOptions, SelectionRangeRequest, SelectionRangeParams, SelectionRangeRegistrationOptions } from './protocol.selectionRange';
+import { WorkDoneProgressClientCapabilities, WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd, WorkDoneProgress, WorkDoneProgressCreateParams, WorkDoneProgressCreateRequest, WorkDoneProgressCancelParams, WorkDoneProgressCancelNotification } from './protocol.progress';
 /**
  * A document filter denotes a document by different properties like
  * the [language](#TextDocument.languageId), the [scheme](#Uri.scheme) of
@@ -92,7 +94,7 @@ export interface RegistrationParams {
  * handler on the client side.
  */
 export declare namespace RegistrationRequest {
-    const type: RequestType<RegistrationParams, void, void, void>;
+    const type: ProtocolRequestType<RegistrationParams, void, never, void, void>;
 }
 /**
  * General parameters to unregister a request or notification.
@@ -116,7 +118,7 @@ export interface UnregistrationParams {
  * handler on the client side.
  */
 export declare namespace UnregistrationRequest {
-    const type: RequestType<UnregistrationParams, void, void, void>;
+    const type: ProtocolRequestType<UnregistrationParams, void, never, void, void>;
 }
 export interface WorkDoneProgressParams {
     /**
@@ -183,7 +185,7 @@ export declare namespace FailureHandlingKind {
     const TextOnlyTransactional: FailureHandlingKind;
     /**
      * The client tries to undo the operations already executed. But there is no
-     * guaruntee that this is succeeding.
+     * guarantee that this is succeeding.
      */
     const Undo: FailureHandlingKind;
 }
@@ -340,9 +342,9 @@ export interface _ClientCapabilities {
     /**
      * Experimental client capabilities.
      */
-    experimental?: any;
+    experimental?: object;
 }
-export declare type ClientCapabilities = _ClientCapabilities & WorkspaceFoldersClientCapabilities & ConfigurationClientCapabilities & SelectionRangeClientCapabilities;
+export declare type ClientCapabilities = _ClientCapabilities & WorkspaceFoldersClientCapabilities & ConfigurationClientCapabilities & WorkDoneProgressClientCapabilities;
 /**
  * Static registration options to be returned in the initialize
  * request.
@@ -518,7 +520,7 @@ export declare type ServerCapabilities<T = any> = _ServerCapabilities<T> & Works
  * resolves to such.
  */
 export declare namespace InitializeRequest {
-    const type: RequestType<_InitializeParams & WorkspaceFoldersInitializeParams & WorkDoneProgressParams, InitializeResult<any>, InitializeError, void>;
+    const type: ProtocolRequestType<_InitializeParams & WorkspaceFoldersInitializeParams & WorkDoneProgressParams, InitializeResult<any>, never, InitializeError, void>;
 }
 /**
  * The initialize parameters
@@ -633,7 +635,7 @@ export interface InitializedParams {
  * is allowed to send requests from the server to the client.
  */
 export declare namespace InitializedNotification {
-    const type: NotificationType<InitializedParams, void>;
+    const type: ProtocolNotificationType<InitializedParams, void>;
 }
 /**
  * A shutdown request is sent from the client to the server.
@@ -642,14 +644,14 @@ export declare namespace InitializedNotification {
  * is the exit event.
  */
 export declare namespace ShutdownRequest {
-    const type: RequestType0<void, void, void>;
+    const type: ProtocolRequestType0<void, never, void, void>;
 }
 /**
  * The exit event is sent from the client to the server to
  * ask the server to exit its process.
  */
 export declare namespace ExitNotification {
-    const type: NotificationType0<void>;
+    const type: ProtocolNotificationType0<void>;
 }
 export interface DidChangeConfigurationClientCapabilities {
     /**
@@ -663,7 +665,7 @@ export interface DidChangeConfigurationClientCapabilities {
  * the changed configuration as defined by the language client.
  */
 export declare namespace DidChangeConfigurationNotification {
-    const type: NotificationType<DidChangeConfigurationParams, DidChangeConfigurationRegistrationOptions>;
+    const type: ProtocolNotificationType<DidChangeConfigurationParams, DidChangeConfigurationRegistrationOptions>;
 }
 export interface DidChangeConfigurationRegistrationOptions {
     section?: string | string[];
@@ -717,7 +719,7 @@ export interface ShowMessageParams {
  * the client to display a particular message in the user interface.
  */
 export declare namespace ShowMessageNotification {
-    const type: NotificationType<ShowMessageParams, void>;
+    const type: ProtocolNotificationType<ShowMessageParams, void>;
 }
 export interface MessageActionItem {
     /**
@@ -744,14 +746,14 @@ export interface ShowMessageRequestParams {
  * and a set of options actions to the user.
  */
 export declare namespace ShowMessageRequest {
-    const type: RequestType<ShowMessageRequestParams, MessageActionItem | null, void, void>;
+    const type: ProtocolRequestType<ShowMessageRequestParams, MessageActionItem | null, never, void, void>;
 }
 /**
  * The log message notification is sent from the server to the client to ask
  * the client to log a particular message.
  */
 export declare namespace LogMessageNotification {
-    const type: NotificationType<LogMessageParams, void>;
+    const type: ProtocolNotificationType<LogMessageParams, void>;
 }
 /**
  * The log message parameters.
@@ -771,7 +773,7 @@ export interface LogMessageParams {
  * the client to log telemetry data.
  */
 export declare namespace TelemetryEventNotification {
-    const type: NotificationType<any, void>;
+    const type: ProtocolNotificationType<any, void>;
 }
 export interface TextDocumentSyncClientCapabilities {
     /**
@@ -862,8 +864,34 @@ export interface DidOpenTextDocumentParams {
  * is one.
  */
 export declare namespace DidOpenTextDocumentNotification {
-    const type: NotificationType<DidOpenTextDocumentParams, TextDocumentRegistrationOptions>;
+    const method: 'textDocument/didOpen';
+    const type: ProtocolNotificationType<DidOpenTextDocumentParams, TextDocumentRegistrationOptions>;
 }
+/**
+ * An event describing a change to a text document. If range and rangeLength are omitted
+ * the new text is considered to be the full content of the document.
+ */
+export declare type TextDocumentContentChangeEvent = {
+    /**
+     * The range of the document that changed.
+     */
+    range: Range;
+    /**
+     * The optional length of the range that got replaced.
+     *
+     * @deprecated use range instead.
+     */
+    rangeLength?: number;
+    /**
+     * The new text for the provided range.
+     */
+    text: string;
+} | {
+    /**
+     * The new text of the whole document.
+     */
+    text: string;
+};
 /**
  * The change text document notification's parameters.
  */
@@ -876,8 +904,16 @@ export interface DidChangeTextDocumentParams {
     textDocument: VersionedTextDocumentIdentifier;
     /**
      * The actual content changes. The content changes describe single state changes
-     * to the document. So if there are two content changes c1 and c2 for a document
-     * in state S then c1 move the document to S' and c2 to S''.
+     * to the document. So if there are two content changes c1 (at array index 0) and
+     * c2 (at array index 1) for a document in state S then c1 moves the document from
+     * S to S' and c2 from S' to S''. So c1 is computed on the state S and c2 is computed
+     * on the state S'.
+     *
+     * To mirror the content of a document using change events use the following approach:
+     * - start with the same initial content
+     * - apply the 'textDocument/didChange' notifications in the order you recevie them.
+     * - apply the `TextDocumentContentChangeEvent`s in a single notification in the order
+     *   you receive them.
      */
     contentChanges: TextDocumentContentChangeEvent[];
 }
@@ -895,7 +931,8 @@ export interface TextDocumentChangeRegistrationOptions extends TextDocumentRegis
  * changes to a text document.
  */
 export declare namespace DidChangeTextDocumentNotification {
-    const type: NotificationType<DidChangeTextDocumentParams, TextDocumentChangeRegistrationOptions>;
+    const method: 'textDocument/didChange';
+    const type: ProtocolNotificationType<DidChangeTextDocumentParams, TextDocumentChangeRegistrationOptions>;
 }
 /**
  * The parameters send in a close text document notification
@@ -916,7 +953,8 @@ export interface DidCloseTextDocumentParams {
  * notification requires a previous open notification to be sent.
  */
 export declare namespace DidCloseTextDocumentNotification {
-    const type: NotificationType<DidCloseTextDocumentParams, TextDocumentRegistrationOptions>;
+    const method: 'textDocument/didClose';
+    const type: ProtocolNotificationType<DidCloseTextDocumentParams, TextDocumentRegistrationOptions>;
 }
 /**
  * The parameters send in a save text document notification
@@ -942,8 +980,28 @@ export interface TextDocumentSaveRegistrationOptions extends TextDocumentRegistr
  * the document got saved in the client.
  */
 export declare namespace DidSaveTextDocumentNotification {
-    const type: NotificationType<DidSaveTextDocumentParams, TextDocumentSaveRegistrationOptions>;
+    const method: 'textDocument/didSave';
+    const type: ProtocolNotificationType<DidSaveTextDocumentParams, TextDocumentSaveRegistrationOptions>;
 }
+/**
+ * Represents reasons why a text document is saved.
+ */
+export declare namespace TextDocumentSaveReason {
+    /**
+     * Manually triggered, e.g. by the user pressing save, by starting debugging,
+     * or by an API call.
+     */
+    const Manual: 1;
+    /**
+     * Automatic after a delay.
+     */
+    const AfterDelay: 2;
+    /**
+     * When the editor lost focus.
+     */
+    const FocusOut: 3;
+}
+export declare type TextDocumentSaveReason = 1 | 2 | 3;
 /**
  * The parameters send in a will save text document notification.
  */
@@ -962,7 +1020,8 @@ export interface WillSaveTextDocumentParams {
  * the document is actually saved.
  */
 export declare namespace WillSaveTextDocumentNotification {
-    const type: NotificationType<WillSaveTextDocumentParams, TextDocumentRegistrationOptions>;
+    const method: 'textDocument/willSave';
+    const type: ProtocolNotificationType<WillSaveTextDocumentParams, TextDocumentRegistrationOptions>;
 }
 /**
  * A document will save request is sent from the client to the server before
@@ -973,7 +1032,8 @@ export declare namespace WillSaveTextDocumentNotification {
  * reliable.
  */
 export declare namespace WillSaveTextDocumentWaitUntilRequest {
-    const type: RequestType<WillSaveTextDocumentParams, TextEdit[] | null, void, TextDocumentRegistrationOptions>;
+    const method: 'textDocument/willSaveWaitUntil';
+    const type: ProtocolRequestType<WillSaveTextDocumentParams, TextEdit[] | null, never, void, TextDocumentRegistrationOptions>;
 }
 export interface DidChangeWatchedFilesClientCapabilities {
     /**
@@ -988,7 +1048,7 @@ export interface DidChangeWatchedFilesClientCapabilities {
  * the client detects changes to file watched by the language client.
  */
 export declare namespace DidChangeWatchedFilesNotification {
-    const type: NotificationType<DidChangeWatchedFilesParams, DidChangeWatchedFilesRegistrationOptions>;
+    const type: ProtocolNotificationType<DidChangeWatchedFilesParams, DidChangeWatchedFilesRegistrationOptions>;
 }
 /**
  * The watched files change notification's parameters.
@@ -1091,6 +1151,13 @@ export interface PublishDiagnosticsClientCapabilities {
          */
         valueSet: DiagnosticTag[];
     };
+    /**
+     * Whether the client interprets the version property of the
+     * `textDocument/publishDiagnostics` notification`s parameter.
+     *
+     * @since 3.15.0
+     */
+    versionSupport?: boolean;
 }
 /**
  * The publish diagnostic notification's parameters.
@@ -1116,7 +1183,7 @@ export interface PublishDiagnosticsParams {
  * results of validation runs.
  */
 export declare namespace PublishDiagnosticsNotification {
-    const type: NotificationType<PublishDiagnosticsParams, void>;
+    const type: ProtocolNotificationType<PublishDiagnosticsParams, void>;
 }
 /**
  * Completion client capabilities
@@ -1255,6 +1322,9 @@ export interface CompletionOptions extends WorkDoneProgressOptions {
      * if clients don't support individual commmit characters per completion item. See
      * `ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
      *
+     * If a server provides both `allCommitCharacters` and commit characters on an individual
+     * completion item the ones on the completion item win.
+     *
      * @since 3.2.0
      */
     allCommitCharacters?: string[];
@@ -1281,7 +1351,9 @@ export interface CompletionRegistrationOptions extends TextDocumentRegistrationO
  * `filterText`, `insertText`, and `textEdit`, must not be changed during resolve.
  */
 export declare namespace CompletionRequest {
-    const type: RequestType<CompletionParams, CompletionList | CompletionItem[] | null, void, CompletionRegistrationOptions>;
+    const method: 'textDocument/completion';
+    const type: ProtocolRequestType<CompletionParams, CompletionList | CompletionItem[] | null, CompletionItem[], void, CompletionRegistrationOptions>;
+    /** @deprecated Use CompletionRequest.type */
     const resultType: ProgressType<CompletionItem[]>;
 }
 /**
@@ -1290,7 +1362,8 @@ export declare namespace CompletionRequest {
  * is of type [CompletionItem](#CompletionItem) or a Thenable that resolves to such.
  */
 export declare namespace CompletionResolveRequest {
-    const type: RequestType<CompletionItem, CompletionItem, void, void>;
+    const method: 'completionItem/resolve';
+    const type: ProtocolRequestType<CompletionItem, CompletionItem, never, void, void>;
 }
 export interface HoverClientCapabilities {
     /**
@@ -1324,7 +1397,8 @@ export interface HoverRegistrationOptions extends TextDocumentRegistrationOption
  * type [Hover](#Hover) or a Thenable that resolves to such.
  */
 export declare namespace HoverRequest {
-    const type: RequestType<HoverParams, Hover | null, void, HoverRegistrationOptions>;
+    const method: 'textDocument/hover';
+    const type: ProtocolRequestType<HoverParams, Hover | null, never, void, HoverRegistrationOptions>;
 }
 /**
  * Client Capabilities for a [SignatureHelpRequest](#SignatureHelpRequest).
@@ -1454,7 +1528,8 @@ export interface SignatureHelpParams extends TextDocumentPositionParams, WorkDon
 export interface SignatureHelpRegistrationOptions extends TextDocumentRegistrationOptions, SignatureHelpOptions {
 }
 export declare namespace SignatureHelpRequest {
-    const type: RequestType<SignatureHelpParams, SignatureHelp | null, void, SignatureHelpRegistrationOptions>;
+    const method: 'textDocument/signatureHelp';
+    const type: ProtocolRequestType<SignatureHelpParams, SignatureHelp | null, never, void, SignatureHelpRegistrationOptions>;
 }
 /**
  * Client Capabilities for a [DefinitionRequest](#DefinitionRequest).
@@ -1494,8 +1569,10 @@ export interface DefinitionRegistrationOptions extends TextDocumentRegistrationO
  * to such.
  */
 export declare namespace DefinitionRequest {
-    const type: RequestType<DefinitionParams, Location | Location[] | LocationLink[] | null, void, DefinitionRegistrationOptions>;
-    const resultType: ProgressType<Location[] | LocationLink[]>;
+    const method: 'textDocument/definition';
+    const type: ProtocolRequestType<DefinitionParams, Location | Location[] | LocationLink[] | null, LocationLink[] | Location[], void, DefinitionRegistrationOptions>;
+    /** @deprecated Use DefinitionRequest.type */
+    const resultType: ProgressType<LocationLink[] | Location[]>;
 }
 /**
  * Client Capabilities for a [ReferencesRequest](#ReferencesRequest).
@@ -1529,7 +1606,9 @@ export interface ReferenceRegistrationOptions extends TextDocumentRegistrationOp
  * [Location[]](#Location) or a Thenable that resolves to such.
  */
 export declare namespace ReferencesRequest {
-    const type: RequestType<ReferenceParams, Location[] | null, void, ReferenceRegistrationOptions>;
+    const method: 'textDocument/references';
+    const type: ProtocolRequestType<ReferenceParams, Location[] | null, Location[], void, ReferenceRegistrationOptions>;
+    /** @deprecated Use ReferencesRequest.type */
     const resultType: ProgressType<Location[]>;
 }
 /**
@@ -1563,7 +1642,9 @@ export interface DocumentHighlightRegistrationOptions extends TextDocumentRegist
  * (#DocumentHighlight) or a Thenable that resolves to such.
  */
 export declare namespace DocumentHighlightRequest {
-    const type: RequestType<DocumentHighlightParams, DocumentHighlight[] | null, void, DocumentHighlightRegistrationOptions>;
+    const method: 'textDocument/documentHighlight';
+    const type: ProtocolRequestType<DocumentHighlightParams, DocumentHighlight[] | null, DocumentHighlight[], void, DocumentHighlightRegistrationOptions>;
+    /** @deprecated Use DocumentHighlightRequest.type */
     const resultType: ProgressType<DocumentHighlight[]>;
 }
 /**
@@ -1621,8 +1702,10 @@ export interface DocumentSymbolRegistrationOptions extends TextDocumentRegistrat
  * that resolves to such.
  */
 export declare namespace DocumentSymbolRequest {
-    const type: RequestType<DocumentSymbolParams, SymbolInformation[] | DocumentSymbol[] | null, void, DocumentSymbolRegistrationOptions>;
-    const resultType: ProgressType<SymbolInformation[] | DocumentSymbol[]>;
+    const method: 'textDocument/documentSymbol';
+    const type: ProtocolRequestType<DocumentSymbolParams, DocumentSymbol[] | SymbolInformation[] | null, DocumentSymbol[] | SymbolInformation[], void, DocumentSymbolRegistrationOptions>;
+    /** @deprecated Use DocumentSymbolRequest.type */
+    const resultType: ProgressType<DocumentSymbol[] | SymbolInformation[]>;
 }
 /**
  * The Client Capabilities of a [CodeActionRequest](#CodeActionRequest).
@@ -1697,7 +1780,9 @@ export interface CodeActionRegistrationOptions extends TextDocumentRegistrationO
  * A request to provide commands for the given text document and range.
  */
 export declare namespace CodeActionRequest {
-    const type: RequestType<CodeActionParams, (Command | CodeAction)[] | null, void, CodeActionRegistrationOptions>;
+    const method: 'textDocument/codeAction';
+    const type: ProtocolRequestType<CodeActionParams, (Command | CodeAction)[] | null, (Command | CodeAction)[], void, CodeActionRegistrationOptions>;
+    /** @deprecated Use CodeActionRequest.type */
     const resultType: ProgressType<(Command | CodeAction)[]>;
 }
 /**
@@ -1752,7 +1837,9 @@ export interface WorkspaceSymbolRegistrationOptions extends WorkspaceSymbolOptio
  * resolves to such.
  */
 export declare namespace WorkspaceSymbolRequest {
-    const type: RequestType<WorkspaceSymbolParams, SymbolInformation[] | null, void, WorkspaceSymbolRegistrationOptions>;
+    const method: 'workspace/symbol';
+    const type: ProtocolRequestType<WorkspaceSymbolParams, SymbolInformation[] | null, SymbolInformation[], void, WorkspaceSymbolRegistrationOptions>;
+    /** @deprecated Use WorkspaceSymbolRequest.type */
     const resultType: ProgressType<SymbolInformation[]>;
 }
 /**
@@ -1791,14 +1878,15 @@ export interface CodeLensRegistrationOptions extends TextDocumentRegistrationOpt
  * A request to provide code lens for the given text document.
  */
 export declare namespace CodeLensRequest {
-    const type: RequestType<CodeLensParams, CodeLens[] | null, void, CodeLensRegistrationOptions>;
+    const type: ProtocolRequestType<CodeLensParams, CodeLens[] | null, CodeLens[], void, CodeLensRegistrationOptions>;
+    /** @deprecated Use CodeLensRequest.type */
     const resultType: ProgressType<CodeLens[]>;
 }
 /**
  * A request to resolve a command for a given code lens.
  */
 export declare namespace CodeLensResolveRequest {
-    const type: RequestType<CodeLens, CodeLens, void, void>;
+    const type: ProtocolRequestType<CodeLens, CodeLens, never, void, void>;
 }
 /**
  * The client capabilities of a [DocumentLinkRequest](#DocumentLinkRequest).
@@ -1842,7 +1930,9 @@ export interface DocumentLinkRegistrationOptions extends TextDocumentRegistratio
  * A request to provide document links
  */
 export declare namespace DocumentLinkRequest {
-    const type: RequestType<DocumentLinkParams, DocumentLink[] | null, void, DocumentLinkRegistrationOptions>;
+    const method: 'textDocument/documentLink';
+    const type: ProtocolRequestType<DocumentLinkParams, DocumentLink[] | null, DocumentLink[], void, DocumentLinkRegistrationOptions>;
+    /** @deprecated Use DocumentLinkRequest.type */
     const resultType: ProgressType<DocumentLink[]>;
 }
 /**
@@ -1851,7 +1941,7 @@ export declare namespace DocumentLinkRequest {
  * is of type [DocumentLink](#DocumentLink) or a Thenable that resolves to such.
  */
 export declare namespace DocumentLinkResolveRequest {
-    const type: RequestType<DocumentLink, DocumentLink, void, void>;
+    const type: ProtocolRequestType<DocumentLink, DocumentLink, never, void, void>;
 }
 /**
  * Client capabilities of a [DocumentFormattingRequest](#DocumentFormattingRequest).
@@ -1889,7 +1979,8 @@ export interface DocumentFormattingRegistrationOptions extends TextDocumentRegis
  * A request to to format a whole document.
  */
 export declare namespace DocumentFormattingRequest {
-    const type: RequestType<DocumentFormattingParams, TextEdit[] | null, void, DocumentFormattingRegistrationOptions>;
+    const method: 'textDocument/formatting';
+    const type: ProtocolRequestType<DocumentFormattingParams, TextEdit[] | null, never, void, DocumentFormattingRegistrationOptions>;
 }
 /**
  * Client capabilities of a [DocumentRangeFormattingRequest](#DocumentRangeFormattingRequest).
@@ -1931,7 +2022,8 @@ export interface DocumentRangeFormattingRegistrationOptions extends TextDocument
  * A request to to format a range in a document.
  */
 export declare namespace DocumentRangeFormattingRequest {
-    const type: RequestType<DocumentRangeFormattingParams, TextEdit[] | null, void, DocumentRangeFormattingRegistrationOptions>;
+    const method: 'textDocument/rangeFormatting';
+    const type: ProtocolRequestType<DocumentRangeFormattingParams, TextEdit[] | null, never, void, DocumentRangeFormattingRegistrationOptions>;
 }
 /**
  * Client capabilities of a [DocumentOnTypeFormattingRequest](#DocumentOnTypeFormattingRequest).
@@ -1985,7 +2077,8 @@ export interface DocumentOnTypeFormattingRegistrationOptions extends TextDocumen
  * A request to format a document on type.
  */
 export declare namespace DocumentOnTypeFormattingRequest {
-    const type: RequestType<DocumentOnTypeFormattingParams, TextEdit[] | null, void, DocumentOnTypeFormattingRegistrationOptions>;
+    const method: 'textDocument/onTypeFormatting';
+    const type: ProtocolRequestType<DocumentOnTypeFormattingParams, TextEdit[] | null, never, void, DocumentOnTypeFormattingRegistrationOptions>;
 }
 export interface RenameClientCapabilities {
     /**
@@ -2039,7 +2132,8 @@ export interface RenameRegistrationOptions extends TextDocumentRegistrationOptio
  * A request to rename a symbol.
  */
 export declare namespace RenameRequest {
-    const type: RequestType<RenameParams, WorkspaceEdit | null, void, RenameRegistrationOptions>;
+    const method: 'textDocument/rename';
+    const type: ProtocolRequestType<RenameParams, WorkspaceEdit | null, never, void, RenameRegistrationOptions>;
 }
 export interface PrepareRenameParams extends TextDocumentPositionParams, WorkDoneProgressParams {
 }
@@ -2047,10 +2141,11 @@ export interface PrepareRenameParams extends TextDocumentPositionParams, WorkDon
  * A request to test and perform the setup necessary for a rename.
  */
 export declare namespace PrepareRenameRequest {
-    const type: RequestType<PrepareRenameParams, Range | {
+    const method: 'textDocument/prepareRename';
+    const type: ProtocolRequestType<PrepareRenameParams, Range | {
         range: Range;
         placeholder: string;
-    } | null, void, void>;
+    } | null, never, void, void>;
 }
 /**
  * The client capabilities of a [ExecuteCommandRequest](#ExecuteCommandRequest).
@@ -2093,7 +2188,7 @@ export interface ExecuteCommandRegistrationOptions extends ExecuteCommandOptions
  * a workspace edit which the client will apply to the workspace.
  */
 export declare namespace ExecuteCommandRequest {
-    const type: RequestType<ExecuteCommandParams, any, void, ExecuteCommandRegistrationOptions>;
+    const type: ProtocolRequestType<ExecuteCommandParams, any, never, void, ExecuteCommandRegistrationOptions>;
 }
 export interface WorkspaceEditClientCapabilities {
     /**
@@ -2155,7 +2250,7 @@ export interface ApplyWorkspaceEditResponse {
  * A request sent from the server to the client to modified certain resources.
  */
 export declare namespace ApplyWorkspaceEditRequest {
-    const type: RequestType<ApplyWorkspaceEditParams, ApplyWorkspaceEditResponse, void, void>;
+    const type: ProtocolRequestType<ApplyWorkspaceEditParams, ApplyWorkspaceEditResponse, never, void, void>;
 }
-export { ImplementationRequest, TypeDefinitionRequest, WorkspaceFoldersRequest, DidChangeWorkspaceFoldersNotification, DidChangeWorkspaceFoldersParams, WorkspaceFolder, WorkspaceFoldersChangeEvent, ConfigurationRequest, ConfigurationParams, ConfigurationItem, DocumentColorRequest, ColorPresentationRequest, DocumentColorOptions, DocumentColorParams, ColorPresentationParams, FoldingRangeClientCapabilities, FoldingRangeOptions, FoldingRangeRequest, FoldingRangeParams, DeclarationClientCapabilities, DeclarationRequest, SelectionRangeClientCapabilities, SelectionRangeOptions, SelectionRangeParams, SelectionRangeRequest };
+export { ImplementationRequest, ImplementationParams, ImplementationRegistrationOptions, ImplementationOptions, TypeDefinitionRequest, TypeDefinitionParams, TypeDefinitionRegistrationOptions, TypeDefinitionOptions, WorkspaceFoldersRequest, DidChangeWorkspaceFoldersNotification, DidChangeWorkspaceFoldersParams, WorkspaceFolder, WorkspaceFoldersChangeEvent, ConfigurationRequest, ConfigurationParams, ConfigurationItem, DocumentColorRequest, ColorPresentationRequest, DocumentColorOptions, DocumentColorParams, ColorPresentationParams, DocumentColorRegistrationOptions, FoldingRangeClientCapabilities, FoldingRangeOptions, FoldingRangeRequest, FoldingRangeParams, FoldingRangeRegistrationOptions, DeclarationClientCapabilities, DeclarationRequest, DeclarationParams, DeclarationRegistrationOptions, DeclarationOptions, SelectionRangeClientCapabilities, SelectionRangeOptions, SelectionRangeParams, SelectionRangeRequest, SelectionRangeRegistrationOptions, WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd, WorkDoneProgress, WorkDoneProgressCreateParams, WorkDoneProgressCreateRequest, WorkDoneProgressCancelParams, WorkDoneProgressCancelNotification };
 export { DocumentColorOptions as ColorProviderOptions, DocumentColorOptions as ColorOptions, FoldingRangeOptions as FoldingRangeProviderOptions, SelectionRangeOptions as SelectionRangeProviderOptions, DocumentColorRegistrationOptions as ColorRegistrationOptions };

package/lib/protocol.declaration.d.ts

@@ -1,5 +1,6 @@
-import { RequestType, RequestHandler, ProgressType } from 'vscode-jsonrpc';
+import { RequestHandler, ProgressType } from 'vscode-jsonrpc';
 import { Declaration, DeclarationLink, Location, LocationLink } from 'vscode-languageserver-types';
+import { ProtocolRequestType } from './messages';
 import { TextDocumentRegistrationOptions, StaticRegistrationOptions, TextDocumentPositionParams, PartialResultParams, WorkDoneProgressParams, WorkDoneProgressOptions } from './protocol';
 /**
  * Since 3.14.0
@@ -30,7 +31,9 @@ export interface DeclarationParams extends TextDocumentPositionParams, WorkDoneP
  * to such.
  */
 export declare namespace DeclarationRequest {
-    const type: RequestType<DeclarationParams, Location | Location[] | LocationLink[] | null, void, DeclarationRegistrationOptions>;
-    const resultType: ProgressType<Location[] | LocationLink[]>;
+    const method: 'textDocument/declaration';
+    const type: ProtocolRequestType<DeclarationParams, Location | LocationLink[] | Location[] | null, LocationLink[] | Location[], void, DeclarationRegistrationOptions>;
+    /** @deprecated Use DeclarationRequest.type */
+    const resultType: ProgressType<LocationLink[] | Location[]>;
     type HandlerSignature = RequestHandler<DeclarationParams, Declaration | DeclarationLink[] | null, void>;
 }

package/lib/protocol.declaration.js

@@ -5,6 +5,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const messages_1 = require("./messages");
 // @ts-ignore: to avoid inlining LocatioLink as dynamic import
 let __noDynamicImport;
 /**
@@ -16,6 +17,8 @@ let __noDynamicImport;
  */
 var DeclarationRequest;
 (function (DeclarationRequest) {
-    DeclarationRequest.type = new vscode_jsonrpc_1.RequestType('textDocument/declaration');
+    DeclarationRequest.method = 'textDocument/declaration';
+    DeclarationRequest.type = new messages_1.ProtocolRequestType(DeclarationRequest.method);
+    /** @deprecated Use DeclarationRequest.type */
     DeclarationRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DeclarationRequest = exports.DeclarationRequest || (exports.DeclarationRequest = {}));

package/lib/protocol.foldingRange.d.ts

@@ -1,5 +1,6 @@
-import { RequestType, RequestHandler, ProgressType } from 'vscode-jsonrpc';
+import { RequestHandler, ProgressType } from 'vscode-jsonrpc';
 import { TextDocumentIdentifier } from 'vscode-languageserver-types';
+import { ProtocolRequestType } from './messages';
 import { TextDocumentRegistrationOptions, StaticRegistrationOptions, PartialResultParams, WorkDoneProgressParams, WorkDoneProgressOptions } from './protocol';
 export interface FoldingRangeClientCapabilities {
     /**
@@ -83,7 +84,9 @@ export interface FoldingRangeParams extends WorkDoneProgressParams, PartialResul
  * that resolves to such.
  */
 export declare namespace FoldingRangeRequest {
-    const type: RequestType<FoldingRangeParams, FoldingRange[] | null, any, FoldingRangeRegistrationOptions>;
+    const method: 'textDocument/foldingRange';
+    const type: ProtocolRequestType<FoldingRangeParams, FoldingRange[] | null, FoldingRange[], any, FoldingRangeRegistrationOptions>;
+    /** @deprecated Use FoldingRangeRequest.type */
     const resultType: ProgressType<FoldingRange[]>;
     type HandlerSignature = RequestHandler<FoldingRangeParams, FoldingRange[] | null, void>;
 }

package/lib/protocol.foldingRange.js

@@ -5,6 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const messages_1 = require("./messages");
 /**
  * Enum of known range kinds
  */
@@ -31,6 +32,8 @@ var FoldingRangeKind;
  */
 var FoldingRangeRequest;
 (function (FoldingRangeRequest) {
-    FoldingRangeRequest.type = new vscode_jsonrpc_1.RequestType('textDocument/foldingRange');
+    FoldingRangeRequest.method = 'textDocument/foldingRange';
+    FoldingRangeRequest.type = new messages_1.ProtocolRequestType(FoldingRangeRequest.method);
+    /** @deprecated Use FoldingRangeRequest.type */
     FoldingRangeRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(FoldingRangeRequest = exports.FoldingRangeRequest || (exports.FoldingRangeRequest = {}));

package/lib/protocol.implementation.d.ts

@@ -1,5 +1,6 @@
-import { RequestType, RequestHandler, ProgressType } from 'vscode-jsonrpc';
+import { RequestHandler, ProgressType } from 'vscode-jsonrpc';
 import { Definition, DefinitionLink, Location, LocationLink } from 'vscode-languageserver-types';
+import { ProtocolRequestType } from './messages';
 import { TextDocumentRegistrationOptions, StaticRegistrationOptions, TextDocumentPositionParams, PartialResultParams, WorkDoneProgressParams, WorkDoneProgressOptions } from './protocol';
 /**
  * Since 3.6.0
@@ -31,7 +32,9 @@ export interface ImplementationParams extends TextDocumentPositionParams, WorkDo
  * Thenable that resolves to such.
  */
 export declare namespace ImplementationRequest {
-    const type: RequestType<ImplementationParams, Location | Location[] | LocationLink[] | null, void, ImplementationRegistrationOptions>;
-    const resultType: ProgressType<Location[] | LocationLink[]>;
+    const method: 'textDocument/implementation';
+    const type: ProtocolRequestType<ImplementationParams, Location | Location[] | LocationLink[] | null, LocationLink[] | Location[], void, ImplementationRegistrationOptions>;
+    /** @deprecated Use ImplementationRequest.type */
+    const resultType: ProgressType<LocationLink[] | Location[]>;
     type HandlerSignature = RequestHandler<ImplementationParams, Definition | DefinitionLink[] | null, void>;
 }

package/lib/protocol.implementation.js

@@ -5,6 +5,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const messages_1 = require("./messages");
 // @ts-ignore: to avoid inlining LocatioLink as dynamic import
 let __noDynamicImport;
 /**
@@ -15,6 +16,8 @@ let __noDynamicImport;
  */
 var ImplementationRequest;
 (function (ImplementationRequest) {
-    ImplementationRequest.type = new vscode_jsonrpc_1.RequestType('textDocument/implementation');
+    ImplementationRequest.method = 'textDocument/implementation';
+    ImplementationRequest.type = new messages_1.ProtocolRequestType(ImplementationRequest.method);
+    /** @deprecated Use ImplementationRequest.type */
     ImplementationRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(ImplementationRequest = exports.ImplementationRequest || (exports.ImplementationRequest = {}));