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

Fixes #34004: Remove decoration types registered by the extension host when it is terminated

Browse Source
This commit is contained in:
Alex Dima
2017-09-25 18:23:29 +02:00
parent 2d80fbd97e
commit 683a46efba
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
View File

@@ -35,6 +35,7 @@ export class MainThreadEditors implements MainThreadEditorsShape {
private _toDispose: IDisposable[];
private _textEditorsListenersMap: { [editorId: string]: IDisposable[]; };
private _editorPositionData: ITextEditorPositionData;
private _registeredDecorationTypes: { [decorationType: string]: boolean; };
constructor(
documentsAndEditors: MainThreadDocumentsAndEditors,
@@ -60,6 +61,8 @@ export class MainThreadEditors implements MainThreadEditorsShape {
this._toDispose.push(editorGroupService.onEditorsChanged(() => this._updateActiveAndVisibleTextEditors()));
this._toDispose.push(editorGroupService.onEditorsMoved(() => this._updateActiveAndVisibleTextEditors()));
this._registeredDecorationTypes = Object.create(null);
}
public dispose(): void {
@@ -68,6 +71,10 @@ export class MainThreadEditors implements MainThreadEditorsShape {
});
this._textEditorsListenersMap = Object.create(null);
this._toDispose = dispose(this._toDispose);
for (let decorationType in this._registeredDecorationTypes) {
this._codeEditorService.removeDecorationType(decorationType);
}
this._registeredDecorationTypes = Object.create(null);
}
private _onTextEditorAdd(textEditor: MainThreadTextEditor): void {
@@ -255,10 +262,12 @@ export class MainThreadEditors implements MainThreadEditorsShape {
}
$registerTextEditorDecorationType(key: string, options: IDecorationRenderOptions): void {
this._registeredDecorationTypes[key] = true;
this._codeEditorService.registerDecorationType(key, options);
}
$removeTextEditorDecorationType(key: string): void {
delete this._registeredDecorationTypes[key];
this._codeEditorService.removeDecorationType(key);
}