Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 04:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - improve enabliment of the editor decoration (#234296)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-11-20 23:14:16 +01:00
committed by GitHub
parent b410e9c0ac
commit 2ee7ae88b4
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
extensions/git/src/blame.ts
View File

@@ -3,9 +3,9 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { DecorationOptions, l10n, Position, Range, TextEditor, TextEditorChange, TextEditorDecorationType, TextEditorChangeKind, ThemeColor, Uri, window, workspace, EventEmitter } from 'vscode';
import { DecorationOptions, l10n, Position, Range, TextEditor, TextEditorChange, TextEditorDecorationType, TextEditorChangeKind, ThemeColor, Uri, window, workspace, EventEmitter, ConfigurationChangeEvent } from 'vscode';
import { Model } from './model';
import { dispose, fromNow, IDisposable, pathEquals, runAndSubscribeEvent } from './util';
import { dispose, fromNow, IDisposable, pathEquals } from './util';
import { Repository } from './repository';
import { throttle } from './decorators';
import { BlameInformation } from './git';
@@ -274,21 +274,32 @@ class GitBlameEditorDecoration {
});
this._disposables.push(this._decorationType);
this._disposables.push(runAndSubscribeEvent(workspace.onDidChangeConfiguration, e => {
if (!e || e?.affectsConfiguration('git.blame.editorDecoration.enabled')) {
for (const textEditor of window.visibleTextEditors) {
this._updateDecorations(textEditor);
}
}
}));
workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
this._controller.onDidChangeBlameInformation(e => this._updateDecorations(e), this, this._disposables);
}
private _onDidChangeConfiguration(e: ConfigurationChangeEvent): void {
if (!e.affectsConfiguration('git.blame.editorDecoration.enabled')) {
return;
}
const enabled = this._isEnabled();
for (const textEditor of window.visibleTextEditors) {
if (enabled) {
this._updateDecorations(textEditor);
} else {
textEditor.setDecorations(this._decorationType, []);
}
}
}
private _isEnabled(): boolean {
const config = workspace.getConfiguration('git');
return config.get<boolean>('blame.editorDecoration.enabled', false);
}
private _updateDecorations(textEditor: TextEditor): void {
const enabled = workspace.getConfiguration('git').get<boolean>('blame.editorDecoration.enabled', false);
if (!enabled) {
textEditor.setDecorations(this._decorationType, []);
if (!this._isEnabled()) {
return;
}