fix: code lens should respect "errorLens.enabled" #206

usernamehw · Apr 21, 2024 · 55d2745 · 55d2745
1 parent 571a839
commit 55d2745
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 27 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -732,7 +732,7 @@
 		"no-octal": 1,
 		"no-octal-escape": 1,
 		"no-param-reassign": [
-			1,
+			0,
 			{
 				"props": true,
 				"ignorePropertyModificationsFor": [

diff --git a/src/codeLens.ts b/src/codeLens.ts
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { CommandId } from 'src/commands';
 import { $config } from 'src/extension';
-import { CodeLens, EventEmitter, Location, Selection, languages, window, type CancellationToken, type CodeLensProvider, type Diagnostic, type Disposable, type Event, type ExtensionContext, type ProviderResult, type Range, type TextDocument, type Uri } from 'vscode';
-import { extUtils } from './utils/extUtils';
-import { utils } from 'src/utils/utils';
 import { Constants } from 'src/types';
+import { utils } from 'src/utils/utils';
+import { CodeLens, EventEmitter, Location, languages, type CancellationToken, type CodeLensProvider, type Diagnostic, type Disposable, type Event, type ExtensionContext, type ProviderResult, type Range, type TextDocument, type Uri } from 'vscode';
+import { extUtils } from './utils/extUtils';
 
 interface GroupedDiagnostic {
 	range: Range;
@@ -31,14 +31,6 @@ export class ErrorLensCodeLens implements CodeLensProvider {
 		];
 	}
 
-	static setCaretInEditor(range: Range): void {
-		const editor = window.activeTextEditor;
-		if (editor) {
-			editor.selection = new Selection(range.start, range.end);
-			editor.revealRange(range);
-		}
-	}
-
 	static formatDiagnostic(diagnostic: Diagnostic): string {
 		return extUtils.prepareMessage({
 			template: $config.codeLensTemplate,
@@ -96,8 +88,8 @@ export class ErrorLensCodeLens implements CodeLensProvider {
 	/**
 	 * Called by Vscode to provide code lenses
 	 */
-	public provideCodeLenses(document: TextDocument, _cancellationToken: CancellationToken): CodeLens[] | Thenable<CodeLens[]> {
-		if (!$config.codeLensEnabled) {
+	provideCodeLenses(document: TextDocument, _cancellationToken: CancellationToken): CodeLens[] | Thenable<CodeLens[]> {
+		if (!this.isEnabled()) {
 			return [];
 		}
 
@@ -120,22 +112,30 @@ export class ErrorLensCodeLens implements CodeLensProvider {
 	/**
 	 * Called by Vscode - AFAIK there is nothing to resolve
 	 */
-	public resolveCodeLens(codeLens: CodeLens, _cancellationToken: CancellationToken): ProviderResult<CodeLens> {
+	resolveCodeLens(codeLens: CodeLens, _cancellationToken: CancellationToken): ProviderResult<CodeLens> {
 		return codeLens;
 	}
 
-	public dispose(): void {
-		for (const disposable of this.disposables) {
-			disposable?.dispose();
-		}
-		this.disposables = [];
+	isEnabled(): boolean {
+		return (
+			$config.enabled &&
+			$config.codeLensEnabled
+		);
 	}
 
-	public update(): void {
-		if (!$config.codeLensEnabled) {
-			return;
-		}
+	update(): void {
 		this.onDidChangeEventEmitter.fire();
 	}
+
+	dispose(): void {
+		this.update();
+
+		setInterval(() => {
+			for (const disposable of this.disposables) {
+				disposable?.dispose();
+			}
+			this.disposables = [];
+		}, 500);
+	}
 }
 
diff --git a/src/commands/codeLensOnClickCommand.ts b/src/commands/codeLensOnClickCommand.ts
@@ -1,7 +1,7 @@
-import { ErrorLensCodeLens } from 'src/codeLens';
 import { CommandId } from 'src/commands';
 import { $config } from 'src/extension';
 import { Constants } from 'src/types';
+import { vscodeUtils } from 'src/utils/vscodeUtils';
 import { commands, type Diagnostic, type Location } from 'vscode';
 
 export function codeLensOnClickCommand(location: Location, diagnostics: Diagnostic[]): void {
@@ -10,11 +10,15 @@ export function codeLensOnClickCommand(location: Location, diagnostics: Diagnost
 			commands.executeCommand(Constants.OpenProblemsViewCommandId);
 			break;
 		case 'showQuickFix':
-			ErrorLensCodeLens.setCaretInEditor(diagnostics[0].range);
+			vscodeUtils.setCaretInEditor({
+				range: diagnostics[0].range,
+			});
 			commands.executeCommand(Constants.QuickFixCommandId, diagnostics[0]);
 			break;
 		case 'searchForProblem':
-			ErrorLensCodeLens.setCaretInEditor(diagnostics[0].range);
+			vscodeUtils.setCaretInEditor({
+				range: diagnostics[0].range,
+			});
 			commands.executeCommand(CommandId.SearchForProblem, diagnostics[0]);
 			break;
 		case 'none':

diff --git a/src/utils/vscodeUtils.ts b/src/utils/vscodeUtils.ts
@@ -132,6 +132,16 @@ function getIndentationAtLine(document: TextDocument, lineNumber: number): strin
 	return textLine.text.slice(0, textLine.firstNonWhitespaceCharacterIndex);
 }
 
+function setCaretInEditor({ editor, range }: { editor?: TextEditor; range: Range }): void {
+	if (!editor) {
+		editor = window.activeTextEditor;
+	}
+	if (editor) {
+		editor.selection = new Selection(range.start, range.end);
+		editor.revealRange(range);
+	}
+}
+
 export const vscodeUtils = {
 	updateGlobalSetting,
 	toggleGlobalBooleanSetting,
@@ -145,4 +155,5 @@ export const vscodeUtils = {
 	openFileInVscode,
 	revealLine,
 	getIndentationAtLine,
+	setCaretInEditor,
 };