Comments sometimes not resolvable. (#6759)

Fixes #6702

Author: alexr00

src/github/utils.ts

@@ -179,10 +179,11 @@ export function updateThread(context: vscode.ExtensionContext, vscodeThread: GHP
 	}
 
 	const newResolvedState = isResolvedToResolvedState(reviewThread.isResolved);
-	if (vscodeThread.state?.resolved !== newResolvedState) {
+	const newApplicabilityState = reviewThread.isOutdated ? vscode.CommentThreadApplicability.Outdated : vscode.CommentThreadApplicability.Current;
+	if ((vscodeThread.state?.resolved !== newResolvedState) || (vscodeThread.state?.applicability !== newApplicabilityState)) {
 		vscodeThread.state = {
 			resolved: newResolvedState,
-			applicability: vscodeThread.state?.applicability
+			applicability: newApplicabilityState
 		};
 	}
 	vscodeThread.collapsibleState = getCommentCollapsibleState(reviewThread, expand);
@@ -201,6 +202,7 @@ export function updateThread(context: vscode.ExtensionContext, vscodeThread: GHP
 	} else {
 		vscodeThread.comments = reviewThread.comments.map(c => new GHPRComment(context, c, vscodeThread, githubRepositories));
 	}
+
 	updateCommentThreadLabel(vscodeThread);
 }
 

src/view/reviewCommentController.ts

@@ -325,30 +325,18 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 				});
 
 				e.changed.forEach(thread => {
-					const threadMap = thread.isOutdated
-						? this._obsoleteFileChangeCommentThreads
-						: thread.diffSide === DiffSide.RIGHT
-							? this._workspaceFileChangeCommentThreads
-							: this._reviewSchemeFileChangeCommentThreads;
-
-					const index = threadMap[thread.path] ? threadMap[thread.path].findIndex(t => t.gitHubThreadId === thread.id) : -1;
-					if (index > -1) {
-						const matchingThread = threadMap[thread.path][index];
+					const match = this._findMatchingThread(thread);
+					if (match.index > -1) {
+						const matchingThread = match.threadMap[thread.path][match.index];
 						updateThread(this._context, matchingThread, thread, githubRepositories);
 					}
 				});
 
 				e.removed.forEach(thread => {
-					const threadMap = thread.isOutdated
-						? this._obsoleteFileChangeCommentThreads
-						: thread.diffSide === DiffSide.RIGHT
-							? this._workspaceFileChangeCommentThreads
-							: this._reviewSchemeFileChangeCommentThreads;
-
-					const index = threadMap[thread.path] ? threadMap[thread.path].findIndex(t => t.gitHubThreadId === thread.id) : -1;
-					if (index > -1) {
-						const matchingThread = threadMap[thread.path][index];
-						threadMap[thread.path].splice(index, 1);
+					const match = this._findMatchingThread(thread);
+					if (match.index > -1) {
+						const matchingThread = match.threadMap[thread.path][match.index];
+						match.threadMap[thread.path].splice(match.index, 1);
 						matchingThread.dispose();
 					}
 				});
@@ -359,6 +347,28 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 		this._register(vscode.window.onDidChangeActiveTextEditor(e => this.onDidChangeActiveTextEditor(e)));
 	}
 
+	private _findMatchingThread(thread: IReviewThread): { threadMap: { [key: string]: GHPRCommentThread[] }, index: number } {
+		const threadMap = thread.isOutdated
+			? this._obsoleteFileChangeCommentThreads
+			: thread.diffSide === DiffSide.RIGHT
+				? this._workspaceFileChangeCommentThreads
+				: this._reviewSchemeFileChangeCommentThreads;
+
+		let index = threadMap[thread.path]?.findIndex(t => t.gitHubThreadId === thread.id) ?? -1;
+		if ((index === -1) && thread.isOutdated) {
+			// The thread has become outdated and needs to be moved to the obsolete threads.
+			index = this._workspaceFileChangeCommentThreads[thread.path]?.findIndex(t => t.gitHubThreadId === thread.id) ?? -1;
+			if (index > -1) {
+				const matchingThread = this._workspaceFileChangeCommentThreads[thread.path]!.splice(index, 1)[0];
+				if (!this._obsoleteFileChangeCommentThreads[thread.path]) {
+					this._obsoleteFileChangeCommentThreads[thread.path] = [];
+				}
+				this._obsoleteFileChangeCommentThreads[thread.path]!.push(matchingThread);
+			}
+		}
+		return { threadMap, index };
+	}
+
 	private _commentContentChangedListener: vscode.Disposable | undefined;
 	private onDidChangeActiveTextEditor(editor: vscode.TextEditor | undefined) {
 		this._commentContentChangedListener?.dispose();