Skip to content

feat: Support switching to the main window.#306573

Merged
bpasero merged 2 commits intomicrosoft:mainfrom
matts1:switch-main
Apr 14, 2026
Merged

feat: Support switching to the main window.#306573
bpasero merged 2 commits intomicrosoft:mainfrom
matts1:switch-main

Conversation

@matts1
Copy link
Copy Markdown
Contributor

@matts1 matts1 commented Mar 31, 2026

From an auxilary window, there is currently no way to switch back to the main window.

This particularly an issue when you have a floating terminal window, as there is no key binding that can easily take you back to the correct split of the main editor (there is no active editor group, so "focus active editor group" doesn't work).

To test the changes:

  1. Compile & open vscode
  2. control shift p -> new terminal window
  3. Create a split in the main window and focus the left
  4. (from the main window) control shift p -> Switch to main window should not appear
  5. (from the terminal window) control shift p -> switch to main window should switch the focus back to the left split of the main window
  6. Repeat the process with the right split

Fixes #306571

@vs-code-engineering
Copy link
Copy Markdown
Contributor

vs-code-engineering Bot commented Mar 31, 2026

📬 CODENOTIFY

The following users are being notified based on files changed in this PR:

@dmitrivMS

Matched files:

  • test/sanity/scripts/run-docker.cmd
  • test/sanity/scripts/run-win32.cmd

@matts1
Copy link
Copy Markdown
Contributor Author

matts1 commented Mar 31, 2026

@microsoft-github-policy-service agree company="Google"

Copy link
Copy Markdown
Member

@bpasero bpasero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be easier to just use the global mainWindow with its window ID?

bpasero
bpasero previously approved these changes Apr 2, 2026
Copy link
Copy Markdown
Member

@bpasero bpasero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@bpasero
Copy link
Copy Markdown
Member

bpasero commented Apr 2, 2026

Looks like there are conflicts now.

alexr00
alexr00 previously approved these changes Apr 2, 2026
@bpasero
Copy link
Copy Markdown
Member

bpasero commented Apr 2, 2026

@copilot resolve the merge conflicts in this pull request

From an auxilary window, there is currently no way to switch back to the main window.

This is particularly an issue when you have a floating terminal window, as there is no key binding that can easily take you back to the correct split of the main editor (there is no active editor group, so "focus active editor group" doesn't work).
@matts1 matts1 dismissed stale reviews from alexr00 and bpasero via f26430d April 6, 2026 23:46
@matts1 matts1 requested a review from bpasero April 6, 2026 23:47
@matts1
Copy link
Copy Markdown
Contributor Author

matts1 commented Apr 6, 2026

It didn't look like copilot was doing anything, so I rebased manually and pushed

@matts1 matts1 requested a review from alexr00 April 9, 2026 03:33
@bpasero bpasero enabled auto-merge (squash) April 14, 2026 12:14
@bpasero bpasero added this to the 1.117.0 milestone Apr 14, 2026
@bpasero bpasero merged commit a8e8b8a into microsoft:main Apr 14, 2026
26 checks passed
@matts1 matts1 deleted the switch-main branch April 15, 2026 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add a mechanism to switch to the main window from auxilary windows

4 participants