diff --git a/extensions/vscode-api-tests/src/commands.test.ts b/extensions/vscode-api-tests/src/commands.test.ts index 28d727bc1ca046924ee7b624ec3cad5d16e5d6e1..0d92795d241fdcf437f1f9fce4c89fd08feaee2f 100644 --- a/extensions/vscode-api-tests/src/commands.test.ts +++ b/extensions/vscode-api-tests/src/commands.test.ts @@ -56,22 +56,6 @@ suite('commands namespace tests', () => { }); }); - test('command with return-value', function () { - - let registration = commands.registerCommand('t1', function () { - return new Set().add(1).add(2); - }); - - return commands.executeCommand('t1', 'start').then(value => { - registration.dispose(); - - assert.ok(value instanceof Set); - assert.equal((>value).size, 2); - assert.equal((>value).has(1), true); - assert.equal((>value).has(2), true); - }); - }); - test('editorCommand with extra args', function () { let args: IArguments; @@ -150,4 +134,4 @@ suite('commands namespace tests', () => { return Promise.all([a, b, c, d]); }); -}); +}); \ No newline at end of file diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 89e8011b409a9a9eb7dad1b8717743bd3a272489..ea75a41995c5e164359c4bb16790fc7fdb98db0f 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -429,7 +429,7 @@ export interface MainThreadWindowShape extends IDisposable { // -- extension host export interface ExtHostCommandsShape { - $executeContributedCommand(id: string, ...args: any[]): Thenable; + $executeContributedCommand(id: string, ...args: any[]): Thenable; $getContributedCommandHandlerDescriptions(): TPromise<{ [id: string]: string | ICommandHandlerDescription }>; } diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts index ca82afcef48de13847ff4db9b367920958c3babf..774d71f8e262afbf662b0f49dec7ad3b2d993e5b 100644 --- a/src/vs/workbench/api/node/extHostCommands.ts +++ b/src/vs/workbench/api/node/extHostCommands.ts @@ -74,7 +74,7 @@ export class ExtHostCommands implements ExtHostCommandsShape { if (this._commands.has(id)) { // we stay inside the extension host and support // to pass any kind of parameters around - return this._executeContributedCommand(id, ...args); + return this.$executeContributedCommand(id, ...args); } else { // automagically convert some argument types @@ -96,9 +96,10 @@ export class ExtHostCommands implements ExtHostCommandsShape { return this._proxy.$executeCommand(id, args); } + } - private _executeContributedCommand(id: string, ...args: any[]): Thenable { + $executeContributedCommand(id: string, ...args: any[]): Thenable { let command = this._commands.get(id); if (!command) { return TPromise.wrapError(new Error(`Contributed command '${id}' does not exist.`)); @@ -132,10 +133,6 @@ export class ExtHostCommands implements ExtHostCommandsShape { } } - $executeContributedCommand(id: string, ...args: any[]): Thenable { - return this._executeContributedCommand(id, ...args).then(result => void 0); - } - getCommands(filterUnderscoreCommands: boolean = false): Thenable { return this._proxy.$getCommands().then(result => { if (filterUnderscoreCommands) {