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

💄 trim [ExtHost|MainThread]Commands classes

Browse Source
This commit is contained in:
Johannes Rieken
2016-01-04 16:32:28 +01:00
parent 69aba0984c
commit de3e63c058
2 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ import {IKeybindingService, ICommandHandlerDescription} from 'vs/platform/keybin
import {TPromise} from 'vs/base/common/winjs.base';
import {ExtHostEditors} from 'vs/workbench/api/common/extHostEditors';
import {Disposable} from 'vs/workbench/api/common/extHostTypes';
import * as vscode from 'vscode';
interface CommandHandler {
callback: Function;
@@ -47,27 +46,6 @@ export class ExtHostCommands {
return new Disposable(() => delete this._commands[id]);
}
registerTextEditorCommand(id: string, callback: (textEditor: vscode.TextEditor, edit: vscode.TextEditorEdit) => void, thisArg?: any): vscode.Disposable {
let actualCallback: typeof callback = thisArg ? callback.bind(thisArg) : callback;
return this.registerCommand(id, () => {
let activeTextEditor = this._pluginHostEditors.getActiveTextEditor();
if (!activeTextEditor) {
console.warn('Cannot execute ' + id + ' because there is no active text editor.');
return;
}
activeTextEditor.edit((edit: vscode.TextEditorEdit) => {
actualCallback(activeTextEditor, edit);
}).then((result) => {
if (!result) {
console.warn('Edits from command ' + id + ' were not applied.');
}
}, (err) => {
console.warn('An error occured while running command ' + id, err);
});
});
}
executeCommand<T>(id: string, ...args: any[]): Thenable<T> {
if (this._commands[id]) {
@@ -153,7 +131,7 @@ export class MainThreadCommands {
KeybindingsRegistry.registerCommandDesc({
id,
handler: (serviceAccessor, ...args: any[]) => {
return this._proxy.$executeContributedCommand(id, ...args); //TODO@Joh - we cannot serialize the args
return this._proxy.$executeContributedCommand(id, ...args);
},
weight: undefined,
context: undefined,
@@ -174,19 +152,6 @@ export class MainThreadCommands {
$getCommands(): Thenable<string[]> {
return TPromise.as(Object.keys(KeybindingsRegistry.getCommands()));
}
$getCommandHandlerDescriptions(): TPromise<{ [id: string]: string | ICommandHandlerDescription }> {
return this._proxy.$getContributedCommandHandlerDescriptions().then(result => {
const commands = KeybindingsRegistry.getCommands();
for (let id in commands) {
let {description} = commands[id];
if (description) {
result[id] = description;
}
}
return result;
});
}
}
@@ -195,7 +160,18 @@ export class MainThreadCommands {
KeybindingsRegistry.registerCommandDesc({
id: '_generateCommandsDocumentation',
handler: function(accessor) {
return accessor.get(IThreadService).getRemotable(MainThreadCommands).$getCommandHandlerDescriptions().then(result => {
return accessor.get(IThreadService).getRemotable(ExtHostCommands).$getContributedCommandHandlerDescriptions().then(result => {
// add local commands
const commands = KeybindingsRegistry.getCommands();
for (let id in commands) {
let {description} = commands[id];
if (description) {
result[id] = description;
}
}
// print all as markdown
const all: string[] = [];
for (let id in result) {
all.push('`' + id + '` - ' + _generateMarkdown(result[id]));
@@ -225,4 +201,4 @@ function _generateMarkdown(description: string | ICommandHandlerDescription): st
parts.push('\n\n');
return parts.join('');
}
}
}