Skip to content

Commit d810d51

Browse files
dbaeumerdbaeumer
authored
Break cyclic dependencies (#1612)
1 parent 12a0abe commit d810d51

23 files changed

+38
-55
lines changed

‎protocol/src/common/messages.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,10 @@ export class ProtocolNotificationType<P, RO> extends NotificationType<P> impleme
7676
super(method, ParameterStructures.byName);
7777
}
7878
}
79+
80+
export type CM<C extends string | undefined, S extends string | undefined> = { client: C; server: S };
81+
export namespace CM {
82+
export function create<C extends string | undefined, S extends string | undefined>(client: C, server: S): CM<C, S> {
83+
return { client, server };
84+
}
85+
}

‎protocol/src/common/protocol.callHierarchy.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams,
1212
type WorkDoneProgressParams, type WorkDoneProgressOptions,
13-
CM
1413
} from './protocol';
1514

1615
/**

‎protocol/src/common/protocol.colorProvider.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { TextDocumentIdentifier, Range, Color, ColorInformation, ColorPresentation } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions,
12-
CM
1312
} from './protocol';
1413

1514
//---- Client capability ----

‎protocol/src/common/protocol.configuration.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import { RequestHandler, HandlerResult, CancellationToken } from 'vscode-jsonrpc';
77
import { LSPAny, URI } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
10-
import { CM } from './protocol';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
1110

1211
//---- Get Configuration request ----
1312

‎protocol/src/common/protocol.declaration.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { Declaration, DeclarationLink, Location, LocationLink } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams,
1212
type WorkDoneProgressOptions,
13-
CM
1413
} from './protocol';
1514

1615
// @ts-ignore: to avoid inlining LocationLink as dynamic import

‎protocol/src/common/protocol.diagnostic.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import { RequestHandler0, RequestHandler, ProgressType } from 'vscode-jsonrpc';
77
import { TextDocumentIdentifier, Diagnostic, DocumentUri, integer } from 'vscode-languageserver-types';
88

99
import * as Is from './utils/is';
10-
import { MessageDirection, ProtocolRequestType0, ProtocolRequestType } from './messages';
10+
import { MessageDirection, ProtocolRequestType0, ProtocolRequestType, CM } from './messages';
1111
import {
1212
type PartialResultParams, type StaticRegistrationOptions, type WorkDoneProgressParams, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions,
1313
type DiagnosticsCapabilities,
14-
CM
1514
} from './protocol';
1615

1716
/**

‎protocol/src/common/protocol.fileOperations.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import { NotificationHandler, RequestHandler } from 'vscode-jsonrpc';
77
import { WorkspaceEdit } from 'vscode-languageserver-types';
8-
import { MessageDirection, ProtocolNotificationType, ProtocolRequestType } from './messages';
9-
import { CM } from './protocol';
8+
import { CM, MessageDirection, ProtocolNotificationType, ProtocolRequestType } from './messages';
109

1110
/**
1211
* Options for notifications/requests for user operations on files.

‎protocol/src/common/protocol.foldingRange.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import { RequestHandler, RequestHandler0 } from 'vscode-jsonrpc';
77
import { TextDocumentIdentifier, uinteger, FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages';
9+
import { CM, MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions,
12-
CM
1312
} from './protocol';
1413

1514
// ---- capabilities

‎protocol/src/common/protocol.implementation.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { Definition, DefinitionLink, Location, LocationLink } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams,
12-
type WorkDoneProgressOptions,
13-
CM
12+
type WorkDoneProgressOptions
1413
} from './protocol';
1514

1615
// @ts-ignore: to avoid inlining LocationLink as dynamic import

‎protocol/src/common/protocol.inlayHint.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import { RequestHandler, RequestHandler0 } from 'vscode-jsonrpc';
77
import { Range, TextDocumentIdentifier, InlayHint } from 'vscode-languageserver-types';
8-
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages';
8+
import { CM, MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages';
99

10-
import { CM, type StaticRegistrationOptions, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type WorkDoneProgressParams } from './protocol';
10+
import { type StaticRegistrationOptions, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type WorkDoneProgressParams } from './protocol';
1111

1212
/**
1313
* @since 3.18.0

‎protocol/src/common/protocol.inlineCompletion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import { InlineCompletionItem, InlineCompletionContext, InlineCompletionList } from 'vscode-languageserver-types';
77
import { RequestHandler } from 'vscode-jsonrpc';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
10-
import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, type TextDocumentPositionParams, CM } from './protocol';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
10+
import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, type TextDocumentPositionParams } from './protocol';
1111

1212
// ---- capabilities
1313

‎protocol/src/common/protocol.inlineValue.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import { TextDocumentIdentifier, Range, InlineValue, InlineValueContext } from 'vscode-languageserver-types';
77
import { RequestHandler, RequestHandler0 } from 'vscode-jsonrpc';
88

9-
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages';
10-
import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, CM } from './protocol';
9+
import { CM, MessageDirection, ProtocolRequestType, ProtocolRequestType0 } from './messages';
10+
import { type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams } from './protocol';
1111

1212
// ---- capabilities
1313

‎protocol/src/common/protocol.linkedEditingRange.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { Range } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { CM, MessageDirection, ProtocolRequestType } from './messages';
1010
import {
1111
type StaticRegistrationOptions, type TextDocumentPositionParams, type TextDocumentRegistrationOptions, type WorkDoneProgressOptions,
1212
type WorkDoneProgressParams,
13-
CM
1413
} from './protocol';
1514

1615
/**

‎protocol/src/common/protocol.moniker.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
* ------------------------------------------------------------------------------------------ */
55

