Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Initialize extension host customers only after a connection has been established with the extension host; retire IThreadService

Browse Source
This commit is contained in:
Alex Dima
2017-08-16 18:08:01 +02:00
parent 4489519660
commit 4339a247ab
10 changed files with 74 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
View File

@@ -123,11 +123,10 @@ class MainThreadDocumentAndEditorStateComputer {
@ICodeEditorService private _codeEditorService: ICodeEditorService,
@IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService
) {
this._modelService.onModelAdded(this._updateState, this, this._toDispose);
this._modelService.onModelRemoved(this._updateState, this, this._toDispose);
this._modelService.onModelAdded(this.updateState, this, this._toDispose);
this._modelService.onModelRemoved(this.updateState, this, this._toDispose);
this._codeEditorService.onCodeEditorAdd(this._onDidAddEditor, this, this._toDispose);
this._codeEditorService.onCodeEditorRemove(this._onDidRemoveEditor, this, this._toDispose);
// this._updateState();
}
dispose(): void {
@@ -135,10 +134,10 @@ class MainThreadDocumentAndEditorStateComputer {
}
private _onDidAddEditor(e: ICommonCodeEditor): void {
this._toDisposeOnEditorRemove.set(e.getId(), e.onDidChangeModel(() => this._updateState()));
this._toDisposeOnEditorRemove.set(e.getId(), e.onDidFocusEditor(() => this._updateState()));
this._toDisposeOnEditorRemove.set(e.getId(), e.onDidBlurEditor(() => this._updateState()));
this._updateState();
this._toDisposeOnEditorRemove.set(e.getId(), e.onDidChangeModel(() => this.updateState()));
this._toDisposeOnEditorRemove.set(e.getId(), e.onDidFocusEditor(() => this.updateState()));
this._toDisposeOnEditorRemove.set(e.getId(), e.onDidBlurEditor(() => this.updateState()));
this.updateState();
}
private _onDidRemoveEditor(e: ICommonCodeEditor): void {
@@ -146,11 +145,11 @@ class MainThreadDocumentAndEditorStateComputer {
if (sub) {
this._toDisposeOnEditorRemove.delete(e.getId());
sub.dispose();
this._updateState();
this.updateState();
}
}
private _updateState(): void {
updateState(): void {
// models: ignore too large models
const models = this._modelService.getModels();
@@ -263,6 +262,8 @@ export class MainThreadDocumentsAndEditors {
this._onDocumentAdd,
this._onDocumentRemove,
];
this._stateComputer.updateState();
}
dispose(): void {