hook open/close repository events to decoration change event

joaomoreno · joaomoreno · commit c66a91bc67fc · 2017-12-14T16:28:26.000+01:00
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
@@ -10,25 +10,26 @@ import * as path from 'path';
 import { Repository, GitResourceGroup, Status } from './repository';
 import { Model } from './model';
 import { debounce } from './decorators';
-import { filterEvent, dispose } from './util';
+import { filterEvent, dispose, anyEvent, mapEvent, fireEvent } from './util';
 import { Submodule, GitErrorCodes } from './git';
 
 type Callback = { resolve: (status: boolean) => void, reject: (err: any) => void };
 
 class GitIgnoreDecorationProvider implements DecorationProvider {
 
-	private readonly _onDidChangeDecorations = new EventEmitter<Uri[]>();
-	readonly onDidChangeDecorations: Event<Uri[]> = this._onDidChangeDecorations.event;
-
+	readonly onDidChangeDecorations: Event<Uri[]>;
 	private queue = new Map<string, { repository: Repository; queue: Map<string, Callback>; }>();
 	private disposables: Disposable[] = [];
 
 	constructor(private model: Model) {
-		this.disposables.push(
-			window.registerDecorationProvider(this),
-			filterEvent(workspace.onDidSaveTextDocument, e => e.fileName.endsWith('.gitignore'))(_ => this._onDidChangeDecorations.fire())
-			//todo@joh -> events when the ignore status actually changes, not only when the file changes
-		);
+		//todo@joh -> events when the ignore status actually changes, not only when the file changes
+		this.onDidChangeDecorations = fireEvent(anyEvent<any>(
+			filterEvent(workspace.onDidSaveTextDocument, e => e.fileName.endsWith('.gitignore')),
+			model.onDidOpenRepository,
+			model.onDidCloseRepository
+		));
+
+		this.disposables.push(window.registerDecorationProvider(this));
 	}
 
 	provideDecoration(uri: Uri): Promise<DecorationData | undefined> {
diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts
@@ -34,6 +34,10 @@ export function combinedDisposable(disposables: IDisposable[]): IDisposable {
 
 export const EmptyDisposable = toDisposable(() => null);
 
+export function fireEvent<T>(event: Event<T>): Event<T> {
+	return (listener, thisArgs = null, disposables?) => event(_ => listener.call(thisArgs), null, disposables);
+}
+
 export function mapEvent<I, O>(event: Event<I>, map: (i: I) => O): Event<O> {
 	return (listener, thisArgs = null, disposables?) => event(i => listener.call(thisArgs, map(i)), null, disposables);
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ export function combinedDisposable(disposables: IDisposable[]): IDisposable {`
`34`	`34`
`35`	`35`	`export const EmptyDisposable = toDisposable(() => null);`
`36`	`36`
	`37`	`+export function fireEvent<T>(event: Event<T>): Event<T> {`
	`38`	`+ return (listener, thisArgs = null, disposables?) => event(_ => listener.call(thisArgs), null, disposables);`
	`39`	`+}`
	`40`	`+`
`37`	`41`	`export function mapEvent<I, O>(event: Event<I>, map: (i: I) => O): Event<O> {`
`38`	`42`	`return (listener, thisArgs = null, disposables?) => event(i => listener.call(thisArgs, map(i)), null, disposables);`
`39`	`43`	`}`