ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 10:58:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Watches for blame annotation changes

Browse Source 
So that it can hide/restore the hover blame annotation if needed
This commit is contained in:
Eric Amodio
2017-02-16 22:42:35 -05:00
parent 0147645dc9
commit ca5845018f
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blameActiveLineController.ts
View File

@@ -40,6 +40,7 @@ export default class BlameActiveLineController extends Disposable {
subscriptions.push(workspace.onDidChangeConfiguration(this._onConfigurationChanged, this)); subscriptions.push(workspace.onDidChangeConfiguration(this._onConfigurationChanged, this));
subscriptions.push(git.onDidRemoveCacheEntry(this._onRemoveCacheEntry, this)); subscriptions.push(git.onDidRemoveCacheEntry(this._onRemoveCacheEntry, this));
subscriptions.push(annotationController.onDidToggleBlameAnnotations(this._onBlameAnnotationToggled, this));
this._disposable = Disposable.from(...subscriptions); this._disposable = Disposable.from(...subscriptions);
} }
@@ -105,6 +106,10 @@ export default class BlameActiveLineController extends Disposable {
this._onActiveTextEditorChanged(window.activeTextEditor); this._onActiveTextEditorChanged(window.activeTextEditor);
} }
private _onBlameAnnotationToggled() {
this._onActiveTextEditorChanged(window.activeTextEditor);
}
private _onRemoveCacheEntry() { private _onRemoveCacheEntry() {
this._blame = undefined; this._blame = undefined;
this._onActiveTextEditorChanged(window.activeTextEditor); this._onActiveTextEditorChanged(window.activeTextEditor);

15
src/blameAnnotationController.ts
View File

@@ -1,6 +1,6 @@
'use strict'; 'use strict';
import { Functions } from './system'; import { Functions } from './system';
import { DecorationRenderOptions, Disposable, ExtensionContext, OverviewRulerLane, TextDocument, TextEditor, TextEditorDecorationType, TextEditorViewColumnChangeEvent, window, workspace } from 'vscode'; import { DecorationRenderOptions, Disposable, Event, EventEmitter, ExtensionContext, OverviewRulerLane, TextDocument, TextEditor, TextEditorDecorationType, TextEditorViewColumnChangeEvent, window, workspace } from 'vscode';
import { BlameAnnotationProvider } from './blameAnnotationProvider'; import { BlameAnnotationProvider } from './blameAnnotationProvider';
import { TextDocumentComparer, TextEditorComparer } from './comparers'; import { TextDocumentComparer, TextEditorComparer } from './comparers';
import { IBlameConfig } from './configuration'; import { IBlameConfig } from './configuration';
@@ -21,6 +21,11 @@ export let highlightDecoration: TextEditorDecorationType;
export default class BlameAnnotationController extends Disposable { export default class BlameAnnotationController extends Disposable {
private _onDidToggleBlameAnnotationsEmitter = new EventEmitter<void>();
get onDidToggleBlameAnnotations(): Event<void> {
return this._onDidToggleBlameAnnotationsEmitter.event;
}
private _annotationProviders: Map<number, BlameAnnotationProvider> = new Map(); private _annotationProviders: Map<number, BlameAnnotationProvider> = new Map();
private _blameAnnotationsDisposable: Disposable; private _blameAnnotationsDisposable: Disposable;
private _config: IBlameConfig; private _config: IBlameConfig;
@@ -138,6 +143,8 @@ export default class BlameAnnotationController extends Disposable {
this._blameAnnotationsDisposable && this._blameAnnotationsDisposable.dispose(); this._blameAnnotationsDisposable && this._blameAnnotationsDisposable.dispose();
this._blameAnnotationsDisposable = undefined; this._blameAnnotationsDisposable = undefined;
} }
this._onDidToggleBlameAnnotationsEmitter.fire();
} }
async showBlameAnnotation(editor: TextEditor, shaOrLine?: string | number): Promise<boolean> { async showBlameAnnotation(editor: TextEditor, shaOrLine?: string | number): Promise<boolean> {
@@ -170,7 +177,11 @@ export default class BlameAnnotationController extends Disposable {
} }
this._annotationProviders.set(editor.viewColumn || -1, provider); this._annotationProviders.set(editor.viewColumn || -1, provider);
return provider.provideBlameAnnotation(shaOrLine); if (await provider.provideBlameAnnotation(shaOrLine)) {
this._onDidToggleBlameAnnotationsEmitter.fire();
return true;
}
return false;
} }
isAnnotating(editor: TextEditor): boolean { isAnnotating(editor: TextEditor): boolean {

2
src/gitProvider.ts
View File

@@ -1,5 +1,5 @@
'use strict'; 'use strict';
import { /*Functions,*/ Iterables, Objects } from './system'; import { Iterables, Objects } from './system';
import { Disposable, Event, EventEmitter, ExtensionContext, languages, Location, Position, Range, TextDocument, TextEditor, Uri, workspace } from 'vscode'; import { Disposable, Event, EventEmitter, ExtensionContext, languages, Location, Position, Range, TextDocument, TextEditor, Uri, workspace } from 'vscode';
import { CodeLensVisibility, IConfig } from './configuration'; import { CodeLensVisibility, IConfig } from './configuration';
import { DocumentSchemes, WorkspaceState } from './constants'; import { DocumentSchemes, WorkspaceState } from './constants';