Make executeCommand return a promise

jrieken · jrieken · commit bedec8832717 · 2015-11-27T09:26:00.000+01:00
diff --git a/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts b/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts
@@ -142,7 +142,7 @@ export class AbstractKeybindingService {
 		throw new Error('Not implemented');
 	}
 
-	public executeCommand(commandId: string, args:any): void {
+	public executeCommand(commandId: string, args:any): TPromise<any> {
 		throw new Error('Not implemented');
 	}
 }
@@ -300,7 +300,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey
 		delete this._contexts[String(contextId)];
 	}
 
-	public executeCommand(commandId: string, args:any = {}): any {
+	public executeCommand(commandId: string, args:any = {}): TPromise<any> {
 		if (!args.context) {
 			var contextId = this._findContextAttr(<HTMLElement>document.activeElement);
 			var context = this.getContext(contextId);
@@ -309,9 +309,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey
 			args.context = contextValue;
 		}
 
-		return this._invokeHandler(commandId, args).done(undefined, err => {
-			this._messageService.show(Severity.Warning, err);
-		});
+		return this._invokeHandler(commandId, args);
 	}
 }
 
@@ -356,8 +354,8 @@ class ScopedKeybindingService extends AbstractKeybindingService {
 		this._parent.disposeContext(contextId);
 	}
 
-	public executeCommand(commandId: string, args:any): void {
-		this._parent.executeCommand(commandId, args);
+	public executeCommand(commandId: string, args:any): TPromise<any> {
+		return this._parent.executeCommand(commandId, args);
 	}
 }
 
diff --git a/src/vs/platform/keybinding/common/keybindingService.ts b/src/vs/platform/keybinding/common/keybindingService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import {TPromise} from 'vs/base/common/winjs.base';
 import {createDecorator, IInstantiationService, ServiceIdentifier, ServicesAccessor} from 'vs/platform/instantiation/common/instantiation';
 import {Keybinding} from 'vs/base/common/keyCodes';
 
@@ -82,5 +83,6 @@ export interface IKeybindingService {
 	lookupKeybindings(commandId: string): Keybinding[];
 	customKeybindingsCount(): number;
 
-	executeCommand(commandId: string, args?: any): any;
+	executeCommand<T>(commandId: string, args?: any): TPromise<T>;
+	executeCommand(commandId: string, args?: any): TPromise<any>;
 }
diff --git a/src/vs/workbench/api/common/pluginHostCommands.ts b/src/vs/workbench/api/common/pluginHostCommands.ts
@@ -148,7 +148,7 @@ export class MainThreadCommands {
 	}
 
 	_executeCommand<T>(id: string, args: any[]): Thenable<T> {
-		return TPromise.as(this._keybindingService.executeCommand(id, args));
+		return this._keybindingService.executeCommand(id, args);
 	}
 
 	_getCommands(): Thenable<string[]> {
diff --git a/src/vs/workbench/test/browser/servicesTestUtils.ts b/src/vs/workbench/test/browser/servicesTestUtils.ts
@@ -153,7 +153,7 @@ export class TestKeybindingService implements IKeybindingService {
 	public setInstantiationService(instantiationService: IInstantiationService): void { }
 	public setContext(key: string, value: any): void { }
 	public removeContext(key: string): void { }
-	public executeCommand(commandId: string, args: any): void { }
+	public executeCommand(commandId: string, args: any): TPromise<any> { return; }
 
 	public createKey<T>(key: string, defaultValue: T): IKeybindingContextKey<T> {
 		return null;

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ export class AbstractKeybindingService {`
`142`	`142`	`throw new Error('Not implemented');`
`143`	`143`	`}`
`144`	`144`
`145`		`- public executeCommand(commandId: string, args:any): void {`
	`145`	`+ public executeCommand(commandId: string, args:any): TPromise<any> {`
`146`	`146`	`throw new Error('Not implemented');`
`147`	`147`	`}`
`148`	`148`	`}`
`@@ -300,7 +300,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey`
`300`	`300`	`delete this._contexts[String(contextId)];`
`301`	`301`	`}`
`302`	`302`
`303`		`- public executeCommand(commandId: string, args:any = {}): any {`
	`303`	`+ public executeCommand(commandId: string, args:any = {}): TPromise<any> {`
`304`	`304`	`if (!args.context) {`
`305`	`305`	`var contextId = this._findContextAttr(<HTMLElement>document.activeElement);`
`306`	`306`	`var context = this.getContext(contextId);`
`@@ -309,9 +309,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey`
`309`	`309`	`args.context = contextValue;`
`310`	`310`	`}`
`311`	`311`
`312`		`- return this._invokeHandler(commandId, args).done(undefined, err => {`
`313`		`- this._messageService.show(Severity.Warning, err);`
`314`		`- });`
	`312`	`+ return this._invokeHandler(commandId, args);`
`315`	`313`	`}`
`316`	`314`	`}`
`317`	`315`
`@@ -356,8 +354,8 @@ class ScopedKeybindingService extends AbstractKeybindingService {`
`356`	`354`	`this._parent.disposeContext(contextId);`
`357`	`355`	`}`
`358`	`356`
`359`		`- public executeCommand(commandId: string, args:any): void {`
`360`		`- this._parent.executeCommand(commandId, args);`
	`357`	`+ public executeCommand(commandId: string, args:any): TPromise<any> {`
	`358`	`+ return this._parent.executeCommand(commandId, args);`
`361`	`359`	`}`
`362`	`360`	`}`
`363`	`361`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ export class MainThreadCommands {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`_executeCommand<T>(id: string, args: any[]): Thenable<T> {`
`151`		`- return TPromise.as(this._keybindingService.executeCommand(id, args));`
	`151`	`+ return this._keybindingService.executeCommand(id, args);`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`_getCommands(): Thenable<string[]> {`