Fix showing the reply author on new threads (#6860)

Fixes microsoft/vscode#246088

Author: alexr00

src/github/utils.ts

@@ -96,6 +96,17 @@ export function threadRange(startLine: number, endLine: number, endCharacter?: n
 	return new vscode.Range(startLine, 0, endLine, endCharacter);
 }
 
+export async function setReplyAuthor(thread: vscode.CommentThread | vscode.CommentThread2, currentUser: IAccount, context: vscode.ExtensionContext) {
+	if (currentUser.avatarUrl) {
+		const thread2 = thread as vscode.CommentThread2;
+		thread2.canReply = { name: currentUser.name ?? currentUser.login, iconPath: vscode.Uri.parse(currentUser.avatarUrl) };
+		const uri = await DataUri.avatarCirclesAsImageDataUris(context, [currentUser], 28, 28);
+		thread2.canReply = { name: currentUser.name ?? currentUser.login, iconPath: uri[0] };
+	} else {
+		thread.canReply = true;
+	}
+}
+
 export function createVSCodeCommentThreadForReviewThread(
 	context: vscode.ExtensionContext,
 	uri: vscode.Uri,
@@ -127,12 +138,7 @@ export function createVSCodeCommentThreadForReviewThread(
 	updateCommentThreadLabel(vscodeThread as GHPRCommentThread);
 	vscodeThread.collapsibleState = getCommentCollapsibleState(thread, undefined, currentUser.login);
 
-	if (currentUser.avatarUrl) {
-		vscodeThread.canReply = { name: currentUser.name ?? currentUser.login, iconPath: vscode.Uri.parse(currentUser.avatarUrl) };
-		DataUri.avatarCirclesAsImageDataUris(context, [currentUser], 28, 28).then(uri => {
-			vscodeThread.canReply = { name: currentUser.name ?? currentUser.login, iconPath: uri[0] };
-		});
-	}
+	setReplyAuthor(vscodeThread, currentUser, context);
 
 	return vscodeThread as GHPRCommentThread;
 }

src/view/pullRequestCommentController.ts

@@ -21,6 +21,7 @@ import { PullRequestOverviewPanel } from '../github/pullRequestOverview';
 import {
 	CommentReactionHandler,
 	createVSCodeCommentThreadForReviewThread,
+	setReplyAuthor,
 	threadRange,
 	updateCommentReviewState,
 	updateCommentThreadLabel,
@@ -337,14 +338,15 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 				const fileName = this._folderRepoManager.gitRelativeRootPath(thread.uri.path);
 				const side = this.getCommentSide(thread);
 				this._pendingCommentThreadAdds.push(thread);
-				await this.pullRequestModel.createReviewThread(
+				await Promise.all([this.pullRequestModel.createReviewThread(
 					input,
 					fileName,
 					thread.range ? (thread.range.start.line + 1) : undefined,
 					thread.range ? (thread.range.end.line + 1) : undefined,
 					side,
 					isSingleComment,
-				);
+				),
+				setReplyAuthor(thread, await this._folderRepoManager.getCurrentUser(this.pullRequestModel.githubRepository), this._context)]);
 			}
 
 			if (isSingleComment) {

src/view/reviewCommentController.ts

@@ -28,6 +28,7 @@ import {
 	createVSCodeCommentThreadForReviewThread,
 	getRepositoryForFile,
 	isFileInRepo,
+	setReplyAuthor,
 	threadRange,
 	updateCommentReviewState,
 	updateCommentThreadLabel,
@@ -682,7 +683,9 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 					endLine++;
 				}
 
-				await this._folderRepoManager.activePullRequest!.createReviewThread(input, fileName, startLine, endLine, side);
+				await Promise.all([this._folderRepoManager.activePullRequest!.createReviewThread(input, fileName, startLine, endLine, side),
+				setReplyAuthor(thread, await this._folderRepoManager.getCurrentUser(this._folderRepoManager.activePullRequest!.githubRepository), this._context)
+				]);
 			} else {
 				const comment = thread.comments[0];
 				if (comment instanceof GHPRComment) {
@@ -787,14 +790,17 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 					startLine++;
 					endLine++;
 				}
-				await this._folderRepoManager.activePullRequest.createReviewThread(
-					input,
-					fileName,
-					startLine,
-					endLine,
-					side,
-					isSingleComment,
-				);
+				await Promise.all([
+					this._folderRepoManager.activePullRequest.createReviewThread(
+						input,
+						fileName,
+						startLine,
+						endLine,
+						side,
+						isSingleComment,
+					),
+					setReplyAuthor(thread, await this._folderRepoManager.getCurrentUser(this._folderRepoManager.activePullRequest.githubRepository), this._context)
+				]);
 			} else {
 				const comment = thread.comments[0];
 				if (comment instanceof GHPRComment) {