Skip to content

Fix terminal creation in auxiliary windows when using Ctrl+Shift+` #259001

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

Merged
Tyriar merged 4 commits into from
Aug 4, 2025
Merged

Fix terminal creation in auxiliary windows when using Ctrl+Shift+` #259001

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb527b0
Initial plan
Copilot Jul 31, 2025
9290de6
Fix terminal creation in auxiliary windows - detect and use current w…
Copilot Jul 31, 2025
499de12
Merge branch 'main' into copilot/fix-259000
Tyriar Aug 3, 2025
02f9041
Fix is auxiliary window call
Tyriar Aug 3, 2025
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
8 changes: 7 additions & 1 deletion src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { isKeyboardEvent, isMouseEvent, isPointerEvent } from '../../../../base/browser/dom.js';
import { isKeyboardEvent, isMouseEvent, isPointerEvent, getActiveWindow } from '../../../../base/browser/dom.js';
import { Action } from '../../../../base/common/actions.js';
import { CancellationToken } from '../../../../base/common/cancellation.js';
import { Codicon } from '../../../../base/common/codicons.js';
Expand Down Expand Up @@ -56,6 +56,7 @@ import { IRemoteTerminalAttachTarget, ITerminalProfileResolverService, ITerminal
import { TerminalContextKeys } from '../common/terminalContextKey.js';
import { terminalStrings } from '../common/terminalStrings.js';
import { Direction, ICreateTerminalOptions, IDetachedTerminalInstance, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService, IXtermTerminal } from './terminal.js';
import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
import { InstanceContext } from './terminalContextMenu.js';
import { getColorClass, getIconId, getUriClasses } from './terminalIcon.js';
import { killTerminalIcon, newTerminalIcon } from './terminalIcons.js';
Expand Down Expand Up @@ -1180,6 +1181,7 @@ export function registerTerminalActions() {
let eventOrOptions = isObject(args) ? args as MouseEvent | ICreateTerminalOptions : undefined;
const workspaceContextService = accessor.get(IWorkspaceContextService);
const commandService = accessor.get(ICommandService);
const editorGroupsService = accessor.get(IEditorGroupsService);
const folders = workspaceContextService.getWorkspace().folders;
if (eventOrOptions && isMouseEvent(eventOrOptions) && (eventOrOptions.altKey || eventOrOptions.ctrlKey)) {
await c.service.createTerminal({ location: { splitActiveTerminal: true } });
Expand All @@ -1189,6 +1191,10 @@ export function registerTerminalActions() {
if (c.service.isProcessSupportRegistered) {
eventOrOptions = !eventOrOptions || isMouseEvent(eventOrOptions) ? {} : eventOrOptions;

if (isAuxiliaryWindow(getActiveWindow()) && !eventOrOptions.location) {
eventOrOptions.location = { viewColumn: editorGroupToColumn(editorGroupsService, editorGroupsService.activeGroup) };
}

let instance: ITerminalInstance | undefined;
if (folders.length <= 1) {
// Allow terminal service to handle the path when there is only a
Expand Down
Loading