some Some grid operations cause the activeElement to get lost (fix microsoft#189256) (microsoft#191886)

bpasero · web-flow · commit 8800b4318133 · 2023-08-31T10:41:37.000+02:00
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -2264,7 +2264,8 @@ abstract class AbstractCreateEditorGroupAction extends Action2 {
 	override async run(accessor: ServicesAccessor): Promise<void> {
 		const editorGroupService = accessor.get(IEditorGroupsService);
 
-		editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });
+		const group = editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });
+		group.focus();
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -515,21 +515,12 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 	addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, options?: IAddGroupOptions): IEditorGroupView {
 		const locationView = this.assertGroupView(location);
 
-		const restoreFocus = this.shouldRestoreFocus(locationView.element);
-
 		const group = this.doAddGroup(locationView, direction);
 
 		if (options?.activate) {
 			this.doSetGroupActive(group);
 		}
 
-		// Restore focus if we had it previously after completing the grid
-		// operation. That operation might cause reparenting of grid views
-		// which moves focus to the <body> element otherwise.
-		if (restoreFocus) {
-			locationView.focus();
-		}
-
 		return group;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2264,7 +2264,8 @@ abstract class AbstractCreateEditorGroupAction extends Action2 {`
`2264`	`2264`	`override async run(accessor: ServicesAccessor): Promise<void> {`
`2265`	`2265`	`const editorGroupService = accessor.get(IEditorGroupsService);`
`2266`	`2266`
`2267`		`- editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });`
	`2267`	`+ const group = editorGroupService.addGroup(editorGroupService.activeGroup, this.direction, { activate: true });`
	`2268`	`+ group.focus();`
`2268`	`2269`	`}`
`2269`	`2270`	`}`
`2270`	`2271`