Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support multiple workspaceCommentsProvider contributions in comments panel, fixes #51622

Browse Source
This commit is contained in:
Rachel Macfarlane
2018-06-11 09:33:18 -07:00
parent e09017d368
commit 915bbb2db3
5 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/api/electron-browser/mainThreadComments.ts
View File

@@ -53,7 +53,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
const outerEditorURI = outerEditor.getModel().uri;
this.provideDocumentComments(outerEditorURI).then(commentInfos => {
this._commentService.setComments(outerEditorURI, commentInfos.filter(info => info !== null));
this._commentService.setDocumentComments(outerEditorURI, commentInfos.filter(info => info !== null));
});
}));
}
@@ -84,7 +84,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
this._panelService.openPanel(COMMENTS_PANEL_ID);
this._proxy.$provideWorkspaceComments(handle).then(commentThreads => {
if (commentThreads) {
this._commentService.setAllComments(commentThreads);
this._commentService.setWorkspaceComments(handle, commentThreads);
}
});
}
@@ -96,8 +96,10 @@ export class MainThreadComments extends Disposable implements MainThreadComments
$unregisterWorkspaceCommentProvider(handle: number): void {
this._workspaceProviders.delete(handle);
this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, false);
this._commentService.removeAllComments();
if (this._workspaceProviders.size === 0) {
this._panelService.setPanelEnablement(COMMENTS_PANEL_ID, false);
}
this._commentService.removeWorkspaceComments(handle);
}
$onDidCommentThreadsChange(handle: number, event: modes.CommentThreadChangedEvent) {