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

Revert "fix #37484"

Browse Source 
This reverts commit c8a8fc7ddd.
This commit is contained in:
Johannes Rieken
2017-11-02 11:15:17 +01:00
parent 810eab9bbb
commit 47bd8ae1ca
3 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -429,7 +429,7 @@ export interface MainThreadWindowShape extends IDisposable {
// -- extension host
export interface ExtHostCommandsShape {
$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<void>;
$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<T>;
$getContributedCommandHandlerDescriptions(): TPromise<{ [id: string]: string | ICommandHandlerDescription }>;
}

9
src/vs/workbench/api/node/extHostCommands.ts
View File

@@ -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<T>(id, ...args);
return this.$executeContributedCommand<T>(id, ...args);
} else {
// automagically convert some argument types
@@ -96,9 +96,10 @@ export class ExtHostCommands implements ExtHostCommandsShape {
return this._proxy.$executeCommand<T>(id, args);
}
}
private _executeContributedCommand<T>(id: string, ...args: any[]): Thenable<T> {
$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<T> {
let command = this._commands.get(id);
if (!command) {
return TPromise.wrapError<T>(new Error(`Contributed command '${id}' does not exist.`));
@@ -132,10 +133,6 @@ export class ExtHostCommands implements ExtHostCommandsShape {
}
}
$executeContributedCommand<T>(id: string, ...args: any[]): Thenable<void> {
return this._executeContributedCommand(id, ...args).then(result => void 0);
}
getCommands(filterUnderscoreCommands: boolean = false): Thenable<string[]> {
return this._proxy.$getCommands().then(result => {
if (filterUnderscoreCommands) {