6-
import { MessageDirection, ProtocolRequestType } from './messages';
6+
import { MessageDirection, ProtocolRequestType, CM } from './messages';
77
import {
88
type WorkDoneProgressOptions, type WorkDoneProgressParams, type PartialResultParams, type TextDocumentRegistrationOptions, type TextDocumentPositionParams,
9-
CM
109
} from './protocol';
1110

1211
/**

‎protocol/src/common/protocol.progress.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import { NotificationHandler, RequestHandler, ProgressType, ProgressToken } from 'vscode-jsonrpc';
77
import { uinteger } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType, ProtocolNotificationType } from './messages';
10-
import { CM } from './protocol';
9+
import { MessageDirection, ProtocolRequestType, ProtocolNotificationType, CM } from './messages';
1110

1211
export interface WorkDoneProgressBegin {
1312

‎protocol/src/common/protocol.selectionRange.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { TextDocumentIdentifier, Position, SelectionRange } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { MessageDirection, ProtocolRequestType, CM } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type WorkDoneProgressOptions, type StaticRegistrationOptions, type WorkDoneProgressParams, type PartialResultParams,
12-
CM
1312
} from './protocol';
1413

1514
// ---- capabilities

‎protocol/src/common/protocol.semanticTokens.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import { TextDocumentIdentifier, Range, uinteger, SemanticTokensEdit, SemanticTokensLegend, SemanticTokens, SemanticTokensDelta } from 'vscode-languageserver-types';
77
import { RequestHandler0, RequestHandler } from 'vscode-jsonrpc';
88

9-
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, RegistrationType } from './messages';
9+
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, RegistrationType, CM } from './messages';
1010
import {
11-
type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, type TextDocumentRegistrationOptions, type StaticRegistrationOptions,
12-
CM
11+
type PartialResultParams, type WorkDoneProgressParams, type WorkDoneProgressOptions, type TextDocumentRegistrationOptions, type StaticRegistrationOptions
1312
} from './protocol';
1413

1514
/**

‎protocol/src/common/protocol.showDocument.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import { CancellationToken, HandlerResult, RequestHandler } from 'vscode-jsonrpc';
77
import { Range, URI } from 'vscode-languageserver-types';
8-
import { MessageDirection, ProtocolRequestType } from './messages';
9-
import { CM } from './protocol';
8+
import { MessageDirection, ProtocolRequestType, CM } from './messages';
109

1110
/**
1211
* Client capabilities for the showDocument request.

‎protocol/src/common/protocol.textDocumentContent.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import type { DocumentUri } from 'vscode-languageserver-types';
77
import type { RequestHandler } from 'vscode-jsonrpc';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
10-
import { type StaticRegistrationOptions, CM } from './protocol';
9+
import { MessageDirection, ProtocolRequestType, CM } from './messages';
10+
import { type StaticRegistrationOptions } from './protocol';
1111

1212
/**
1313
* Client capabilities for a text document content provider.

‎protocol/src/common/protocol.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { ProgressToken, RequestHandler, TraceValue } from 'vscode-jsonrpc';
77

8-
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, ProtocolNotificationType, ProtocolNotificationType0 } from './messages';
8+
import { MessageDirection, ProtocolRequestType, ProtocolRequestType0, ProtocolNotificationType, ProtocolNotificationType0, CM } from './messages';
99

1010
import {
1111
Position, Range, Location, LocationLink, Diagnostic, Command, TextEdit, WorkspaceEdit, WorkspaceEditMetadata, DocumentUri,
@@ -134,13 +134,6 @@ import {
134134
// @ts-ignore: to avoid inlining LocationLink as dynamic import
135135
let __noDynamicImport: LocationLink | undefined;
136136

137-
export type CM<C extends string | undefined, S extends string | undefined> = { client: C; server: S };
138-
export namespace CM {
139-
export function create<C extends string | undefined, S extends string | undefined>(client: C, server: S): CM<C, S> {
140-
return { client, server };
141-
}
142-
}
143-
144137
/**
145138
* A document filter where `language` is required field.
146139
*

‎protocol/src/common/protocol.typeDefinition.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { Definition, DefinitionLink, LocationLink, Location } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { MessageDirection, ProtocolRequestType, CM } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams, type WorkDoneProgressParams,
12-
type WorkDoneProgressOptions,
13-
CM
12+
type WorkDoneProgressOptions
1413
} from './protocol';
1514

16-
// @ts-ignore: to avoid inlining LocatioLink as dynamic import
15+
// @ts-ignore: to avoid inlining LocationLink as dynamic import
1716
let __noDynamicImport: LocationLink | Declaration | DeclarationLink | Location | undefined;
1817

1918
/**

‎protocol/src/common/protocol.typeHierarchy.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import { RequestHandler } from 'vscode-jsonrpc';
77
import { TypeHierarchyItem } from 'vscode-languageserver-types';
88

9-
import { MessageDirection, ProtocolRequestType } from './messages';
9+
import { MessageDirection, ProtocolRequestType, CM } from './messages';
1010
import {
1111
type TextDocumentRegistrationOptions, type StaticRegistrationOptions, type TextDocumentPositionParams, type PartialResultParams,
12-
type WorkDoneProgressParams, type WorkDoneProgressOptions,
13-
CM
12+
type WorkDoneProgressParams, type WorkDoneProgressOptions
1413
} from './protocol';
1514

1615
/**

‎protocol/src/common/protocol.workspaceFolder.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import { WorkspaceFolder } from 'vscode-languageserver-types';
77
import { RequestHandler0, NotificationHandler, HandlerResult, CancellationToken } from 'vscode-jsonrpc';
88

9-
import { MessageDirection, ProtocolRequestType0, ProtocolNotificationType } from './messages';
10-
import { CM } from './protocol';
9+
import { MessageDirection, ProtocolRequestType0, ProtocolNotificationType, CM } from './messages';
1110

1211
export interface WorkspaceFoldersInitializeParams {
1312
/**

0 commit comments

Comments
 (0)