Skip to content

Route outline navigation to the source editor's group across windows #316828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −7
Draft

Route outline navigation to the source editor's group across windows #316828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05d11c6
Initial plan
Copilot May 17, 2026
419a483
Fix outline navigation to target source editor's group in multi-windo…
Copilot May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions src/vs/workbench/services/editor/browser/codeEditorService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { IResourceEditorInput } from '../../../../platform/editor/common/editor.
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
import { IWorkbenchEditorConfiguration } from '../../../common/editor.js';
import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../common/editorService.js';
import { IEditorGroup } from '../common/editorGroupsService.js';
import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
import { isEqual } from '../../../../base/common/resources.js';
Expand Down Expand Up @@ -75,6 +76,24 @@ export class CodeEditorService extends AbstractCodeEditorService {
// Open using our normal editor service
private async doOpenCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {

// Resolve the editor group that hosts the source editor (if any). When a
// navigation originates from a specific editor, we want to target that
// editor's group rather than the currently most-recently-active group.
// This matters most for auxiliary editor windows: e.g. the outline view
// in the main window can track an editor in an auxiliary window, and
// clicking an outline item must navigate within that auxiliary window
// even if focusing the outline made another (main window) group active
// in the meantime.
let sourceGroup: IEditorGroup | undefined;
if (source && !sideBySide) {
for (const visiblePane of this.editorService.visibleEditorPanes) {
if (getCodeEditor(visiblePane.getControl()) === source) {
sourceGroup = visiblePane.group;
break;
}
}
}

// Special case: we want to detect the request to open an editor that
// is different from the current one to decide whether the current editor
// should be pinned or not. This ensures that the source of a navigation
Expand All @@ -88,16 +107,11 @@ export class CodeEditorService extends AbstractCodeEditorService {
!sideBySide && // we only need to care if editor opens in same group
!isEqual(source.getModel()?.uri, input.resource) // we only need to do this if the editor is about to change
) {
for (const visiblePane of this.editorService.visibleEditorPanes) {
if (getCodeEditor(visiblePane.getControl()) === source) {
visiblePane.group.pinEditor();
break;
}
}
sourceGroup?.pinEditor();
}

// Open as editor
const control = await this.editorService.openEditor(input, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
const control = await this.editorService.openEditor(input, sideBySide ? SIDE_GROUP : (sourceGroup ?? ACTIVE_GROUP));
if (control) {
const widget = control.getControl();
if (isCodeEditor(widget)) {
Expand Down