Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd (#5074)

* Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd

* fix tests
This commit is contained in:
Anthony Dresser
2019-04-16 22:11:30 -07:00
committed by GitHub
parent 2f8519cb6b
commit 8956b591f7
217 changed files with 5120 additions and 3926 deletions

View File

@@ -1580,8 +1580,8 @@ export class WindowsManager implements IWindowsMainService {
if (cli && (cli.remote !== remote)) {
cli = { ...cli, remote };
}
const forceNewWindow = !(options && options.reuseWindow);
return this.open({ context, cli, forceNewWindow, forceEmpty: true });
const forceReuseWindow = options && options.reuseWindow;
return this.open({ context, cli, forceEmpty: true, forceReuseWindow });
}
openNewTabbedWindow(context: OpenContext): ICodeWindow[] {