deco - move scm decorations to git extension

extensions/git/src/decorationProvider.ts

@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { window, Uri, Disposable, Event, EventEmitter, DecorationData, DecorationProvider } from 'vscode';
+import { Repository, GitResourceGroup } from './repository';
+import { Model } from './model';
+
+class GitDecorationProvider implements DecorationProvider {
+
+	private readonly _onDidChangeDecorations = new EventEmitter<Uri[]>();
+	readonly onDidChangeDecorations: Event<Uri[]> = this._onDidChangeDecorations.event;
+
+	private disposables: Disposable[] = [];
+	private decorations = new Map<string, DecorationData>();
+
+	constructor(private repository: Repository) {
+		this.disposables.push(
+			window.registerDecorationProvider(this, repository.root),
+			repository.onDidRunOperation(this.onDidRunOperation, this)
+		);
+	}
+
+	private onDidRunOperation(): void {
+		let newDecorations = new Map<string, DecorationData>();
+		this.collectDecorationData(this.repository.indexGroup, newDecorations);
+		this.collectDecorationData(this.repository.workingTreeGroup, newDecorations);
+
+		let uris: Uri[] = [];
+		newDecorations.forEach((value, uriString) => {
+			if (this.decorations.has(uriString)) {
+				this.decorations.delete(uriString);
+			} else {
+				uris.push(Uri.parse(uriString));
+			}
+		});
+		this.decorations.forEach((value, uriString) => {
+			uris.push(Uri.parse(uriString));
+		});
+		this.decorations = newDecorations;
+		this._onDidChangeDecorations.fire(uris);
+	}
+
+	private collectDecorationData(group: GitResourceGroup, bucket: Map<string, DecorationData>): void {
+		group.resourceStates.forEach(r => {
+			if (r.resourceDecoration) {
+				bucket.set(r.original.toString(), r.resourceDecoration);
+			}
+		});
+	}
+
+	provideDecoration(uri: Uri): DecorationData | undefined {
+		return this.decorations.get(uri.toString());
+	}
+
+	dispose(): void {
+		this.disposables.forEach(d => d.dispose());
+	}
+}
+
+
+export class GitDecorations {
+
+	private disposables: Disposable[] = [];
+	private providers = new Map<Repository, GitDecorationProvider>();
+
+	constructor(private model: Model) {
+		this.disposables.push(
+			model.onDidOpenRepository(this.onDidOpenRepository, this),
+			model.onDidCloseRepository(this.onDidCloseRepository, this)
+		);
+		model.repositories.forEach(this.onDidOpenRepository, this);
+	}
+
+	private onDidOpenRepository(repository: Repository): void {
+		const provider = new GitDecorationProvider(repository);
+		this.providers.set(repository, provider);
+	}
+
+	private onDidCloseRepository(repository: Repository): void {
+		const provider = this.providers.get(repository);
+		if (provider) {
+			provider.dispose();
+			this.providers.delete(repository);
+		}
+	}
+
+	dispose(): void {
+		this.disposables.forEach(d => d.dispose());
+		this.providers.forEach(value => value.dispose);
+		this.providers.clear();
+	}
+}

extensions/git/src/main.ts

@@ -12,6 +12,7 @@ import { findGit, Git, IGit } from './git';
 import { Model } from './model';
 import { CommandCenter } from './commands';
 import { GitContentProvider } from './contentProvider';
+import { GitDecorations } from './decorationProvider';
 import { Askpass } from './askpass';
 import { toDisposable } from './util';
 import TelemetryReporter from 'vscode-extension-telemetry';
@@ -54,6 +55,7 @@ async function init(context: ExtensionContext, disposables: Disposable[]): Promi
 	disposables.push(
 		new CommandCenter(git, model, outputChannel, telemetryReporter),
 		new GitContentProvider(model),
+		new GitDecorations(model)
 	);
 
 	await checkGitVersion(info);
@@ -93,4 +95,4 @@ async function checkGitVersion(info: IGit): Promise<void> {
 	} else if (choice === neverShowAgain) {
 		await config.update('ignoreLegacyWarning', true, true);
 	}
-}
+}

extensions/git/src/repository.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor } from 'vscode';
+import { Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, DecorationData } from 'vscode';
 import { Repository as BaseRepository, Ref, Branch, Remote, Commit, GitErrorCodes, Stash, RefType } from './git';
 import { anyEvent, filterEvent, eventToPromise, dispose, find } from './util';
 import { memoize, throttle, debounce } from './decorators';
@@ -170,27 +170,29 @@ export class Resource implements SourceControlResourceState {
 		// return this.resourceUri.fsPath.substr(0, workspaceRootPath.length) !== workspaceRootPath;
 	}
 
-	private get color(): ThemeColor | undefined {
-		switch (this.type) {
-			case Status.INDEX_MODIFIED:
-			case Status.MODIFIED:
-				return new ThemeColor('git.color.modified');
-			case Status.UNTRACKED:
-				return new ThemeColor('git.color.untracked');
-			default:
-				return undefined;
-		}
-	}
-
 	get decorations(): SourceControlResourceDecorations {
 		const light = { iconPath: this.getIconPath('light') };
 		const dark = { iconPath: this.getIconPath('dark') };
 		const tooltip = this.tooltip;
 		const strikeThrough = this.strikeThrough;
 		const faded = this.faded;
-		const color = this.color;
 
-		return { strikeThrough, faded, tooltip, light, dark, color };
+		return { strikeThrough, faded, tooltip, light, dark };
+	}
+
+	get resourceDecoration(): DecorationData | undefined {
+		const title = this.tooltip;
+		switch (this.type) {
+			case Status.IGNORED:
+				return { priority: 3, title, opacity: 0.75 };
+			case Status.UNTRACKED:
+				return { priority: 1, title, abbreviation: localize('untracked, short', "U"), bubble: true, color: new ThemeColor('git.color.untracked') };
+			case Status.INDEX_MODIFIED:
+			case Status.MODIFIED:
+				return { priority: 2, title, abbreviation: localize('modified, short', "M"), bubble: true, color: new ThemeColor('git.color.modified') };
+			default:
+				return undefined;
+		}
 	}
 
 	constructor(