feat: add lintgutter setting to toggle lsp diag on gutter

Author: bajrangCoder

src/cm/lsp/clientManager.js

@@ -87,6 +87,7 @@ export class LspClientManager {
 		if (!servers.length) return [];
 
 		const lspExtensions = [];
+		const diagnosticsUiExtension = this.options.diagnosticsUiExtension;
 
 		for (const server of servers) {
 			let targetLanguageId = effectiveLang;
@@ -132,6 +133,10 @@ export class LspClientManager {
 			}
 		}
 
+		if (diagnosticsUiExtension && lspExtensions.length) {
+			lspExtensions.push(...asArray(diagnosticsUiExtension));
+		}
+
 		return lspExtensions;
 	}
 

src/cm/lsp/diagnostics.js

@@ -114,7 +114,7 @@ function lspLinterSource(view) {
 	return mapDiagnostics(plugin, view.state);
 }
 
-export function lspDiagnosticsExtension() {
+export function lspDiagnosticsClientExtension() {
 	return {
 		clientCapabilities: {
 			textDocument: {
@@ -148,18 +148,31 @@ export function lspDiagnosticsExtension() {
 				return true;
 			},
 		},
-		editorExtension: [
-			lspPublishedDiagnostics,
-			lintGutter(),
-			linter(lspLinterSource, {
-				needsRefresh(update) {
-					return update.transactions.some((tr) =>
-						tr.effects.some((effect) => effect.is(setPublishedDiagnostics)),
-					);
-				},
-				autoPanel: true,
-			}),
-		],
+	};
+}
+
+export function lspDiagnosticsUiExtension(includeGutter = true) {
+	const extensions = [
+		lspPublishedDiagnostics,
+		linter(lspLinterSource, {
+			needsRefresh(update) {
+				return update.transactions.some((tr) =>
+					tr.effects.some((effect) => effect.is(setPublishedDiagnostics)),
+				);
+			},
+			autoPanel: true,
+		}),
+	];
+	if (includeGutter) {
+		extensions.splice(1, 0, lintGutter());
+	}
+	return extensions;
+}
+
+export function lspDiagnosticsExtension(includeGutter = true) {
+	return {
+		...lspDiagnosticsClientExtension(),
+		editorExtension: lspDiagnosticsUiExtension(includeGutter),
 	};
 }
 

src/lib/editorManager.js

@@ -34,9 +34,11 @@ import {
 } from "@emmetio/codemirror6-plugin";
 import createBaseExtensions from "cm/baseExtensions";
 import lspClientManager from "cm/lsp/clientManager";
-import lspDiagnosticsExtension, {
+import {
 	getLspDiagnostics,
 	LSP_DIAGNOSTICS_EVENT,
+	lspDiagnosticsClientExtension,
+	lspDiagnosticsUiExtension,
 } from "cm/lsp/diagnostics";
 import { stopManagedServer } from "cm/lsp/serverLauncher";
 import serverRegistry from "cm/lsp/serverRegistry";
@@ -183,6 +185,9 @@ async function EditorManager($header, $body) {
 	const languageCompartment = new Compartment();
 	// Compartment for LSP extensions so we can swap per file
 	const lspCompartment = new Compartment();
+	const diagnosticsClientExt = lspDiagnosticsClientExtension();
+	const buildDiagnosticsUiExt = () =>
+		lspDiagnosticsUiExtension(appSettings?.value?.lintGutter !== false);
 	let lspRequestToken = 0;
 	let lastLspUri = null;
 	const UNTITLED_URI_PREFIX = "untitled://acode/";
@@ -1167,7 +1172,8 @@ async function EditorManager($header, $body) {
 			}
 			return null;
 		},
-		clientExtensions: [lspDiagnosticsExtension()],
+		clientExtensions: [diagnosticsClientExt],
+		diagnosticsUiExtension: buildDiagnosticsUiExt(),
 	});
 	applyLspSettings();
 
@@ -1284,6 +1290,16 @@ async function EditorManager($header, $body) {
 		updateEditorLineNumbersFromSettings();
 	});
 
+	appSettings.on("update:lintGutter", function (value) {
+		lspClientManager.setOptions({
+			diagnosticsUiExtension: lspDiagnosticsUiExtension(value !== false),
+		});
+		const active = manager.activeFile;
+		if (active?.type === "editor") {
+			void configureLspForFile(active);
+		}
+	});
+
 	// appSettings.on("update:elasticTabstops", function (_value) {
 	// 	// Not applicable in CodeMirror (Ace-era). No-op for now.
 	// });

src/lib/settings.js

@@ -177,6 +177,7 @@ class Settings {
 			showRetryToast: false,
 			showSideButtons: true,
 			showAnnotations: false,
+			lintGutter: true,
 			rainbowBrackets: true,
 			pluginsDisabled: {}, // pluginId: true/false
 			lsp: {

src/settings/editorSettings.js

@@ -55,6 +55,11 @@ export default function editorSettings() {
 			text: strings["show line numbers"],
 			checkbox: values.linenumbers,
 		},
+		{
+			key: "lintGutter",
+			text: strings["lint gutter"] || "Show lint gutter",
+			checkbox: values.lintGutter ?? true,
+		},
 		{
 			key: "lineHeight",
 			text: strings["line height"],