Fixes #181, Refresh action on Changes In Pull Request doesn't update comments panel

Author: Rachel Macfarlane

src/view/prChangesTreeDataProvider.ts

@@ -26,10 +26,10 @@ export class PullRequestChangesTreeDataProvider extends vscode.Disposable implem
 	constructor(private context: vscode.ExtensionContext) {
 		super(() => this.dispose());
 		this.context.subscriptions.push(vscode.window.registerTreeDataProvider<TreeNode>('prStatus', this));
+	}
 
-		this._disposables.push(vscode.commands.registerCommand('pr.refreshChanges', _ => {
-			this._onDidChangeTreeData.fire();
-		}));
+	refresh() {
+		this._onDidChangeTreeData.fire();
 	}
 
 	async showPullRequestFileChanges(pullRequestManager: IPullRequestManager, pullrequest: IPullRequestModel, fileChanges: (FileChangeNode | RemoteFileChangeNode)[], comments: Comment[]) {

src/view/reviewManager.ts

@@ -64,6 +64,12 @@ export class ReviewManager implements vscode.DecorationProvider {
 			// todo, validate state only when state changes.
 			this.updateState();
 		}));
+
+		this._disposables.push(vscode.commands.registerCommand('pr.refreshChanges', _ => {
+			this.updateComments();
+			this.prFileChangesProvider.refresh();
+		}));
+
 		this._prsTreeDataProvider = new PullRequestsTreeDataProvider(this._configuration, _repository, _prManager);
 		this._disposables.push(this._prsTreeDataProvider);
 		this._disposables.push(vscode.window.registerDecorationProvider(this));
@@ -220,10 +226,14 @@ export class ReviewManager implements vscode.DecorationProvider {
 			});
 
 			matchedFile.comments.push(comment);
+			this._comments.push(comment);
+
+			this._onDidChangeCommentThreads.fire({
+				added: [],
+				changed: [thread],
+				removed: []
+			});
 
-			setTimeout(() => {
-				this.updateComments();
-			}, 0);
 			return thread;
 		} catch (e) {
 			throw new Error(formatError(e));
@@ -257,16 +267,19 @@ export class ReviewManager implements vscode.DecorationProvider {
 
 			let commentThread: vscode.CommentThread = {
 				threadId: comment.commentId,
-				resource: uri,
+				resource: vscode.Uri.file(path.resolve(this._repository.path, rawComment.path)),
 				range: range,
 				comments: [comment]
 			};
 
 			matchedFile.comments.push(rawComment);
+			this._comments.push(rawComment);
 
-			setTimeout(() => {
-				this.updateComments();
-			}, 0);
+			this._onDidChangeCommentThreads.fire({
+				added: [commentThread],
+				changed: [],
+				removed: []
+			});
 
 			return commentThread;
 		} catch (e) {
@@ -361,6 +374,11 @@ export class ReviewManager implements vscode.DecorationProvider {
 			});
 
 			this._comments = comments;
+			this._localFileChanges.forEach(change => {
+				if (change instanceof FileChangeNode) {
+					change.comments = this._comments.filter(comment => change.fileName === comment.path && comment.position !== null);
+				}
+			});
 			this._onDidChangeDecorations.fire();
 		}
 

src/view/treeNodes/fileChangeNode.ts

@@ -58,7 +58,7 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem {
 		public readonly parentFilePath: vscode.Uri,
 		public readonly isPartial: boolean,
 		public readonly diffHunks: DiffHunk[],
-		public readonly comments: Comment[] = [],
+		public comments: Comment[] = [],
 		public readonly sha?: string,
 	) {
 		super();