aux window - introduce event for new aux parts

Author: bpasero

src/vs/workbench/browser/layout.ts

@@ -1241,7 +1241,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.focusPart(Parts.EDITOR_PART);
 		} else {
 			// auxiliary window
-			this.editorGroupService.getPart(activeContainer)?.activeGroup.focus();
+			this.editorGroupService.getPart(activeContainer).activeGroup.focus();
 		}
 	}
 

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

@@ -1398,6 +1398,7 @@ export class AuxiliaryEditorPart extends EditorPart implements IAuxiliaryEditorP
 	readonly onWillClose = this._onWillClose.event;
 
 	constructor(
+		readonly windowId: number,
 		editorPartsView: IEditorPartsView,
 		groupsLabel: string,
 		@IInstantiationService instantiationService: IInstantiationService,

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

@@ -40,6 +40,9 @@ export class EditorParts extends Disposable implements IEditorGroupsService, IEd
 
 	//#region Auxiliary Editor Parts
 
+	private readonly _onDidCreateAuxiliaryEditorPart = this._register(new Emitter<{ readonly part: IAuxiliaryEditorPart; readonly disposables: DisposableStore }>());
+	readonly onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
+
 	async createAuxiliaryEditorPart(options?: IAuxiliaryWindowOpenOptions): Promise<IAuxiliaryEditorPart> {
 		const disposables = new DisposableStore();
 
@@ -50,7 +53,7 @@ export class EditorParts extends Disposable implements IEditorGroupsService, IEd
 		partContainer.setAttribute('role', 'main');
 		auxiliaryWindow.container.appendChild(partContainer);
 
-		const editorPart = disposables.add(this.instantiationService.createInstance(AuxiliaryEditorPart, this, this.getGroupsLabel(this._parts.size)));
+		const editorPart = disposables.add(this.instantiationService.createInstance(AuxiliaryEditorPart, auxiliaryWindow.window.vscodeWindowId, this, this.getGroupsLabel(this._parts.size)));
 		disposables.add(this.registerEditorPart(editorPart));
 		editorPart.create(partContainer, { restorePreviousState: false });
 		disposables.add(this.instantiationService.createInstance(WindowTitle, auxiliaryWindow.window, editorPart));
@@ -72,6 +75,9 @@ export class EditorParts extends Disposable implements IEditorGroupsService, IEd
 
 		this._onDidAddGroup.fire(editorPart.activeGroup);
 
+		const eventDisposables = disposables.add(new DisposableStore());
+		this._onDidCreateAuxiliaryEditorPart.fire({ part: editorPart, disposables: eventDisposables });
+
 		return editorPart;
 	}
 

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

@@ -70,7 +70,6 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IUtilityProcessWorkerWorkbenchService } from 'vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService';
 import { registerWindowDriver } from 'vs/workbench/services/driver/electron-sandbox/driver';
-import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { mainWindow } from 'vs/base/browser/window';
 import { BaseWindow } from 'vs/workbench/browser/window';
 
@@ -125,8 +124,7 @@ export class NativeWindow extends BaseWindow {
 		@IBannerService private readonly bannerService: IBannerService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
-		@IUtilityProcessWorkerWorkbenchService private readonly utilityProcessWorkerWorkbenchService: IUtilityProcessWorkerWorkbenchService,
-		@IAuxiliaryWindowService private readonly auxiliaryWindowService: IAuxiliaryWindowService
+		@IUtilityProcessWorkerWorkbenchService private readonly utilityProcessWorkerWorkbenchService: IUtilityProcessWorkerWorkbenchService
 	) {
 		super(mainWindow);
 
@@ -364,12 +362,9 @@ export class NativeWindow extends BaseWindow {
 
 			this._register(this.mainPartEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(this.mainPartEditorService, undefined)));
 
-			this._register(this.auxiliaryWindowService.onDidOpenAuxiliaryWindow(({ window, disposables }) => {
-				const auxiliaryWindowEditorPart = this.editorGroupService.getPart(window.container);
-				if (auxiliaryWindowEditorPart) {
-					const auxiliaryEditorService = this.editorService.createScoped(auxiliaryWindowEditorPart, disposables);
-					disposables.add(auxiliaryEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(auxiliaryEditorService, window.window.vscodeWindowId)));
-				}
+			this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, disposables }) => {
+				const auxiliaryEditorService = this.editorService.createScoped(part, disposables);
+				disposables.add(auxiliaryEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(auxiliaryEditorService, part.windowId)));
 			}));
 		}
 

src/vs/workbench/services/editor/common/editorGroupsService.ts

@@ -466,6 +466,11 @@ export interface IEditorPart extends IEditorGroupsContainer {
 
 export interface IAuxiliaryEditorPart extends IEditorPart {
 
+	/**
+	 * The identifier of the window the auxiliary editor part is contained in.
+	 */
+	readonly windowId: number;
+
 	/**
 	 * Close this auxiliary editor part after moving all
 	 * editors of all groups back to the main editor part.
@@ -480,6 +485,11 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
 
 	readonly _serviceBrand: undefined;
 
+	/**
+	 * An event for when a new auxiliary editor part is created.
+	 */
+	readonly onDidCreateAuxiliaryEditorPart: Event<{ readonly part: IAuxiliaryEditorPart; readonly disposables: DisposableStore }>;
+
 	/**
 	 * Provides access to the currently active editor part.
 	 */
@@ -503,7 +513,7 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
 	/**
 	 * Get the editor part that is rooted in the provided container.
 	 */
-	getPart(container: unknown /* HTMLElement */): IEditorPart | undefined;
+	getPart(container: unknown /* HTMLElement */): IEditorPart;
 
 	/**
 	 * Opens a new window with a full editor part instantiated

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -825,6 +825,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 
 	readonly parts: readonly IEditorPart[] = [this];
 
+	onDidCreateAuxiliaryEditorPart: Event<{ readonly part: IAuxiliaryEditorPart; readonly disposables: DisposableStore }> = Event.None;
 	onDidChangeActiveGroup: Event<IEditorGroup> = Event.None;
 	onDidActivateGroup: Event<IEditorGroup> = Event.None;
 	onDidAddGroup: Event<IEditorGroup> = Event.None;
@@ -1757,6 +1758,8 @@ export class TestEditorPart extends MainEditorPart implements IEditorGroupsServi
 	readonly mainPart = this;
 	readonly parts: readonly IEditorPart[] = [this];
 
+	readonly onDidCreateAuxiliaryEditorPart: Event<{ readonly part: IAuxiliaryEditorPart; readonly disposables: DisposableStore }> = Event.None;
+
 	testSaveState(): void {
 		return super.saveState();
 	}