Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87

* fix compile errors
This commit is contained in:
Anthony Dresser
2019-07-18 18:32:57 -07:00
committed by GitHub
parent bf4815d364
commit ee3663c1cd
158 changed files with 3101 additions and 2361 deletions

View File

@@ -54,7 +54,6 @@ export interface ICommentService {
disposeCommentThread(ownerId: string, threadId: string): void;
getComments(resource: URI): Promise<(ICommentInfo | null)[]>;
getCommentingRanges(resource: URI): Promise<IRange[]>;
getReactionGroup(owner: string): CommentReaction[] | undefined;
hasReactionHandler(owner: string): boolean;
toggleReaction(owner: string, resource: URI, thread: CommentThread, comment: Comment, reaction: CommentReaction): Promise<void>;
setActiveCommentThread(commentThread: CommentThread | null): void;
@@ -183,22 +182,6 @@ export class CommentService extends Disposable implements ICommentService {
}
}
getReactionGroup(owner: string): CommentReaction[] | undefined {
const commentProvider = this._commentControls.get(owner);
if (commentProvider) {
return commentProvider.getReactionGroup();
}
const commentController = this._commentControls.get(owner);
if (commentController) {
return commentController.getReactionGroup();
}
return undefined;
}
hasReactionHandler(owner: string): boolean {
const commentProvider = this._commentControls.get(owner);