Skip to content

Commit fb40b99

Browse files
committed
fix
1 parent 7e4e2fa commit fb40b99

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/cm/lsp/clientManager.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import NotificationManager from "lib/notificationManager";
1818
import Uri from "utils/Uri";
1919
import { clearDiagnosticsEffect } from "./diagnostics";
2020
import { documentHighlightsExtension } from "./documentHighlights";
21+
import { supportsBuiltinFormatting } from "./formattingSupport";
2122
import { inlayHintsExtension } from "./inlayHints";
2223
import { acodeRenameKeymap } from "./rename";
2324
import { ensureServerRunning } from "./serverLauncher";
@@ -442,6 +443,7 @@ export class LspClientManager {
442443
diagnostics: builtinConfig.diagnostics !== false,
443444
inlayHints: builtinConfig.inlayHints !== false,
444445
documentHighlights: builtinConfig.documentHighlights !== false,
446+
formatting: builtinConfig.formatting !== false,
445447
})
446448
: { extensions: [], diagnosticsExtension: null };
447449

@@ -917,10 +919,6 @@ function resolveIndentWidth(unit: string): number {
917919
return width || 4;
918920
}
919921

920-
function supportsBuiltinFormatting(server: LspServerDefinition): boolean {
921-
return server.clientConfig?.builtinExtensions?.formatting !== false;
922-
}
923-
924922
const defaultManager = new LspClientManager();
925923

926924
export default defaultManager;

src/cm/lsp/formatter.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@ import type { EditorView } from "@codemirror/view";
22
import { getModes } from "cm/modelist";
33
import toast from "components/toast";
44
import lspClientManager from "./clientManager";
5+
import { supportsBuiltinFormatting } from "./formattingSupport";
56
import serverRegistry from "./serverRegistry";
6-
import type { AcodeApi, FileMetadata, LspServerDefinition } from "./types";
7+
import type { AcodeApi, FileMetadata } from "./types";
78

89
interface Mode {
910
name?: string;
1011
extensions?: string;
1112
}
1213

13-
function supportsBuiltinFormatting(server: LspServerDefinition): boolean {
14-
return server?.clientConfig?.builtinExtensions?.formatting !== false;
15-
}
16-
1714
interface EditorManagerWithLsp {
1815
editor?: EditorView;
1916
activeFile?: AcodeFile;

src/cm/lsp/formattingSupport.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import type { LspServerDefinition } from "./types";
2+
3+
export function supportsBuiltinFormatting(
4+
server: LspServerDefinition,
5+
): boolean {
6+
return server.clientConfig?.builtinExtensions?.formatting !== false;
7+
}

0 commit comments

Comments
 (0)