Skip to content

fix(lsp): honor per-server formatting toggle #1958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bajrangCoder merged 2 commits into from
Mar 17, 2026
Merged

fix(lsp): honor per-server formatting toggle #1958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e4e2fa
fix(lsp): honor per-server formatting toggle
bajrangCoder Mar 17, 2026
fb40b99
fix
bajrangCoder Mar 17, 2026
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
25 changes: 17 additions & 8 deletions src/cm/lsp/clientManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,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 +76,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 +267,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 @@ -912,6 +917,10 @@ function resolveIndentWidth(unit: string): number {
return width || 4;
}

function supportsBuiltinFormatting(server: LspServerDefinition): boolean {
return server.clientConfig?.builtinExtensions?.formatting !== false;
}

const defaultManager = new LspClientManager();

export default defaultManager;
Expand Down
11 changes: 9 additions & 2 deletions src/cm/lsp/formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@ import { getModes } from "cm/modelist";
import toast from "components/toast";
import lspClientManager from "./clientManager";
import serverRegistry from "./serverRegistry";
import type { AcodeApi, FileMetadata } from "./types";
import type { AcodeApi, FileMetadata, LspServerDefinition } from "./types";

interface Mode {
name?: string;
extensions?: string;
}

function supportsBuiltinFormatting(server: LspServerDefinition): boolean {
return server?.clientConfig?.builtinExtensions?.formatting !== false;
}
Comment thread
bajrangCoder marked this conversation as resolved.
Outdated

interface EditorManagerWithLsp {
editor?: EditorView;
activeFile?: AcodeFile;
Expand All @@ -32,6 +36,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 +61,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
1 change: 1 addition & 0 deletions src/cm/lsp/types.ts
View file
Open in desktop
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