Fix for commenting ranges not showing (#3308)

Fixes #3306
microsoft · Feb 10, 2022 · f8fbe07 · f8fbe07
1 parent 362d450
commit f8fbe07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/view/reviewManager.ts b/src/view/reviewManager.ts
@@ -581,12 +581,12 @@ export class ReviewManager {
 		if (this._folderRepoManager.activePullRequest?.reviewThreadsCacheReady && this._reviewModel.hasLocalFileChanges) {
 			await this.doRegisterCommentController();
 		} else {
-			const changeThreadsDisposable: vscode.Disposable | undefined =
-				this._folderRepoManager.activePullRequest?.onDidChangeReviewThreads(async () => {
-					if (changeThreadsDisposable) {
-						changeThreadsDisposable.dispose();
-					}
+			const changedLocalFilesChangesDisposable: vscode.Disposable | undefined =
+				this._reviewModel.onDidChangeLocalFileChanges(async () => {
 					if (this._folderRepoManager.activePullRequest?.reviewThreadsCache && this._reviewModel.hasLocalFileChanges) {
+						if (changedLocalFilesChangesDisposable) {
+							changedLocalFilesChangesDisposable.dispose();
+						}
 						await this.doRegisterCommentController();
 					}
 				});

diff --git a/src/view/reviewModel.ts b/src/view/reviewModel.ts
@@ -16,7 +16,7 @@ export class ReviewModel {
 	constructor() { }
 
 	get hasLocalFileChanges() {
-		return !!this._localFileChanges;
+		return this._localFileChanges && (this._localFileChanges.length > 0);
 	}
 
 	get localFileChanges(): GitFileChangeNode[] {