Merge branch 'master' into fix/33739

This commit is contained in:
Joao Moreno
2017-11-08 12:27:48 +01:00
3205 changed files with 96382 additions and 57964 deletions

View File

@@ -195,15 +195,6 @@ export class ExtHostApiCommands {
]
});
this._register('vscode.startDebug', (configuration?: any, folderUri?: URI) => {
return this._commands.executeCommand('_workbench.startDebug', configuration, folderUri);
}, {
description: 'Start a debugging session.',
args: [
{ name: 'configuration', description: '(optional) Name of the debug configuration from \'launch.json\' to use. Or a configuration json object to use.' }
]
});
this._register('vscode.diff', (left: URI, right: URI, label: string, options?: vscode.TextDocumentShowOptions) => {
return this._commands.executeCommand('_workbench.diff', [
left, right,