Adopt author infor for comment thread canReply (#6775)

Part of microsoft/vscode#246088

Author: alexr00

package.json

@@ -16,6 +16,7 @@
 		"codeActionRanges",
 		"commentingRangeHint",
 		"commentReactor",
+		"commentReplyAuthor",
 		"commentReveal",
 		"commentThreadApplicability",
 		"contribAccessibilityHelpContent",

src/@types/vscode.proposed.commentReplyAuthor.d.ts

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// @alexr00 https://github.com/microsoft/vscode/issues/246088
+
+	export interface CommentThread2 {
+		canReply: boolean | CommentAuthorInformation;
+
+		readonly uri: Uri;
+		range: Range | undefined;
+		comments: readonly Comment[];
+		collapsibleState: CommentThreadCollapsibleState;
+		contextValue?: string;
+		label?: string;
+		state?: CommentThreadState | { resolved?: CommentThreadState; applicability?: CommentThreadApplicability };
+		dispose(): void;
+	}
+}

src/@types/vscode.proposed.commentThreadApplicability.d.ts

@@ -32,7 +32,7 @@ declare module 'vscode' {
 		range: Range | undefined;
 		comments: readonly Comment[];
 		collapsibleState: CommentThreadCollapsibleState;
-		canReply: boolean;
+		canReply: boolean | CommentAuthorInformation;
 		contextValue?: string;
 		label?: string;
 		dispose(): void;

src/github/prComment.ts

@@ -45,6 +45,8 @@ export interface GHPRCommentThread extends vscode.CommentThread2 {
 	 */
 	label?: string;
 
+	canReply: boolean | vscode.CommentAuthorInformation;
+
 	/**
 	 * Whether the thread has been marked as resolved.
 	 */

src/github/utils.ts

@@ -18,6 +18,7 @@ import { Remote } from '../common/remote';
 import { Resource } from '../common/resources';
 import { GITHUB_ENTERPRISE, OVERRIDE_DEFAULT_BRANCH, PR_SETTINGS_NAMESPACE, URI } from '../common/settingKeys';
 import * as Common from '../common/timelineEvent';
+import { DataUri } from '../common/uri';
 import { gitHubLabelColor, uniqBy } from '../common/utils';
 import { OctokitCommon } from './common';
 import { FolderRepositoryManager, PullRequestDefaults } from './folderRepositoryManager';
@@ -101,7 +102,7 @@ export function createVSCodeCommentThreadForReviewThread(
 	range: vscode.Range | undefined,
 	thread: IReviewThread,
 	commentController: vscode.CommentController,
-	currentUser: string,
+	currentUser: IAccount,
 	githubRepositories?: GitHubRepository[]
 ): GHPRCommentThread {
 	const vscodeThread = commentController.createCommentThread(uri, range, []);
@@ -124,7 +125,14 @@ export function createVSCodeCommentThreadForReviewThread(
 	vscodeThread.state = { resolved, applicability };
 
 	updateCommentThreadLabel(vscodeThread as GHPRCommentThread);
-	vscodeThread.collapsibleState = getCommentCollapsibleState(thread, undefined, currentUser);
+	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] };
+		});
+	}
 
 	return vscodeThread as GHPRCommentThread;
 }

src/view/pullRequestCommentController.ts

@@ -166,7 +166,7 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 							range,
 							thread,
 							this._commentController,
-							currentUser.login,
+							currentUser,
 							this._githubRepositories
 						);
 					});
@@ -260,7 +260,7 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 						range,
 						thread,
 						this._commentController,
-						(await this._folderRepoManager.getCurrentUser()).login,
+						(await this._folderRepoManager.getCurrentUser()),
 						this._githubRepositories
 					);
 				}

src/view/reviewCommentController.ts

@@ -113,7 +113,7 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 		);
 
 		const range = thread.subjectType === SubjectType.FILE ? undefined : threadRange(thread.originalStartLine - 1, thread.originalEndLine - 1);
-		return createVSCodeCommentThreadForReviewThread(this._context, reviewUri, range, thread, this._commentController, (await this._folderRepoManager.getCurrentUser()).login, this.githubReposForPullRequest(this._folderRepoManager.activePullRequest));
+		return createVSCodeCommentThreadForReviewThread(this._context, reviewUri, range, thread, this._commentController, (await this._folderRepoManager.getCurrentUser()), this.githubReposForPullRequest(this._folderRepoManager.activePullRequest));
 	}
 
 	/**
@@ -146,7 +146,7 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 			}
 			range = threadRange(adjustedStartLine, adjustedEndLine);
 		}
-		return createVSCodeCommentThreadForReviewThread(this._context, uri, range, thread, this._commentController, (await this._folderRepoManager.getCurrentUser()).login, this.githubReposForPullRequest(this._folderRepoManager.activePullRequest));
+		return createVSCodeCommentThreadForReviewThread(this._context, uri, range, thread, this._commentController, (await this._folderRepoManager.getCurrentUser()), this.githubReposForPullRequest(this._folderRepoManager.activePullRequest));
 	}
 
 	/**
@@ -172,7 +172,7 @@ export class ReviewCommentController extends CommentControllerBase implements Co
 		);
 
 		const range = thread.subjectType === SubjectType.FILE ? undefined : threadRange(thread.startLine - 1, thread.endLine - 1);
-		return createVSCodeCommentThreadForReviewThread(this._context, reviewUri, range, thread, this._commentController, (await this._folderRepoManager.getCurrentUser()).login, this.githubReposForPullRequest(this._folderRepoManager.activePullRequest));
+		return createVSCodeCommentThreadForReviewThread(this._context, reviewUri, range, thread, this._commentController, (await this._folderRepoManager.getCurrentUser()), this.githubReposForPullRequest(this._folderRepoManager.activePullRequest));
 	}
 
 	private async doInitializeCommentThreads(reviewThreads: IReviewThread[]): Promise<void> {