Issues with comment duplication and formatting when tagging copilot for follow-up (#7950)

Fixes #7915

Author: alexr00

src/common/utils.ts

@@ -982,6 +982,16 @@ export async function stringReplaceAsync(str: string, regex: RegExp, asyncFn: (s
 	return str.replace(regex, () => data[offset++]);
 }
 
+export async function arrayFindIndexAsync<T>(arr: T[], predicate: (value: T, index: number, array: T[]) => Promise<boolean>): Promise<number> {
+	for (let i = 0; i < arr.length; i++) {
+		// Evaluate predicate sequentially to allow early exit on first match
+		if (await predicate(arr[i], i, arr)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
 export async function batchPromiseAll<T>(items: readonly T[], batchSize: number, processFn: (item: T) => Promise<void>): Promise<void> {
 	const batches = Math.ceil(items.length / batchSize);
 

src/view/pullRequestCommentController.ts

@@ -227,8 +227,8 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 		}
 	}
 
-	private onDidChangeReviewThreads(e: ReviewThreadChangeEvent): void {
-		e.added.forEach(async (thread) => {
+	private async onDidChangeReviewThreads(e: ReviewThreadChangeEvent): Promise<void> {
+		for (const thread of e.added) {
 			const fileName = thread.path;
 			const index = this._pendingCommentThreadAdds.findIndex(t => {
 				const samePath = this._folderRepoManager.gitRelativeRootPath(t.uri.path) === thread.path;
@@ -278,26 +278,26 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 			} else {
 				this._commentThreadCache[key] = [newThread];
 			}
-		});
+		}
 
-		e.changed.forEach(thread => {
+		for (const thread of e.changed) {
 			const key = this.getCommentThreadCacheKey(thread.path, thread.diffSide === DiffSide.LEFT);
 			const index = this._commentThreadCache[key] ? this._commentThreadCache[key].findIndex(t => t.gitHubThreadId === thread.id) : -1;
 			if (index > -1) {
 				const matchingThread = this._commentThreadCache[key][index];
 				updateThread(this._context, matchingThread, thread, this._githubRepositories);
 			}
-		});
+		}
 
-		e.removed.forEach(async thread => {
+		for (const thread of e.removed) {
 			const key = this.getCommentThreadCacheKey(thread.path, thread.diffSide === DiffSide.LEFT);
 			const index = this._commentThreadCache[key].findIndex(t => t.gitHubThreadId === thread.id);
 			if (index > -1) {
 				const matchingThread = this._commentThreadCache[key][index];
 				this._commentThreadCache[key].splice(index, 1);
 				matchingThread.dispose();
 			}
-		});
+		}
 	}
 
 	protected override onDidChangeActiveTextEditor(editor: vscode.TextEditor | undefined) {

src/view/reviewCommentController.ts

@@ -19,7 +19,7 @@ import Logger from '../common/logger';
 import { PR_SETTINGS_NAMESPACE, PULL_BRANCH, PULL_PR_BRANCH_BEFORE_CHECKOUT, PullPRBranchVariants } from '../common/settingKeys';
 import { ITelemetry } from '../common/telemetry';
 import { fromReviewUri, ReviewUriParams, Schemes, toReviewUri } from '../common/uri';
-import { formatError, groupBy, uniqBy } from '../common/utils';
+import { arrayFindIndexAsync, formatError, groupBy, uniqBy } from '../common/utils';
 import { FolderRepositoryManager } from '../github/folderRepositoryManager';
 import { GHPRComment, GHPRCommentThread, TemporaryComment } from '../github/prComment';
 import { PullRequestOverviewPanel } from '../github/pullRequestOverview';
@@ -275,12 +275,12 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 		);
 
 		this._register(
-			activePullRequest.onDidChangeReviewThreads(e => {
+			activePullRequest.onDidChangeReviewThreads(async e => {
 				const githubRepositories = this.githubReposForPullRequest(this._folderRepoManager.activePullRequest);
-				e.added.forEach(async thread => {
+				for (const thread of e.added) {
 					const { path } = thread;
 
-					const index = this._pendingCommentThreadAdds.findIndex(async t => {
+					const index = await arrayFindIndexAsync(this._pendingCommentThreadAdds, async t => {
 						const fileName = this._folderRepoManager.gitRelativeRootPath(t.uri.path);
 						if (fileName !== thread.path) {
 							return false;
@@ -324,24 +324,24 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 					} else {
 						threadMap[path] = [newThread];
 					}
-				});
+				}
 
-				e.changed.forEach(thread => {
+				for (const thread of e.changed) {
 					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 => {
+				for (const thread of e.removed) {
 					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();
 					}
-				});
+				}
 
 				this.updateResourcesWithCommentingRanges();
 			}),