development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

webview - clear group listener when it gets disposed

Browse source 
//cc @lramos15
This commit is contained in:
Benjamin Pasero 2021-05-26 08:24:55 +02:00
parent fe1547c251
commit d0884f4a1e
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.ts
View file

@ -3,7 +3,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { Event } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { registerAction2 } from 'vs/platform/actions/common/actions'; import { registerAction2 } from 'vs/platform/actions/common/actions';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@ -28,26 +29,28 @@ import { IWebviewWorkbenchService, WebviewEditorService } from './webviewWorkben
class WebviewPanelContribution extends Disposable implements IWorkbenchContribution { class WebviewPanelContribution extends Disposable implements IWorkbenchContribution {
private readonly _disposables = new DisposableStore();
constructor( constructor(
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService, @IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
) { ) {
super(); super();
// Add all the initial groups to be listened to // Add all the initial groups to be listened to
this.editorGroupService.whenReady.then(() => this.editorGroupService.groups.forEach(group => { this.editorGroupService.whenReady.then(() => this.editorGroupService.groups.forEach(group => {
this.registerGroupListener(group); this.registerGroupListener(group);
})); }));
// Additional groups added should also be listened to // Additional groups added should also be listened to
this._register(this.editorGroupService.onDidAddGroup((group) => this.registerGroupListener(group))); this._register(this.editorGroupService.onDidAddGroup(group => this.registerGroupListener(group)));
this._register(this._disposables);
} }
private registerGroupListener(group: IEditorGroup): void { private registerGroupListener(group: IEditorGroup): void {
const listener = group.onWillOpenEditor(e => this.onEditorOpening(e.editor, group)); const listener = group.onWillOpenEditor(e => this.onEditorOpening(e.editor, group));
this._disposables.add(listener);
Event.once(group.onWillDispose)(() => {
listener.dispose();
});
} }
private onEditorOpening( private onEditorOpening(
editor: IEditorInput, editor: IEditorInput,
group: IEditorGroup group: IEditorGroup
@ -74,7 +77,6 @@ class WebviewPanelContribution extends Disposable implements IWorkbenchContribut
} }
previousGroup.closeEditor(editor); previousGroup.closeEditor(editor);
} }
} }
@ -87,7 +89,6 @@ Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).
registerSingleton(IWebviewWorkbenchService, WebviewEditorService, true); registerSingleton(IWebviewWorkbenchService, WebviewEditorService, true);
registerAction2(ShowWebViewEditorFindWidgetAction); registerAction2(ShowWebViewEditorFindWidgetAction);
registerAction2(HideWebViewEditorFindCommand); registerAction2(HideWebViewEditorFindCommand);
registerAction2(WebViewEditorFindNextCommand); registerAction2(WebViewEditorFindNextCommand);