If I switch workspace, focus moves to different VS Code instance (fix microsoft#106727)

Benjamin Pasero · Benjamin Pasero · commit b9947f2a3792 · 2020-09-15T11:16:04.000+02:00
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -338,7 +338,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	}
 
 	focus(options?: { force: boolean }): void {
-		// macOS: Electron >6.x changed its behaviour to not
+		// macOS: Electron > 7.x changed its behaviour to not
 		// bring the application to the foreground when a window
 		// is focused programmatically. Only via `app.focus` and
 		// the option `steal: true` can you get the previous
diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts
@@ -73,10 +73,18 @@ export class LaunchMainService implements ILaunchMainService {
 	async start(args: NativeParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
 		this.logService.trace('Received data from other instance: ', args, userEnv);
 
-		// Since we now start to open a window, make sure the app has focus.
-		// Focussing a window will not ensure that the application itself
-		// has focus, so we use the `steal: true` hint to force focus.
-		app.focus({ steal: true });
+		// macOS: Electron > 7.x changed its behaviour to not
+		// bring the application to the foreground when a window
+		// is focused programmatically. Only via `app.focus` and
+		// the option `steal: true` can you get the previous
+		// behaviour back. The only reason to use this option is
+		// when a window is getting focused while the application
+		// is not in the foreground and since we got instructed
+		// to open a new window from another instance, we ensure
+		// that the app has focus.
+		if (isMacintosh) {
+			app.focus({ steal: true });
+		}
 
 		// Check early for open-url which is handled in URL service
 		const urlsToOpen = parseOpenUrl(args);

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`focus(options?: { force: boolean }): void {`
`341`		`- // macOS: Electron >6.x changed its behaviour to not`
	`341`	`+ // macOS: Electron > 7.x changed its behaviour to not`
`342`	`342`	`// bring the application to the foreground when a window`
`343`	`343`	// is focused programmatically. Only via `app.focus` and
`344`	`344`	// the option `steal: true` can you get the previous