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

huge refactoring, remove getNewCommentRange

Browse Source
This commit is contained in:
Peng Lyu
2018-04-19 11:49:45 -07:00
parent 8730f9688f
commit 55198cb554
10 changed files with 163 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@ import { ICommentService } from 'vs/workbench/services/comments/electron-browser
import { COMMENTS_PANEL_ID } from 'vs/workbench/parts/comments/electron-browser/commentsPanel';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import URI from 'vs/base/common/uri';
import { ITextModel } from 'vs/editor/common/model';
import { ReviewController } from 'vs/workbench/parts/comments/electron-browser/commentsEditorContribution';
@extHostNamedCustomer(MainContext.MainThreadComments)
@@ -49,25 +48,21 @@ export class MainThreadComments extends Disposable implements MainThreadComments
}
const outerEditorURI = outerEditor.getModel().uri;
this.provideComments(outerEditorURI).then(commentThreads => {
this._commentService.setComments(outerEditorURI, commentThreads);
});
this.provideNewCommentRange(outerEditor.getModel()).then(newActions => {
controller.setNewCommentActions(newActions);
this.provideComments(outerEditorURI).then(commentInfos => {
this._commentService.setComments(outerEditorURI, commentInfos);
});
_commentService.registerDataProvider({
provideAllComments: async (token) => {
return await this.provideAllComments();
},
provideComments: async (model, token) => {
return await this.provideComments(model.uri);
},
provideNewCommentRange: async (model, token) => {
return await this.provideNewCommentRange(model);
},
onDidChangeCommentThreads: null
});
for (const handle of keys(this._providers)) {
_commentService.registerDataProvider({
provideAllComments: async (token) => {
return await this._proxy.$provideAllComments(handle);
},
provideComments: async (model, token) => {
return this._proxy.$provideComments(handle, model.uri);
},
onDidChangeCommentThreads: null
});
}
});
}
@@ -114,21 +109,10 @@ export class MainThreadComments extends Disposable implements MainThreadComments
return result;
}
async provideComments(resource: URI): Promise<modes.CommentThread[]> {
const result: modes.CommentThread[] = [];
async provideComments(resource: URI): Promise<modes.CommentInfo[]> {
const result: modes.CommentInfo[] = [];
for (const handle of keys(this._providers)) {
result.push(...await this._proxy.$provideComments(handle, resource));
}
return result;
}
async provideNewCommentRange(model: ITextModel): Promise<modes.NewCommentAction[]> {
const result: modes.NewCommentAction[] = [];
for (const handle of keys(this._providers)) {
let newCommentRange = await this._proxy.$provideNewCommentRange(handle, model.uri);
if (newCommentRange.length > 0) {
result.push(...newCommentRange);
}
result.push(await this._proxy.$provideComments(handle, resource));
}
return result;
}