Merge branch 'joh/editors'

This commit is contained in:
Johannes Rieken
2017-03-06 12:40:47 +01:00
parent 1645d0d150
commit 1239cebb70
22 changed files with 1310 additions and 997 deletions

View File

@@ -8,7 +8,7 @@ import { IThreadService } from 'vs/workbench/services/thread/common/threadServic
import { validateConstraint } from 'vs/base/common/types';
import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
import { TPromise } from 'vs/base/common/winjs.base';
import { ExtHostEditors } from 'vs/workbench/api/node/extHostEditors';
import { ExtHostEditors } from 'vs/workbench/api/node/extHostTextEditors';
import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
import * as extHostTypeConverter from 'vs/workbench/api/node/extHostTypeConverters';
import { cloneAndChange } from 'vs/base/common/objects';
@@ -102,7 +102,7 @@ export class ExtHostCommands extends ExtHostCommandsShape {
return TPromise.wrapError<T>(`Contributed command '${id}' does not exist.`);
}
let {callback, thisArg, description} = command;
let { callback, thisArg, description } = command;
if (description) {
for (let i = 0; i < description.args.length; i++) {
@@ -140,7 +140,7 @@ export class ExtHostCommands extends ExtHostCommandsShape {
$getContributedCommandHandlerDescriptions(): TPromise<{ [id: string]: string | ICommandHandlerDescription }> {
const result: { [id: string]: string | ICommandHandlerDescription } = Object.create(null);
this._commands.forEach((command, id) => {
let {description} = command;
let { description } = command;
if (description) {
result[id] = description;
}