Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made recommended changes

Browse Source
This commit is contained in:
Harry Hedger
2019-04-16 01:51:22 -07:00
parent 8755a2aa35
commit b9c3c20a75
13 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/workbench/api/common/extHostCommands.ts
View File

@@ -32,8 +32,8 @@ export interface ArgumentProcessor {
}
export class ExtHostCommands implements ExtHostCommandsShape {
private readonly _onDidExecuteCommand: Emitter<ICommandEvent> = new Emitter<ICommandEvent>();
public readonly onDidExecuteCommandEmitter: Event<ICommandEvent> = this._onDidExecuteCommand.event;
private readonly _onDidExecuteCommand: Emitter<ICommandEvent>;
public readonly onDidExecuteCommandEmitter: Event<ICommandEvent>;
private readonly _commands = new Map<string, CommandHandler>();
private readonly _proxy: MainThreadCommandsShape;
@@ -47,6 +47,11 @@ export class ExtHostCommands implements ExtHostCommandsShape {
logService: ILogService
) {
this._proxy = mainContext.getProxy(MainContext.MainThreadCommands);
this._onDidExecuteCommand = new Emitter<ICommandEvent>({
onFirstListenerDidAdd: this._proxy.$onDidExecuteCommand,
onLastListenerRemove: this._proxy.$disposeListeners,
});
this.onDidExecuteCommandEmitter = this._onDidExecuteCommand.event;
this._logService = logService;
this._converter = new CommandsConverter(this, heapService);
this._argumentProcessors = [
@@ -112,7 +117,6 @@ export class ExtHostCommands implements ExtHostCommandsShape {
}
onDidExecuteCommand(listener: (command: ICommandEvent) => any, thisArgs?: any, disposables?: IDisposable[]) {
this._proxy.$onDidExecuteCommand();
return this.onDidExecuteCommandEmitter(listener, thisArgs, disposables);
}
@@ -146,9 +150,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
}
});
return this._proxy.$executeCommand<T>(id, args).then(result => {
return revive(result, 0);
});
return this._proxy.$executeCommand<T>(id, args).then(result => revive(result, 0));
}
}
@@ -170,6 +172,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
try {
const result = callback.apply(thisArg, args);
this._onDidExecuteCommand.fire({ commandId: id, args });
return Promise.resolve(result);
} catch (err) {
this._logService.error(err, id);