Skip to content

Commit f597a2d

Browse files
committed
refactor: rename LSP client configuration types, remove LSP server info
1 parent fc3f478 commit f597a2d

File tree

4 files changed

+8
-29
lines changed

4 files changed

+8
-29
lines changed

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cm/lsp/clientManager.ts

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,8 @@ interface InitContext {
9999
originalRootUri: string | null;
100100
}
101101

102-
interface LSPPluginInstance {
103-
fromPosition: (
104-
pos: { line: number; character: number },
105-
doc: unknown,
106-
) => number;
107-
syncedDoc: { length: number };
108-
unsyncedChanges: {
109-
mapPos: (pos: number, assoc?: number, mode?: MapMode) => number | null;
110-
empty: boolean;
111-
};
112-
client: LSPClient & {
113-
sync: () => void;
114-
};
115-
clear: () => void;
116-
}
117-
118102
interface ExtendedLSPClient extends LSPClient {
119103
__acodeLoggedInfo?: boolean;
120-
serverInfo?: { name?: string; version?: string };
121104
}
122105

123106
export class LspClientManager {
@@ -227,7 +210,7 @@ export class LspClientManager {
227210
const capabilities = state.client.serverCapabilities;
228211
if (!capabilities?.documentFormattingProvider) continue;
229212
state.attach(uri, view);
230-
const plugin = LSPPlugin.get(view) as LSPPluginInstance | null;
213+
const plugin = LSPPlugin.get(view);
231214
if (!plugin) continue;
232215
plugin.client.sync();
233216
const edits = await state.client.request<
@@ -518,10 +501,6 @@ export class LspClientManager {
518501
client.connect(transportHandle.transport);
519502
await client.initializing;
520503
if (!client.__acodeLoggedInfo) {
521-
const info = client.serverInfo;
522-
if (info) {
523-
console.info(`[LSP:${server.id}] server info`, info);
524-
}
525504
if (normalizedRootUri) {
526505
if (originalRootUri && originalRootUri !== normalizedRootUri) {
527506
console.info(
@@ -664,7 +643,7 @@ interface Change {
664643
}
665644

666645
function applyTextEdits(
667-
plugin: LSPPluginInstance,
646+
plugin: LSPPlugin,
668647
view: EditorView,
669648
edits: TextEdit[],
670649
): boolean {

src/cm/lsp/serverRegistry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type {
2+
AcodeClientConfig,
23
BridgeConfig,
3-
ClientConfig,
44
LanguageResolverContext,
55
LauncherConfig,
66
LspServerDefinition,
@@ -109,7 +109,7 @@ interface RawServerDefinition {
109109
languages?: string[];
110110
transport?: RawTransportDescriptor | TransportDescriptor;
111111
initializationOptions?: Record<string, unknown>;
112-
clientConfig?: Record<string, unknown> | ClientConfig;
112+
clientConfig?: Record<string, unknown> | AcodeClientConfig;
113113
startupTimeout?: number;
114114
capabilityOverrides?: Record<string, unknown>;
115115
rootUri?:

src/cm/lsp/types.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ export interface BuiltinExtensionsConfig {
110110
diagnostics?: boolean;
111111
}
112112

113-
export interface ClientConfig {
113+
export interface AcodeClientConfig {
114114
useDefaultExtensions?: boolean;
115115
builtinExtensions?: BuiltinExtensionsConfig;
116-
extensions?: Extension[];
116+
extensions?: (Extension | LSPClientExtension)[];
117117
notificationHandlers?: Record<
118118
string,
119119
(client: LSPClient, params: unknown) => boolean
@@ -137,7 +137,7 @@ export interface LspServerDefinition {
137137
languages: string[];
138138
transport: TransportDescriptor;
139139
initializationOptions?: Record<string, unknown>;
140-
clientConfig?: ClientConfig;
140+
clientConfig?: AcodeClientConfig;
141141
startupTimeout?: number;
142142
capabilityOverrides?: Record<string, unknown>;
143143
rootUri?: ((uri: string, context: RootUriContext) => string | null) | null;
@@ -288,6 +288,5 @@ export interface ParsedUri {
288288
declare module "@codemirror/lsp-client" {
289289
interface LSPClient {
290290
__acodeLoggedInfo?: boolean;
291-
serverInfo?: { name?: string; version?: string };
292291
}
293292
}

0 commit comments

Comments
 (0)