Merge from vscode da3c97f3668393ebfcb9f8208d7616018d6d1859 (#5360)

src/vs/vscode.d.ts

@@ -9024,57 +9024,61 @@ declare module 'vscode' {
 		dispose(): void;
 	}
 
+	/**
+	 * Author information of a [comment](#Comment)
+	 */
+
+	export interface CommentAuthorInformation {
+		/**
+		 * The display name of the author of the comment
+		 */
+		name: string;
+
+		/**
+		 * The optional icon path for the author
+		 */
+		iconPath?: Uri;
+	}
+
 	/**
 	 * A comment is displayed within the editor or the Comments Panel, depending on how it is provided.
 	 */
-	export class Comment {
+	export interface Comment {
 		/**
 		 * The id of the comment
 		 */
-		readonly id: string;
+		id: string;
 
 		/**
 		 * The human-readable comment body
 		 */
-		readonly body: MarkdownString;
+		body: MarkdownString;
 
 		/**
-		 * The display name of the user who created the comment
+		 * The author information of the comment
 		 */
-		readonly userName: string;
+		author: CommentAuthorInformation;
 
 		/**
 		 * Optional label describing the [Comment](#Comment)
-		 * Label will be rendered next to userName if exists.
+		 * Label will be rendered next to authorName if exists.
 		 */
-		readonly label?: string;
-
-		/**
-		 * The icon path for the user who created the comment
-		 */
-		readonly userIconPath?: Uri;
+		label?: string;
 
 		/**
 		 * The command to be executed if the comment is selected in the Comments Panel
 		 */
-		readonly selectCommand?: Command;
+		selectCommand?: Command;
 
 		/**
 		 * The command to be executed when users try to save the edits to the comment
 		 */
-		readonly editCommand?: Command;
+		editCommand?: Command;
 
 		/**
 		 * The command to be executed when users try to delete the comment
 		 */
-		readonly deleteCommand?: Command;
-
-		/**
-		 * @param id The id of the comment
-		 * @param body The human-readable comment body
-		 * @param userName The display name of the user who created the comment
-		 */
-		constructor(id: string, body: MarkdownString, userName: string);
+		deleteCommand?: Command;
 	}
 
 	/**