Closing aux window focuses wrong "main" window (fix microsoft#199372) (microsoft#199527)

* Closing aux window focuses wrong "main" window (fix microsoft#199372)

* .

Author: bpasero

src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts

@@ -19,7 +19,7 @@ import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { IAuxiliaryTitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
 import { WindowTitle } from 'vs/workbench/browser/parts/titlebar/windowTitle';
 import { IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-import { IAuxiliaryEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { GroupsOrder, IAuxiliaryEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
@@ -180,12 +180,12 @@ class AuxiliaryEditorPartImpl extends EditorPart implements IAuxiliaryEditorPart
 		super(editorPartsView, `workbench.parts.auxiliaryEditor.${id}`, groupsLabel, true, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
 	}
 
-	override removeGroup(group: number | IEditorGroupView, preserveFocus?: boolean | undefined): void {
+	override removeGroup(group: number | IEditorGroupView, preserveFocus?: boolean): void {
 
 		// Close aux window when last group removed
 		const groupView = this.assertGroupView(group);
 		if (this.count === 1 && this.activeGroup === groupView) {
-			this.doClose(false /* do not merge any groups to main part */);
+			this.doRemoveLastGroup(preserveFocus);
 		}
 
 		// Otherwise delegate to parent implementation
@@ -194,6 +194,23 @@ class AuxiliaryEditorPartImpl extends EditorPart implements IAuxiliaryEditorPart
 		}
 	}
 
+	private doRemoveLastGroup(preserveFocus?: boolean): void {
+		const restoreFocus = !preserveFocus && this.shouldRestoreFocus(this.container);
+
+		// Activate next group
+		const mostRecentlyActiveGroups = this.editorPartsView.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
+		const nextActiveGroup = mostRecentlyActiveGroups[1]; // [0] will be the current group we are about to dispose
+		if (nextActiveGroup) {
+			nextActiveGroup.groupsView.activateGroup(nextActiveGroup);
+
+			if (restoreFocus) {
+				nextActiveGroup.focus();
+			}
+		}
+
+		this.doClose(false /* do not merge any groups to main part */);
+	}
+
 	protected override saveState(): void {
 		return; // TODO support auxiliary editor state
 	}

src/vs/workbench/browser/parts/editor/editor.ts

@@ -181,6 +181,7 @@ export interface IEditorPartsView {
 	readonly activeGroup: IEditorGroupView;
 	readonly groups: IEditorGroupView[];
 	getGroup(identifier: GroupIdentifier): IEditorGroupView | undefined;
+	getGroups(order?: GroupsOrder): IEditorGroupView[];
 
 	readonly count: number;
 

src/vs/workbench/browser/parts/editor/editorPart.ts

@@ -141,7 +141,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 	private readonly groupViews = new Map<GroupIdentifier, IEditorGroupView>();
 	private mostRecentActiveGroups: GroupIdentifier[] = [];
 
-	private container: HTMLElement | undefined;
+	protected container: HTMLElement | undefined;
 
 	private scopedInstantiationService!: IInstantiationService;
 
@@ -540,7 +540,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 		return { size: serializedNode.size };
 	}
 
-	private shouldRestoreFocus(target: Element | undefined): boolean {
+	protected shouldRestoreFocus(target: Element | undefined): boolean {
 		if (!target) {
 			return false;
 		}

src/vs/workbench/electron-sandbox/window.ts

@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
 import { URI } from 'vs/base/common/uri';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { equals } from 'vs/base/common/objects';
-import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, getActiveWindow, hasWindow, getWindow, getWindowById } from 'vs/base/browser/dom';
+import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, getActiveWindow, hasWindow, getWindow, getWindowById, getWindowId } from 'vs/base/browser/dom';
 import { Separator, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
@@ -706,7 +706,7 @@ export class NativeWindow extends BaseWindow {
 			originalWindowFocus();
 
 			if (getActiveWindow() !== mainWindow) {
-				that.nativeHostService.focusWindow({ targetWindowId: that.nativeHostService.windowId });
+				that.nativeHostService.focusWindow({ targetWindowId: getWindowId(mainWindow) });
 			}
 		};
 	}

src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts

@@ -14,7 +14,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { NativeHostService } from 'vs/platform/native/common/nativeHostService';
 import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { disposableWindowInterval, getActiveDocument, getWindowsCount, hasWindow, onDidRegisterWindow } from 'vs/base/browser/dom';
+import { disposableWindowInterval, getActiveDocument, getWindowId, getWindowsCount, hasWindow, onDidRegisterWindow } from 'vs/base/browser/dom';
 import { memoize } from 'vs/base/common/decorators';
 import { isAuxiliaryWindow } from 'vs/base/browser/window';
 
@@ -164,7 +164,7 @@ class WorkbenchHostService extends Disposable implements IHostService {
 	focus(targetWindow: Window, options?: { force: boolean }): Promise<void> {
 		return this.nativeHostService.focusWindow({
 			force: options?.force,
-			targetWindowId: isAuxiliaryWindow(targetWindow) ? targetWindow.vscodeWindowId : this.nativeHostService.windowId
+			targetWindowId: getWindowId(targetWindow)
 		});
 	}