Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

editor - remove code that is handled by cancellation token (for #60163)

Browse Source
This commit is contained in:
Benjamin Pasero
2018-10-17 08:25:16 +02:00
parent fcad21ec75
commit 74f09acca9
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,13 +45,17 @@ export class MainThreadComments extends Disposable implements MainThreadComments
const _visibleEditors = {};
visibleEditors.forEach(editor => {
if (!editor.hasModel()) {
return; // we need a model
}
const id = editor.getId();
const model = editor.getModel();
if (editors.filter(ed => ed.getId() === id).length > 0) {
// it's an active editor, we are going to update this editor's comments anyways
} else {
if (this._visibleModels[id]) {
// it's the same active editor, but we may want to check if the model is still the same
let modelId = editor.getModel().getModeId();
let modelId = model.getModeId();
if (modelId !== this._visibleModels[id]) {
editors.push(editor);
}
@@ -61,7 +65,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
}
}
_visibleEditors[id] = editor.getModel().getModeId();
_visibleEditors[id] = model.getModeId();
});
this._visibleModels = _visibleEditors;