After making a change to a PR that was made on a fork the "Files" tre…

…e is empty (#3296) (#3307) Fixes #3294
microsoft · Feb 10, 2022 · 01b5fdd · 01b5fdd
1 parent f8fbe07
commit 01b5fdd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/src/view/prChangesTreeDataProvider.ts b/src/view/prChangesTreeDataProvider.ts
@@ -73,6 +73,12 @@ export class PullRequestChangesTreeDataProvider extends vscode.Disposable implem
 		reviewModel: ReviewModel,
 		shouldReveal: boolean,
 	) {
+		if (this._pullRequestManagerMap.has(pullRequestManager)) {
+			const existingNode = this._pullRequestManagerMap.get(pullRequestManager);
+			if (existingNode && (existingNode.pullRequestModel === pullRequestModel)) {
+				return;
+			}
+		}
 		const node: RepositoryChangesNode = new RepositoryChangesNode(
 			this,
 			pullRequestModel,

diff --git a/src/view/treeNodes/commitsCategoryNode.ts b/src/view/treeNodes/commitsCategoryNode.ts
@@ -26,8 +26,9 @@ export class CommitsNode extends TreeNode implements vscode.TreeItem {
 		this._folderRepoManager = reposManager;
 		this.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
 
-		this._pr.onDidChangeReviewThreads(() => this.refresh(this));
-		this._pr.onDidChangeComments(() => this.refresh(this));
+		this.childrenDisposables = [];
+		this.childrenDisposables.push(this._pr.onDidChangeReviewThreads(() => this.refresh(this)));
+		this.childrenDisposables.push(this._pr.onDidChangeComments(() => this.refresh(this)));
 	}
 
 	getTreeItem(): vscode.TreeItem {

diff --git a/src/view/treeNodes/fileChangeNode.ts b/src/view/treeNodes/fileChangeNode.ts
@@ -233,15 +233,6 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem {
 			}),
 		);
 
-		this.childrenDisposables.push(this.pullRequest.onDidChangeComments(() => {
-			this.updateShowOptions();
-			this.refresh(this);
-		}));
-
-		this.childrenDisposables.push(this.pullRequest.onDidChangeReviewThreads(() => {
-			this.updateShowOptions();
-			this.refresh(this);
-		}));
 
 		this.accessibilityInformation = { label: `View diffs and comments for file ${this.label}`, role: 'link' };
 	}

diff --git a/src/view/treeNodes/filesCategoryNode.ts b/src/view/treeNodes/filesCategoryNode.ts
@@ -17,13 +17,14 @@ export class FilesCategoryNode extends TreeNode implements vscode.TreeItem {
 	constructor(
 		public parent: TreeNodeParent,
 		private _reviewModel: ReviewModel,
-		private _pullRequestModel: PullRequestModel
+		_pullRequestModel: PullRequestModel
 	) {
 		super();
 		this.collapsibleState = vscode.TreeItemCollapsibleState.Expanded;
-		this._reviewModel.onDidChangeLocalFileChanges(() => this.refresh(this));
-		this._pullRequestModel.onDidChangeReviewThreads(() => this.refresh(this));
-		this._pullRequestModel.onDidChangeComments(() => this.refresh(this));
+		this.childrenDisposables = [];
+		this.childrenDisposables.push(this._reviewModel.onDidChangeLocalFileChanges(() => this.refresh(this)));
+		this.childrenDisposables.push(_pullRequestModel.onDidChangeReviewThreads(() => this.refresh(this)));
+		this.childrenDisposables.push(_pullRequestModel.onDidChangeComments(() => this.refresh(this)));
 	}
 
 	getTreeItem(): vscode.TreeItem {