diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts index 67d9d60a925..9b3613efc66 100644 --- a/src/vs/editor/common/languages.ts +++ b/src/vs/editor/common/languages.ts @@ -1777,6 +1777,12 @@ export interface CommentingRanges { fileComments: boolean; } +export interface CommentAuthorInformation { + name: string; + iconPath?: UriComponents; + +} + /** * @internal */ diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 226226fc52c..bd130e5d03d 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -7726,6 +7726,11 @@ declare namespace monaco.languages { arguments?: any[]; } + export interface CommentAuthorInformation { + name: string; + iconPath?: UriComponents; + } + export interface PendingCommentThread { body: string; range: IRange | undefined; diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts index 04541a1decb..91e14ee9a07 100644 --- a/src/vs/workbench/api/common/extHostComments.ts +++ b/src/vs/workbench/api/common/extHostComments.ts @@ -697,7 +697,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo iconPath: reaction.iconPath ? extHostTypeConverter.pathOrURIToURI(reaction.iconPath) : undefined, count: reaction.count, hasReacted: reaction.authorHasReacted, - reactors: reaction.reactors + reactors: ((reaction.reactors && (reaction.reactors.length > 0) && (typeof reaction.reactors[0] !== 'string')) ? (reaction.reactors as languages.CommentAuthorInformation[]).map(reactor => reactor.name) : reaction.reactors) as string[] }; } @@ -707,7 +707,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo count: reaction.count || 0, iconPath: reaction.iconPath ? URI.revive(reaction.iconPath) : '', authorHasReacted: reaction.hasReacted || false, - reactors: reaction.reactors + reactors: reaction.reactors?.map(reactor => ({ name: reactor })) }; } diff --git a/src/vscode-dts/vscode.proposed.commentReactor.d.ts b/src/vscode-dts/vscode.proposed.commentReactor.d.ts index 13cad5f50a2..25a433cd8cf 100644 --- a/src/vscode-dts/vscode.proposed.commentReactor.d.ts +++ b/src/vscode-dts/vscode.proposed.commentReactor.d.ts @@ -8,6 +8,6 @@ declare module 'vscode' { // @alexr00 https://github.com/microsoft/vscode/issues/201131 export interface CommentReaction { - readonly reactors?: readonly string[]; + readonly reactors?: readonly CommentAuthorInformation[]; } }