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

towards ext-host-restart: properly implement dispose-methods in variouds MainThreadXYZ-types

Browse Source
This commit is contained in:
Johannes Rieken
2017-08-14 16:56:03 +02:00
parent 9098d9ff7c
commit 2e5311ca6e
12 changed files with 137 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/workbench/api/electron-browser/mainThreadCommands.ts
View File

@@ -12,32 +12,34 @@ import { ExtHostContext, MainThreadCommandsShape, ExtHostCommandsShape } from '.
export class MainThreadCommands extends MainThreadCommandsShape {
private _disposables: { [id: string]: IDisposable } = Object.create(null);
private _proxy: ExtHostCommandsShape;
private readonly _disposables = new Map<string, IDisposable>();
private readonly _proxy: ExtHostCommandsShape;
constructor(
@IThreadService private _threadService: IThreadService,
@ICommandService private _commandService: ICommandService
@IThreadService private readonly _threadService: IThreadService,
@ICommandService private readonly _commandService: ICommandService
) {
super();
this._proxy = this._threadService.get(ExtHostContext.ExtHostCommands);
}
dispose() {
for (let id in this._disposables) {
this._disposables[id].dispose();
}
this._disposables.forEach(value => value.dispose());
this._disposables.clear();
}
$registerCommand(id: string): TPromise<any> {
this._disposables[id] = CommandsRegistry.registerCommand(id, (accessor, ...args) => this._proxy.$executeContributedCommand(id, ...args));
this._disposables.set(
id,
CommandsRegistry.registerCommand(id, (accessor, ...args) => this._proxy.$executeContributedCommand(id, ...args))
);
return undefined;
}
$unregisterCommand(id: string): TPromise<any> {
if (this._disposables[id]) {
this._disposables[id].dispose();
delete this._disposables[id];
if (this._disposables.has(id)) {
this._disposables.get(id).dispose();
this._disposables.delete(id);
}
return undefined;
}