diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 5e3415d42cb..b1fbc64c189 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -267,7 +267,7 @@ export abstract class ExtHostEditorsShape { export abstract class ExtHostTreeExplorersShape { $provideRootNode(providerId: string): TPromise { throw ni(); }; $resolveChildren(providerId: string, node: InternalTreeExplorerNode): TPromise { throw ni(); } - $resolveCommand(providerId: string, node: InternalTreeExplorerNode): TPromise { throw ni(); } + $executeCommand(providerId: string, node: InternalTreeExplorerNode): TPromise { throw ni(); } } export abstract class ExtHostExtensionServiceShape { diff --git a/src/vs/workbench/api/node/extHostTreeExplorers.ts b/src/vs/workbench/api/node/extHostTreeExplorers.ts index 869cf0ddf16..d03a9096e7c 100644 --- a/src/vs/workbench/api/node/extHostTreeExplorers.ts +++ b/src/vs/workbench/api/node/extHostTreeExplorers.ts @@ -80,7 +80,7 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape { }); } - $resolveCommand(providerId: string, mainThreadNode: InternalTreeExplorerNode): TPromise { + $executeCommand(providerId: string, mainThreadNode: InternalTreeExplorerNode): TPromise { const provider = this._treeExplorerNodeProviders[providerId]; if (!provider) { throw new Error(`no TreeExplorerNodeProvider registered with id '${providerId}'`); diff --git a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts index 4c4b37d61fe..149fbc41cd5 100644 --- a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts +++ b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts @@ -30,8 +30,8 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape { resolveChildren: (node: InternalTreeExplorerNode): TPromise => { return this._proxy.$resolveChildren(providerId, node); }, - resolveCommand: (node: InternalTreeExplorerNode): TPromise => { - return this._proxy.$resolveCommand(providerId, node); + executeCommand: (node: InternalTreeExplorerNode): TPromise => { + return this._proxy.$executeCommand(providerId, node); } }); } diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts b/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts index 2946bd3d38b..afbff616aed 100644 --- a/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts +++ b/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts @@ -43,6 +43,6 @@ export class TreeExplorerViewletService implements ITreeExplorerViewletService { } resolveCommand(providerId: string, node: InternalTreeExplorerNode): TPromise { - return TPromise.wrap(this._treeExplorerNodeProvider[providerId].resolveCommand(node)); + return TPromise.wrap(this._treeExplorerNodeProvider[providerId].executeCommand(node)); } } diff --git a/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts b/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts index 45a003fd572..6c8b5c51595 100644 --- a/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts +++ b/src/vs/workbench/parts/explorers/common/treeExplorerViewModel.ts @@ -36,9 +36,9 @@ export class InternalTreeExplorerNode implements TreeExplorerNodeContent { } export interface InternalTreeExplorerNodeProvider { - resolveCommand(node: TreeExplorerNodeContent): TPromise; provideRootNode(): Thenable; resolveChildren(node: InternalTreeExplorerNode): Thenable; + executeCommand(node: TreeExplorerNodeContent): TPromise; } export interface TreeExplorerNodeContent {