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

let CommandsConverter actually convert commands, make sure "magic" commands handle uri components

Browse Source
This commit is contained in:
Johannes Rieken
2020-11-11 18:14:49 +01:00
parent 0bda02ba0d
commit 6a8fe0a8da
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import { URI } from 'vs/base/common/uri';
import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
import { DiffAPICommand, ICommandsExecutor, OpenAPICommand } from 'vs/workbench/api/common/apiCommands';
interface CommandHandler {
callback: Function;
@@ -217,6 +218,8 @@ export class ExtHostCommands implements ExtHostCommandsShape {
export class CommandsConverter {
private readonly _commandConverter = new Map<string, (executor: ICommandsExecutor, ...more: any[]) => Promise<any>>();
private readonly _delegatingCommandId: string;
private readonly _cache = new Map<number, vscode.Command>();
private _cachIdPool = 0;
@@ -228,6 +231,9 @@ export class CommandsConverter {
) {
this._delegatingCommandId = `_vscode_delegate_cmd_${Date.now().toString(36)}`;
this._commands.registerCommand(true, this._delegatingCommandId, this._executeConvertedCommand, this);
this._commandConverter.set(OpenAPICommand.ID, OpenAPICommand.execute);
this._commandConverter.set(DiffAPICommand.ID, DiffAPICommand.execute);
}
toInternal(command: vscode.Command, disposables: DisposableStore): ICommandDto;
@@ -245,7 +251,19 @@ export class CommandsConverter {
tooltip: command.tooltip
};
if (command.command && isNonEmptyArray(command.arguments)) {
const apiCommand = this._commandConverter.get(command.command);
if (apiCommand) {
// we have some API command registered for which we know how to convert
// them, e.g what internal ID they use and how to convert the arguments
apiCommand({
async executeCommand(id, ...internalArgs: []) {
result.id = id;
result.arguments = internalArgs;
return undefined;
}
}, ...command.arguments ?? []);
} else if (command.command && isNonEmptyArray(command.arguments)) {
// we have a contributed command with arguments. that
// means we don't want to send the arguments around