Fix microsoft/vscode-remote-release#1444

roblourens · roblourens · commit 70f3a0970df3 · 2019-09-20T10:55:55.000-07:00
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
@@ -1611,9 +1611,9 @@ export class WindowsManager extends Disposable implements IWindowsMainService {
 		return getLastActiveWindow(WindowsManager.WINDOWS.filter(window => window.remoteAuthority === remoteAuthority));
 	}
 
-	openEmptyWindow(context: OpenContext, options?: { reuse?: boolean }): ICodeWindow[] {
+	openEmptyWindow(context: OpenContext, options?: { reuse?: boolean, remoteAuthority?: string }): ICodeWindow[] {
 		let cli = this.environmentService.args;
-		const remote = undefined;
+		const remote = options && options.remoteAuthority;
 		if (cli && (cli.remote !== remote)) {
 			cli = { ...cli, remote };
 		}
diff --git a/src/vs/platform/electron/electron-main/electronMainService.ts b/src/vs/platform/electron/electron-main/electronMainService.ts
@@ -25,7 +25,7 @@ export class ElectronMainService {
 		return this.windowsMainService.getWindowCount();
 	}
 
-	async openEmptyWindow(windowId: number, options?: { reuse?: boolean }): Promise<void> {
+	async openEmptyWindow(windowId: number, options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> {
 		this.windowsMainService.openEmptyWindow(OpenContext.API, options);
 	}
 
diff --git a/src/vs/platform/electron/node/electron.ts b/src/vs/platform/electron/node/electron.ts
@@ -15,7 +15,7 @@ export interface IElectronService {
 
 	// Window
 	windowCount(): Promise<number>;
-	openEmptyWindow(options?: { reuse?: boolean }): Promise<void>;
+	openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void>;
 	toggleFullScreen(): Promise<void>;
 
 	// Dialogs
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
@@ -108,7 +108,7 @@ export interface IWindowsMainService {
 	focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow;
 	getLastActiveWindow(): ICodeWindow | undefined;
 	waitForWindowCloseOrLoad(windowId: number): Promise<void>;
-	openEmptyWindow(context: OpenContext, options?: { reuse?: boolean }): ICodeWindow[];
+	openEmptyWindow(context: OpenContext, options?: { reuse?: boolean, remoteAuthority?: string}): ICodeWindow[];
 	openNewTabbedWindow(context: OpenContext): ICodeWindow[];
 	openExternal(url: string): Promise<boolean>;
 	sendToFocused(channel: string, ...args: any[]): void;
diff --git a/src/vs/workbench/api/common/apiCommands.ts b/src/vs/workbench/api/common/apiCommands.ts
@@ -70,12 +70,16 @@ CommandsRegistry.registerCommand({
 
 interface INewWindowAPICommandOptions {
 	reuseWindow?: boolean;
+	remoteAuthority?: string;
 }
 
 export class NewWindowAPICommand {
 	public static ID = 'vscode.newWindow';
 	public static execute(executor: ICommandsExecutor, options?: INewWindowAPICommandOptions): Promise<any> {
-		return executor.executeCommand('_files.newWindow', options);
+		return executor.executeCommand('_files.newWindow', {
+			reuse: options && options.reuseWindow,
+			remoteAuthority: options && options.remoteAuthority
+		});
 	}
 }
 CommandsRegistry.registerCommand({
diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts
@@ -98,7 +98,7 @@ export const openWindowCommand = (accessor: ServicesAccessor, urisToOpen: IURITo
 	}
 };
 
-export const newWindowCommand = (accessor: ServicesAccessor, options?: { reuse?: boolean }) => {
+export const newWindowCommand = (accessor: ServicesAccessor, options?: { reuse?: boolean, remoteAuthority?: string }) => {
 	const hostService = accessor.get(IHostService);
 	hostService.openEmptyWindow(options);
 };
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -17,7 +17,7 @@ export class BrowserHostService implements IHostService {
 
 	readonly windowCount = Promise.resolve(1);
 
-	async openEmptyWindow(options?: { reuse?: boolean }): Promise<void> {
+	async openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> {
 		// TODO@Ben delegate to embedder
 		const targetHref = `${document.location.origin}${document.location.pathname}?ew=true`;
 		if (options && options.reuse) {
diff --git a/src/vs/workbench/services/host/browser/host.ts b/src/vs/workbench/services/host/browser/host.ts
@@ -22,7 +22,7 @@ export interface IHostService {
 	 * Opens an empty window. The optional parameter allows to define if
 	 * a new window should open or the existing one change to an empty.
 	 */
-	openEmptyWindow(options?: { reuse?: boolean }): Promise<void>;
+	openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void>;
 
 	toggleFullScreen(): Promise<void>;
 
diff --git a/src/vs/workbench/services/host/electron-browser/desktopHostService.ts b/src/vs/workbench/services/host/electron-browser/desktopHostService.ts
@@ -17,7 +17,7 @@ export class DesktopHostService implements IHostService {
 
 	get windowCount() { return this.electronService.windowCount(); }
 
-	openEmptyWindow(options?: { reuse?: boolean }): Promise<void> {
+	openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> {
 		return this.electronService.openEmptyWindow(options);
 	}
 
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
@@ -1520,7 +1520,7 @@ export class TestHostService implements IHostService {
 	restart(): Promise<void> { return Promise.resolve(); }
 	reload(): Promise<void> { return Promise.resolve(); }
 
-	openEmptyWindow(options?: { reuse?: boolean }): Promise<void> { return Promise.resolve(); }
+	openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> { return Promise.resolve(); }
 
 	toggleFullScreen(): Promise<void> { return Promise.resolve(); }
 }

Original file line number	Diff line number	Diff line change
`@@ -1611,9 +1611,9 @@ export class WindowsManager extends Disposable implements IWindowsMainService {`
`1611`	`1611`	`return getLastActiveWindow(WindowsManager.WINDOWS.filter(window => window.remoteAuthority === remoteAuthority));`
`1612`	`1612`	`}`
`1613`	`1613`
`1614`		`- openEmptyWindow(context: OpenContext, options?: { reuse?: boolean }): ICodeWindow[] {`
	`1614`	`+ openEmptyWindow(context: OpenContext, options?: { reuse?: boolean, remoteAuthority?: string }): ICodeWindow[] {`
`1615`	`1615`	`let cli = this.environmentService.args;`
`1616`		`- const remote = undefined;`
	`1616`	`+ const remote = options && options.remoteAuthority;`
`1617`	`1617`	`if (cli && (cli.remote !== remote)) {`
`1618`	`1618`	`cli = { ...cli, remote };`
`1619`	`1619`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class ElectronMainService {`
`25`	`25`	`return this.windowsMainService.getWindowCount();`
`26`	`26`	`}`
`27`	`27`
`28`		`- async openEmptyWindow(windowId: number, options?: { reuse?: boolean }): Promise<void> {`
	`28`	`+ async openEmptyWindow(windowId: number, options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> {`
`29`	`29`	`this.windowsMainService.openEmptyWindow(OpenContext.API, options);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,16 @@ CommandsRegistry.registerCommand({`
`70`	`70`
`71`	`71`	`interface INewWindowAPICommandOptions {`
`72`	`72`	`reuseWindow?: boolean;`
	`73`	`+ remoteAuthority?: string;`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`export class NewWindowAPICommand {`
`76`	`77`	`public static ID = 'vscode.newWindow';`
`77`	`78`	`public static execute(executor: ICommandsExecutor, options?: INewWindowAPICommandOptions): Promise<any> {`
`78`		`- return executor.executeCommand('_files.newWindow', options);`
	`79`	`+ return executor.executeCommand('_files.newWindow', {`
	`80`	`+ reuse: options && options.reuseWindow,`
	`81`	`+ remoteAuthority: options && options.remoteAuthority`
	`82`	`+ });`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`	`CommandsRegistry.registerCommand({`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export const openWindowCommand = (accessor: ServicesAccessor, urisToOpen: IURITo`
`98`	`98`	`}`
`99`	`99`	`};`
`100`	`100`
`101`		`-export const newWindowCommand = (accessor: ServicesAccessor, options?: { reuse?: boolean }) => {`
	`101`	`+export const newWindowCommand = (accessor: ServicesAccessor, options?: { reuse?: boolean, remoteAuthority?: string }) => {`
`102`	`102`	`const hostService = accessor.get(IHostService);`
`103`	`103`	`hostService.openEmptyWindow(options);`
`104`	`104`	`};`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class DesktopHostService implements IHostService {`
`17`	`17`
`18`	`18`	`get windowCount() { return this.electronService.windowCount(); }`
`19`	`19`
`20`		`- openEmptyWindow(options?: { reuse?: boolean }): Promise<void> {`
	`20`	`+ openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> {`
`21`	`21`	`return this.electronService.openEmptyWindow(options);`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -1520,7 +1520,7 @@ export class TestHostService implements IHostService {`
`1520`	`1520`	`restart(): Promise<void> { return Promise.resolve(); }`
`1521`	`1521`	`reload(): Promise<void> { return Promise.resolve(); }`
`1522`	`1522`
`1523`		`- openEmptyWindow(options?: { reuse?: boolean }): Promise<void> { return Promise.resolve(); }`
	`1523`	`+ openEmptyWindow(options?: { reuse?: boolean, remoteAuthority?: string }): Promise<void> { return Promise.resolve(); }`
`1524`	`1524`
`1525`	`1525`	`toggleFullScreen(): Promise<void> { return Promise.resolve(); }`
`1526`	`1526`	`}`