Skip to content

Commit

Permalink
Break cyclic dependencies (#1612)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbaeumer
dbaeumer authored Feb 5, 2025
1 parent 12a0abe commit d810d51
Show file tree
Hide file tree
Showing 23 changed files with 38 additions and 55 deletions.
7 changes: 7 additions & 0 deletions protocol/src/common/messages.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,10 @@ export class ProtocolNotificationType<P, RO> extends NotificationType<P> impleme
super(method, ParameterStructures.byName);
}
}

export type CM<C extends string | undefined, S extends string | undefined> = { client: C; server: S };
export namespace CM {
export function create<C extends string | undefined, S extends string | undefined>(client: C, server: S): CM<C, S> {
return { client, server };
}
}
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.callHierarchy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.colorProvider.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.configuration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----

Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.declaration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.diagnostic.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.fileOperations.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.foldingRange.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions protocol/src/common/protocol.implementation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions protocol/src/common/protocol.inlayHint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions protocol/src/common/protocol.inlineCompletion.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions protocol/src/common/protocol.inlineValue.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.linkedEditingRange.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.moniker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.progress.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.selectionRange.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions protocol/src/common/protocol.semanticTokens.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.showDocument.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions protocol/src/common/protocol.textDocumentContent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 1 addition & 8 deletions protocol/src/common/protocol.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -134,13 +134,6 @@ import {
// @ts-ignore: to avoid inlining LocationLink as dynamic import
let __noDynamicImport: LocationLink | undefined;

export type CM<C extends string | undefined, S extends string | undefined> = { client: C; server: S };
export namespace CM {
export function create<C extends string | undefined, S extends string | undefined>(client: C, server: S): CM<C, S> {
return { client, server };
}
}

/**
* A document filter where `language` is required field.
*
Expand Down
7 changes: 3 additions & 4 deletions protocol/src/common/protocol.typeDefinition.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
5 changes: 2 additions & 3 deletions protocol/src/common/protocol.typeHierarchy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
3 changes: 1 addition & 2 deletions protocol/src/common/protocol.workspaceFolder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down

0 comments on commit d810d51

Please sign in to comment.