Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 46 additions & 3 deletions src/cm/lsp/clientManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ import lspStatusBar from "components/lspStatusBar";
import notificationManager from "lib/notificationManager";
import Uri from "utils/Uri";
import Url from "utils/Url";
import { clearDiagnosticsEffect } from "./diagnostics";
import {
clearDiagnosticsEffect,
disposePullDiagnostics,
lspDiagnosticsAutoSyncExtension,
} from "./diagnostics";
import { supportsBuiltinFormatting } from "./formattingSupport";
import { documentColorsExtension } from "./documentColors";
import { inlayHintsExtension } from "./inlayHints";
Expand Down Expand Up @@ -74,6 +78,22 @@ function safeString(value: unknown): string {
return value != null ? String(value) : "";
}

function formatInitializationError(error: unknown): string {
if (isPlainObject(error)) {
const message = safeString(error.message).trim();
const code =
typeof error.code === "number" || typeof error.code === "string"
? ` (${error.code})`
: "";
if (message) return `Initialization failed${code}: ${message}`;
}
const message =
error instanceof Error ? error.message : safeString(error).trim();
return message
? `Initialization failed: ${message}`
: "Initialization failed";
}

function isSettingsOrKeybindingsFile(
server: LspServerDefinition,
uri: string | null | undefined,
Expand Down Expand Up @@ -359,6 +379,14 @@ export class LspClientManager {
originalUri && originalUri !== normalizedUri ? [originalUri] : [];
clientState.attach(normalizedUri, view as EditorView, aliases);
lspExtensions.push(plugin);
if (diagnosticsUiExtension) {
lspExtensions.push(
lspDiagnosticsAutoSyncExtension(
clientState.client,
normalizedUri,
),
);
}
} catch (error) {
console.error(
`Failed to initialize LSP client for ${server.id}`,
Expand Down Expand Up @@ -632,19 +660,22 @@ export class LspClientManager {
? defaultExtensions.filter((ext) => ext !== diagnosticsExtension)
: defaultExtensions;

const progressCapabilities: LSPClientExtension = {
const clientCapabilities: LSPClientExtension = {
clientCapabilities: {
window: {
workDoneProgress: true,
},
workspace: {
configuration: true,
},
},
};

const mergedExtensions = [
...filteredBuiltins,
...extraExtensions,
...serverExtensions,
progressCapabilities,
clientCapabilities,
];
clientConfig.extensions = mergedExtensions;

Expand Down Expand Up @@ -906,6 +937,17 @@ export class LspClientManager {
client.__acodeLoggedInfo = true;
}
} catch (error) {
addLspLog(
server.id,
"error",
formatInitializationError(error),
error,
);
try {
client?.disconnect();
} catch {
/* Client may not have finished connecting */
}
if (transportHandle) {
await transportHandle.dispose?.();
} else {
Expand Down Expand Up @@ -995,6 +1037,7 @@ export class LspClientManager {
};

const dispose = async (): Promise<void> => {
disposePullDiagnostics(client);
try {
client.disconnect();
} catch (error) {
Expand Down
Loading