Fix #161. Use file decorators for comments.

Author: rebornix

src/view/reviewManager.ts

@@ -602,27 +602,14 @@ export class ReviewManager implements vscode.DecorationProvider {
 	_onDidChangeDecorations: vscode.EventEmitter<vscode.Uri | vscode.Uri[]> = new vscode.EventEmitter<vscode.Uri | vscode.Uri[]>();
 	onDidChangeDecorations: vscode.Event<vscode.Uri | vscode.Uri[]> = this._onDidChangeDecorations.event;
 	provideDecoration(uri: vscode.Uri, token: vscode.CancellationToken): vscode.ProviderResult<vscode.DecorationData> {
-		if (uri.scheme === 'review') {
-			let query = JSON.parse(uri.query);
-			let matchingComments = this._comments.filter(comment => comment.path === query.path && comment.position !== null);
-			if (matchingComments && matchingComments.length) {
-				return {
-					bubble: true,
-					// abbreviation: '♪♪',
-					title: '♪♪'
-				};
-			}
-		} else if (uri.scheme === 'file') {
-			// local file
-			let fileName = uri.path;
-			let matchingComments = this._comments.filter(comment => path.resolve(this._repository.path, comment.path) === fileName && comment.position !== null);
-			if (matchingComments && matchingComments.length) {
-				return {
-					bubble: false,
-					title: '♪♪',
-					letter: '♪♪'
-				};
-			}
+		let fileName = uri.path;
+		let matchingComments = this._comments.filter(comment => path.resolve(this._repository.path, comment.path) === fileName && comment.position !== null);
+		if (matchingComments && matchingComments.length) {
+			return {
+				bubble: false,
+				title: '♪♪',
+				letter: '♪♪'
+			};
 		}
 
 		return {};

src/view/treeNodes/fileChangeNode.ts

@@ -73,13 +73,7 @@ export class InMemFileChangeNode extends TreeNode implements vscode.TreeItem {
 		super();
 		this.contextValue = 'filechange';
 		this.label = fileName;
-
-		if (this.comments && this.comments.length) {
-			this.iconPath = Resource.icons.light.Comment;
-		} else {
-			this.iconPath = Resource.getFileStatusUri(this);
-		}
-
+		this.iconPath = Resource.getFileStatusUri(this);
 		this.resourceUri = toFileChangeNodeUri(this.filePath, comments.length > 0);
 
 		let opts: vscode.TextDocumentShowOptions = {
@@ -147,13 +141,7 @@ export class GitFileChangeNode extends TreeNode implements vscode.TreeItem {
 		super();
 		this.contextValue = 'filechange';
 		this.label = fileName;
-
-		if (this.comments && this.comments.length) {
-			this.iconPath = Resource.icons.light.Comment;
-		} else {
-			this.iconPath = Resource.getFileStatusUri(this);
-		}
-
+		this.iconPath = Resource.getFileStatusUri(this);
 		this.resourceUri = toFileChangeNodeUri(this.filePath, comments.length > 0);
 
 		let opts: vscode.TextDocumentShowOptions = {