Improve LSP formatter options and extension handling

Author: bajrangCoder

src/cm/lsp/clientManager.js

@@ -1,3 +1,4 @@
+import { getIndentUnit, indentUnit } from "@codemirror/language";
 import {
 	LSPClient,
 	LSPPlugin,
@@ -116,14 +117,18 @@ export class LspClientManager {
 				const state = await this.#ensureClient(server, context);
 				const capabilities = state.client.serverCapabilities;
 				if (!capabilities?.documentFormattingProvider) continue;
+				state.attach(uri, view);
 				const plugin = LSPPlugin.get(view);
 				if (!plugin) continue;
 				plugin.client.sync();
 				const edits = await state.client.request("textDocument/formatting", {
 					textDocument: { uri },
-					options,
+					options: buildFormattingOptions(view, options),
 				});
-				if (!edits || !edits.length) continue;
+				if (!edits || !edits.length) {
+					plugin.client.sync();
+					return true;
+				}
 				const applied = applyTextEdits(plugin, view, edits);
 				if (applied) {
 					plugin.client.sync();
@@ -373,6 +378,42 @@ function applyTextEdits(plugin, view, edits) {
 	return true;
 }
 
+function buildFormattingOptions(view, overrides = {}) {
+	const state = view?.state;
+	if (!state) return { ...overrides };
+
+	const unitValue = state.facet(indentUnit);
+	const unit =
+		typeof unitValue === "string" && unitValue.length
+			? unitValue
+			: String(unitValue || "\t");
+	let tabSize = getIndentUnit(state);
+	if (
+		typeof tabSize !== "number" ||
+		!Number.isFinite(tabSize) ||
+		tabSize <= 0
+	) {
+		tabSize = resolveIndentWidth(unit);
+	}
+	const insertSpaces = !unit.includes("\t");
+
+	return {
+		tabSize,
+		insertSpaces,
+		...overrides,
+	};
+}
+
+function resolveIndentWidth(unit) {
+	if (typeof unit !== "string" || !unit.length) return 4;
+	let width = 0;
+	for (const ch of unit) {
+		if (ch === "\t") return 4;
+		width += 1;
+	}
+	return width || 4;
+}
+
 const defaultManager = new LspClientManager();
 
 export default defaultManager;

src/cm/lsp/formatter.js

@@ -1,3 +1,4 @@
+import { getModes } from "cm/modelist";
 import toast from "components/toast";
 import lspClientManager from "./clientManager";
 import serverRegistry from "./serverRegistry";
@@ -17,7 +18,9 @@ export function registerLspFormatter(acode) {
 			if (lang) languages.add(String(lang));
 		});
 	});
-	const extensions = languages.size ? Array.from(languages) : ["*"];
+	const extensions = languages.size
+		? collectFormatterExtensions(languages)
+		: ["*"];
 
 	acode.registerFormatter(
 		"lsp",
@@ -50,3 +53,41 @@ export function registerLspFormatter(acode) {
 		"Language Server",
 	);
 }
+
+function collectFormatterExtensions(languages) {
+	const extensions = new Set();
+	const modeMap = new Map();
+
+	try {
+		getModes().forEach((mode) => {
+			const key = String(mode?.name || "")
+				.trim()
+				.toLowerCase();
+			if (key) modeMap.set(key, mode);
+		});
+	} catch (_) {}
+
+	languages.forEach((language) => {
+		const key = String(language || "")
+			.trim()
+			.toLowerCase();
+		if (!key) return;
+		extensions.add(key);
+		const mode = modeMap.get(key);
+		if (!mode?.extensions) return;
+		String(mode.extensions)
+			.split("|")
+			.forEach((part) => {
+				const ext = part.trim();
+				if (ext && !ext.startsWith("^")) {
+					extensions.add(ext);
+				}
+			});
+	});
+
+	if (!extensions.size) {
+		return ["*"];
+	}
+
+	return Array.from(extensions);
+}