diff --git a/protocol/src/common/messages.ts b/protocol/src/common/messages.ts index f4fb1548..7763f70d 100644 --- a/protocol/src/common/messages.ts +++ b/protocol/src/common/messages.ts @@ -76,3 +76,10 @@ export class ProtocolNotificationType extends NotificationType

impleme super(method, ParameterStructures.byName); } } + +export type CM = { client: C; server: S }; +export namespace CM { + export function create(client: C, server: S): CM { + return { client, server }; + } +} diff --git a/protocol/src/common/protocol.callHierarchy.ts b/protocol/src/common/protocol.callHierarchy.ts index 97c9b47d..5b21256f 100644 --- a/protocol/src/common/protocol.callHierarchy.ts +++ b/protocol/src/common/protocol.callHierarchy.ts @@ -6,11 +6,10 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, - CM } from './protocol'; /** diff --git a/protocol/src/common/protocol.colorProvider.ts b/protocol/src/common/protocol.colorProvider.ts index aa439df2..ccfecf15 100644 --- a/protocol/src/common/protocol.colorProvider.ts +++ b/protocol/src/common/protocol.colorProvider.ts @@ -6,10 +6,9 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { TextDocumentIdentifier, Range, Color, ColorInformation, ColorPresentation } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, - CM } from './protocol'; //---- Client capability ---- diff --git a/protocol/src/common/protocol.configuration.ts b/protocol/src/common/protocol.configuration.ts index d7b16f25..304dd381 100644 --- a/protocol/src/common/protocol.configuration.ts +++ b/protocol/src/common/protocol.configuration.ts @@ -6,8 +6,7 @@ import { RequestHandler, HandlerResult, CancellationToken } from 'vscode-jsonrpc'; import { LSPAny, URI } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; -import { CM } from './protocol'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; //---- Get Configuration request ---- diff --git a/protocol/src/common/protocol.declaration.ts b/protocol/src/common/protocol.declaration.ts index c92f2f68..52dbc0d2 100644 --- a/protocol/src/common/protocol.declaration.ts +++ b/protocol/src/common/protocol.declaration.ts @@ -6,11 +6,10 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { Declaration, DeclarationLink, Location, LocationLink } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, - CM } from './protocol'; // @ts-ignore: to avoid inlining LocationLink as dynamic import diff --git a/protocol/src/common/protocol.diagnostic.ts b/protocol/src/common/protocol.diagnostic.ts index c3c9dd8b..75e1ff93 100644 --- a/protocol/src/common/protocol.diagnostic.ts +++ b/protocol/src/common/protocol.diagnostic.ts @@ -7,11 +7,10 @@ import { RequestHandler0, RequestHandler, ProgressType } from 'vscode-jsonrpc'; import { TextDocumentIdentifier, Diagnostic, DocumentUri, integer } from 'vscode-languageserver-types'; import * as Is from './utils/is'; -import { MessageDirection, ProtocolRequestType0, ProtocolRequestType } from './messages'; +import { MessageDirection, ProtocolRequestType0, ProtocolRequestType, CM } from './messages'; import { type PartialResultParams, type StaticRegistrationOptions, type WorkDoneProgressParams, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type DiagnosticsCapabilities, - CM } from './protocol'; /** diff --git a/protocol/src/common/protocol.fileOperations.ts b/protocol/src/common/protocol.fileOperations.ts index 222eed3f..defd09a9 100644 --- a/protocol/src/common/protocol.fileOperations.ts +++ b/protocol/src/common/protocol.fileOperations.ts @@ -5,8 +5,7 @@ import { NotificationHandler, RequestHandler } from 'vscode-jsonrpc'; import { WorkspaceEdit } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolNotificationType, ProtocolRequestType } from './messages'; -import { CM } from './protocol'; +import { CM, MessageDirection, ProtocolNotificationType, ProtocolRequestType } from './messages'; /** * Options for notifications/requests for user operations on files. diff --git a/protocol/src/common/protocol.foldingRange.ts b/protocol/src/common/protocol.foldingRange.ts index 8bdaa9a1..ba2dbdc7 100644 --- a/protocol/src/common/protocol.foldingRange.ts +++ b/protocol/src/common/protocol.foldingRange.ts @@ -6,10 +6,9 @@ import { RequestHandler, RequestHandler0 } from 'vscode-jsonrpc'; import { TextDocumentIdentifier, uinteger, FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages'; +import { CM, MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, - CM } from './protocol'; // ---- capabilities diff --git a/protocol/src/common/protocol.implementation.ts b/protocol/src/common/protocol.implementation.ts index f5caa6a3..1bfa087c 100644 --- a/protocol/src/common/protocol.implementation.ts +++ b/protocol/src/common/protocol.implementation.ts @@ -6,11 +6,10 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { Definition, DefinitionLink, Location, LocationLink } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams, - type WorkDoneProgressOptions, - CM + type WorkDoneProgressOptions } from './protocol'; // @ts-ignore: to avoid inlining LocationLink as dynamic import diff --git a/protocol/src/common/protocol.inlayHint.ts b/protocol/src/common/protocol.inlayHint.ts index 1f499e14..ba561c10 100644 --- a/protocol/src/common/protocol.inlayHint.ts +++ b/protocol/src/common/protocol.inlayHint.ts @@ -5,9 +5,9 @@ import { RequestHandler, RequestHandler0 } from 'vscode-jsonrpc'; import { Range, TextDocumentIdentifier, InlayHint } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages'; +import { CM, MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages'; -import { CM, type StaticRegistrationOptions, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type WorkDoneProgressParams } from './protocol'; +import { type StaticRegistrationOptions, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type WorkDoneProgressParams } from './protocol'; /** * @since 3.18.0 diff --git a/protocol/src/common/protocol.inlineCompletion.ts b/protocol/src/common/protocol.inlineCompletion.ts index 34998f6e..4fa04929 100644 --- a/protocol/src/common/protocol.inlineCompletion.ts +++ b/protocol/src/common/protocol.inlineCompletion.ts @@ -6,8 +6,8 @@ import { InlineCompletionItem, InlineCompletionContext, InlineCompletionList } from 'vscode-languageserver-types'; import { RequestHandler } from 'vscode-jsonrpc'; -import { MessageDirection, ProtocolRequestType } from './messages'; -import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, type TextDocumentPositionParams, CM } from './protocol'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; +import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, type TextDocumentPositionParams } from './protocol'; // ---- capabilities diff --git a/protocol/src/common/protocol.inlineValue.ts b/protocol/src/common/protocol.inlineValue.ts index 98cac431..6786ef88 100644 --- a/protocol/src/common/protocol.inlineValue.ts +++ b/protocol/src/common/protocol.inlineValue.ts @@ -6,8 +6,8 @@ import { TextDocumentIdentifier, Range, InlineValue, InlineValueContext } from 'vscode-languageserver-types'; import { RequestHandler, RequestHandler0 } from 'vscode-jsonrpc'; -import { MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages'; -import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, CM } from './protocol'; +import { CM, MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages'; +import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams } from './protocol'; // ---- capabilities diff --git a/protocol/src/common/protocol.linkedEditingRange.ts b/protocol/src/common/protocol.linkedEditingRange.ts index ef9a0eb6..aded22d8 100644 --- a/protocol/src/common/protocol.linkedEditingRange.ts +++ b/protocol/src/common/protocol.linkedEditingRange.ts @@ -6,11 +6,10 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { Range } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { CM, MessageDirection, ProtocolRequestType } from './messages'; import { type StaticRegistrationOptions, type TextDocumentPositionParams, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type WorkDoneProgressParams, - CM } from './protocol'; /** diff --git a/protocol/src/common/protocol.moniker.ts b/protocol/src/common/protocol.moniker.ts index ae68a4d8..649b6ca8 100644 --- a/protocol/src/common/protocol.moniker.ts +++ b/protocol/src/common/protocol.moniker.ts @@ -3,10 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { MessageDirection, ProtocolRequestType } from './messages'; +import { MessageDirection, ProtocolRequestType, CM } from './messages'; import { type WorkDoneProgressOptions, type WorkDoneProgressParams, type PartialResultParams, type TextDocumentRegistrationOptions, type TextDocumentPositionParams, - CM } from './protocol'; /** diff --git a/protocol/src/common/protocol.progress.ts b/protocol/src/common/protocol.progress.ts index f1d12a79..5cf01efc 100644 --- a/protocol/src/common/protocol.progress.ts +++ b/protocol/src/common/protocol.progress.ts @@ -6,8 +6,7 @@ import { NotificationHandler, RequestHandler, ProgressType, ProgressToken } from 'vscode-jsonrpc'; import { uinteger } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType, ProtocolNotificationType } from './messages'; -import { CM } from './protocol'; +import { MessageDirection, ProtocolRequestType, ProtocolNotificationType, CM } from './messages'; export interface WorkDoneProgressBegin { diff --git a/protocol/src/common/protocol.selectionRange.ts b/protocol/src/common/protocol.selectionRange.ts index 8fc448b3..4946f3f1 100644 --- a/protocol/src/common/protocol.selectionRange.ts +++ b/protocol/src/common/protocol.selectionRange.ts @@ -6,10 +6,9 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { TextDocumentIdentifier, Position, SelectionRange } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { MessageDirection, ProtocolRequestType, CM } from './messages'; import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, type PartialResultParams, - CM } from './protocol'; // ---- capabilities diff --git a/protocol/src/common/protocol.semanticTokens.ts b/protocol/src/common/protocol.semanticTokens.ts index d40669ac..1f083b19 100644 --- a/protocol/src/common/protocol.semanticTokens.ts +++ b/protocol/src/common/protocol.semanticTokens.ts @@ -6,10 +6,9 @@ import { TextDocumentIdentifier, Range, uinteger, SemanticTokensEdit, SemanticTokensLegend, SemanticTokens, SemanticTokensDelta } from 'vscode-languageserver-types'; import { RequestHandler0, RequestHandler } from 'vscode-jsonrpc'; -import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, RegistrationType } from './messages'; +import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, RegistrationType, CM } from './messages'; import { - type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, type TextDocumentRegistrationOptions, type StaticRegistrationOptions, - CM + type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, type TextDocumentRegistrationOptions, type StaticRegistrationOptions } from './protocol'; /** diff --git a/protocol/src/common/protocol.showDocument.ts b/protocol/src/common/protocol.showDocument.ts index 4680151b..c15f08d6 100644 --- a/protocol/src/common/protocol.showDocument.ts +++ b/protocol/src/common/protocol.showDocument.ts @@ -5,8 +5,7 @@ import { CancellationToken, HandlerResult, RequestHandler } from 'vscode-jsonrpc'; import { Range, URI } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; -import { CM } from './protocol'; +import { MessageDirection, ProtocolRequestType, CM } from './messages'; /** * Client capabilities for the showDocument request. diff --git a/protocol/src/common/protocol.textDocumentContent.ts b/protocol/src/common/protocol.textDocumentContent.ts index b686a5e6..8f862dd5 100644 --- a/protocol/src/common/protocol.textDocumentContent.ts +++ b/protocol/src/common/protocol.textDocumentContent.ts @@ -6,8 +6,8 @@ import type { DocumentUri } from 'vscode-languageserver-types'; import type { RequestHandler } from 'vscode-jsonrpc'; -import { MessageDirection, ProtocolRequestType } from './messages'; -import { type StaticRegistrationOptions, CM } from './protocol'; +import { MessageDirection, ProtocolRequestType, CM } from './messages'; +import { type StaticRegistrationOptions } from './protocol'; /** * Client capabilities for a text document content provider. diff --git a/protocol/src/common/protocol.ts b/protocol/src/common/protocol.ts index 19f11b67..9a209c80 100644 --- a/protocol/src/common/protocol.ts +++ b/protocol/src/common/protocol.ts @@ -5,7 +5,7 @@ import { ProgressToken, RequestHandler, TraceValue } from 'vscode-jsonrpc'; -import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, ProtocolNotificationType, ProtocolNotificationType0 } from './messages'; +import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, ProtocolNotificationType, ProtocolNotificationType0, CM } from './messages'; import { Position, Range, Location, LocationLink, Diagnostic, Command, TextEdit, WorkspaceEdit, WorkspaceEditMetadata, DocumentUri, @@ -134,13 +134,6 @@ import { // @ts-ignore: to avoid inlining LocationLink as dynamic import let __noDynamicImport: LocationLink | undefined; -export type CM = { client: C; server: S }; -export namespace CM { - export function create(client: C, server: S): CM { - return { client, server }; - } -} - /** * A document filter where `language` is required field. * diff --git a/protocol/src/common/protocol.typeDefinition.ts b/protocol/src/common/protocol.typeDefinition.ts index b3c182f1..5edc1a99 100644 --- a/protocol/src/common/protocol.typeDefinition.ts +++ b/protocol/src/common/protocol.typeDefinition.ts @@ -6,14 +6,13 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { Definition, DefinitionLink, LocationLink, Location } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { MessageDirection, ProtocolRequestType, CM } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams, - type WorkDoneProgressOptions, - CM + type WorkDoneProgressOptions } from './protocol'; -// @ts-ignore: to avoid inlining LocatioLink as dynamic import +// @ts-ignore: to avoid inlining LocationLink as dynamic import let __noDynamicImport: LocationLink | Declaration | DeclarationLink | Location | undefined; /** diff --git a/protocol/src/common/protocol.typeHierarchy.ts b/protocol/src/common/protocol.typeHierarchy.ts index 25077497..b6adf0d0 100644 --- a/protocol/src/common/protocol.typeHierarchy.ts +++ b/protocol/src/common/protocol.typeHierarchy.ts @@ -6,11 +6,10 @@ import { RequestHandler } from 'vscode-jsonrpc'; import { TypeHierarchyItem } from 'vscode-languageserver-types'; -import { MessageDirection, ProtocolRequestType } from './messages'; +import { MessageDirection, ProtocolRequestType, CM } from './messages'; import { type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, - type WorkDoneProgressParams, type WorkDoneProgressOptions, - CM + type WorkDoneProgressParams, type WorkDoneProgressOptions } from './protocol'; /** diff --git a/protocol/src/common/protocol.workspaceFolder.ts b/protocol/src/common/protocol.workspaceFolder.ts index f3168f5e..5fcdefb1 100644 --- a/protocol/src/common/protocol.workspaceFolder.ts +++ b/protocol/src/common/protocol.workspaceFolder.ts @@ -6,8 +6,7 @@ import { WorkspaceFolder } from 'vscode-languageserver-types'; import { RequestHandler0, NotificationHandler, HandlerResult, CancellationToken } from 'vscode-jsonrpc'; -import { MessageDirection, ProtocolRequestType0, ProtocolNotificationType } from './messages'; -import { CM } from './protocol'; +import { MessageDirection, ProtocolRequestType0, ProtocolNotificationType, CM } from './messages'; export interface WorkspaceFoldersInitializeParams { /**