Make extension respect the window.openFoldersInNewWindow setting. Fixes microsoft#85851

aeschli · aeschli · commit 3295e51f222b · 2019-11-30T13:41:40.000+01:00
diff --git a/src/vs/platform/electron/electron-main/electronMainService.ts b/src/vs/platform/electron/electron-main/electronMainService.ts
@@ -99,6 +99,7 @@ export class ElectronMainService implements IElectronMainService {
 				cli: this.environmentService.args,
 				forceNewWindow: options.forceNewWindow,
 				forceReuseWindow: options.forceReuseWindow,
+				preferNewWindow: options.preferNewWindow,
 				diffMode: options.diffMode,
 				addMode: options.addMode,
 				gotoLineMode: options.gotoLineMode,
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
@@ -25,6 +25,7 @@ export interface IBaseOpenWindowsOptions {
 
 export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {
 	forceNewWindow?: boolean;
+	preferNewWindow?: boolean;
 
 	noRecentEntry?: boolean;
 }
diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -101,9 +101,6 @@ export class CLIServer {
 			for (const s of folderURIs) {
 				try {
 					urisToOpen.push({ folderUri: URI.parse(s) });
-					if (!addMode && !forceReuseWindow) {
-						forceNewWindow = true;
-					}
 				} catch (e) {
 					// ignore
 				}
@@ -114,9 +111,6 @@ export class CLIServer {
 				try {
 					if (hasWorkspaceFileExtension(s)) {
 						urisToOpen.push({ workspaceUri: URI.parse(s) });
-						if (!forceReuseWindow) {
-							forceNewWindow = true;
-						}
 					} else {
 						urisToOpen.push({ fileUri: URI.parse(s) });
 					}
@@ -127,7 +121,8 @@ export class CLIServer {
 		}
 		if (urisToOpen.length) {
 			const waitMarkerFileURI = waitMarkerFilePath ? URI.file(waitMarkerFilePath) : undefined;
-			const windowOpenArgs: INativeOpenWindowOptions = { forceNewWindow, diffMode, addMode, gotoLineMode, forceReuseWindow, waitMarkerFileURI };
+			const preferNewWindow = !forceReuseWindow && !waitMarkerFileURI && !addMode;
+			const windowOpenArgs: INativeOpenWindowOptions = { forceNewWindow, diffMode, addMode, gotoLineMode, forceReuseWindow, preferNewWindow, waitMarkerFileURI };
 			this._commands.executeCommand('_files.windowOpen', urisToOpen, windowOpenArgs);
 		}
 		res.writeHead(200);
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -146,7 +146,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 		const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
 		const openFolderInNewWindowConfig = windowConfig?.openFoldersInNewWindow || 'default' /* default */;
 
-		let openFolderInNewWindow = !!options.forceNewWindow && !options.forceReuseWindow;
+		let openFolderInNewWindow = (options.preferNewWindow || !!options.forceNewWindow) && !options.forceReuseWindow;
 		if (!options.forceNewWindow && !options.forceReuseWindow && (openFolderInNewWindowConfig === 'on' || openFolderInNewWindowConfig === 'off')) {
 			openFolderInNewWindow = (openFolderInNewWindowConfig === 'on');
 		}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ export interface IBaseOpenWindowsOptions {`
`25`	`25`
`26`	`26`	`export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {`
`27`	`27`	`forceNewWindow?: boolean;`
	`28`	`+ preferNewWindow?: boolean;`
`28`	`29`
`29`	`30`	`noRecentEntry?: boolean;`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ export class BrowserHostService extends Disposable implements IHostService {`
`146`	`146`	`const windowConfig = this.configurationService.getValue<IWindowSettings>('window');`
`147`	`147`	`const openFolderInNewWindowConfig = windowConfig?.openFoldersInNewWindow \|\| 'default' /* default */;`
`148`	`148`
`149`		`- let openFolderInNewWindow = !!options.forceNewWindow && !options.forceReuseWindow;`
	`149`	`+ let openFolderInNewWindow = (options.preferNewWindow \|\| !!options.forceNewWindow) && !options.forceReuseWindow;`
`150`	`150`	`if (!options.forceNewWindow && !options.forceReuseWindow && (openFolderInNewWindowConfig === 'on' \|\| openFolderInNewWindowConfig === 'off')) {`
`151`	`151`	`openFolderInNewWindow = (openFolderInNewWindowConfig === 'on');`
`152`	`152`	`}`