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
23 changes: 15 additions & 8 deletions src/cm/lsp/clientManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import NotificationManager from "lib/notificationManager";
import Uri from "utils/Uri";
import { clearDiagnosticsEffect } from "./diagnostics";
import { documentHighlightsExtension } from "./documentHighlights";
import { supportsBuiltinFormatting } from "./formattingSupport";
import { inlayHintsExtension } from "./inlayHints";
import { acodeRenameKeymap } from "./rename";
import { ensureServerRunning } from "./serverLauncher";
Expand Down Expand Up @@ -60,13 +61,6 @@ function safeString(value: unknown): string {
return value != null ? String(value) : "";
}

const defaultKeymaps = keymap.of([
...formatKeymap,
...acodeRenameKeymap,
...jumpToDefinitionKeymap,
...findReferencesKeymap,
]);

interface BuiltinExtensionsResult {
extensions: Extension[];
diagnosticsExtension: Extension | LSPClientExtension | null;
Expand All @@ -83,14 +77,25 @@ function buildBuiltinExtensions(
diagnostics: includeDiagnostics = true,
inlayHints: includeInlayHints = true,
documentHighlights: includeDocumentHighlights = true,
formatting: includeFormatting = true,
} = config;

const extensions: Extension[] = [];
let diagnosticsExtension: Extension | LSPClientExtension | null = null;

if (includeCompletion) extensions.push(serverCompletion());
if (includeHover) extensions.push(hoverTooltips());
if (includeKeymaps) extensions.push(defaultKeymaps);
if (includeKeymaps) {
const bindings = [
...(includeFormatting ? formatKeymap : []),
...acodeRenameKeymap,
...jumpToDefinitionKeymap,
...findReferencesKeymap,
];
if (bindings.length) {
extensions.push(keymap.of(bindings));
}
}
if (includeSignature) extensions.push(signatureHelp());
if (includeDiagnostics) {
const diagExt = serverDiagnostics();
Expand Down Expand Up @@ -263,6 +268,7 @@ export class LspClientManager {
if (!servers.length) return false;

for (const server of servers) {
if (!supportsBuiltinFormatting(server)) continue;
try {
const context: RootUriContext = {
uri: normalizedUri,
Expand Down Expand Up @@ -437,6 +443,7 @@ export class LspClientManager {
diagnostics: builtinConfig.diagnostics !== false,
inlayHints: builtinConfig.inlayHints !== false,
documentHighlights: builtinConfig.documentHighlights !== false,
formatting: builtinConfig.formatting !== false,
})
: { extensions: [], diagnosticsExtension: null };

Expand Down
6 changes: 5 additions & 1 deletion src/cm/lsp/formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { EditorView } from "@codemirror/view";
import { getModes } from "cm/modelist";
import toast from "components/toast";
import lspClientManager from "./clientManager";
import { supportsBuiltinFormatting } from "./formattingSupport";
import serverRegistry from "./serverRegistry";
import type { AcodeApi, FileMetadata } from "./types";

Expand Down Expand Up @@ -32,6 +33,7 @@ function getActiveMetadata(
export function registerLspFormatter(acode: AcodeApi): void {
const languages = new Set<string>();
serverRegistry.listServers().forEach((server) => {
if (!supportsBuiltinFormatting(server)) return;
(server.languages || []).forEach((lang) => {
if (lang) languages.add(String(lang));
});
Expand All @@ -56,7 +58,9 @@ export function registerLspFormatter(acode: AcodeApi): void {
toast("Unknown language for LSP formatting");
return false;
}
const servers = serverRegistry.getServersForLanguage(languageId);
const servers = serverRegistry
.getServersForLanguage(languageId)
.filter(supportsBuiltinFormatting);
if (!servers.length) {
toast("No LSP formatter available");
return false;
Expand Down
7 changes: 7 additions & 0 deletions src/cm/lsp/formattingSupport.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { LspServerDefinition } from "./types";

export function supportsBuiltinFormatting(
server: LspServerDefinition,
): boolean {
return server.clientConfig?.builtinExtensions?.formatting !== false;
}
1 change: 1 addition & 0 deletions src/cm/lsp/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ export interface BuiltinExtensionsConfig {
diagnostics?: boolean;
inlayHints?: boolean;
documentHighlights?: boolean;
formatting?: boolean;
}

export interface AcodeClientConfig {
Expand Down