Merge branch 'master' into tyriar/75456_windows_term

This commit is contained in:
Daniel Imms
2019-06-18 11:00:04 -07:00
104 changed files with 1505 additions and 896 deletions

View File

@@ -507,7 +507,6 @@ export function createApiFactory(
},
createTerminal(nameOrOptions?: vscode.TerminalOptions | string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal {
if (typeof nameOrOptions === 'object') {
nameOrOptions.runInBackground = nameOrOptions.runInBackground && extension.enableProposedApi;
return extHostTerminalService.createTerminalFromOptions(nameOrOptions);
}
return extHostTerminalService.createTerminal(<string>nameOrOptions, shellPath, shellArgs);