Skip to content

Commit 98db55e

Browse files
committed
Fix approach for launching an terminal in aux window
1 parent fbd7565 commit 98db55e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,17 @@ export function registerTerminalActions() {
347347
registerTerminalAction({
348348
id: TerminalCommandId.NewInNewWindow,
349349
title: terminalStrings.newInNewWindow,
350-
precondition: ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.webExtensionContributedProfile),
350+
precondition: sharedWhenClause.terminalAvailable,
351351
keybinding: {
352352
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.Backquote,
353353
mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyMod.Alt | KeyCode.Backquote },
354354
weight: KeybindingWeight.WorkbenchContrib
355355
},
356356
run: async (c) => {
357357
const instance = await c.service.createTerminal({
358-
location: { viewColumn: AUX_WINDOW_GROUP }
358+
location: {
359+
viewColumn: AUX_WINDOW_GROUP,
360+
}
359361
});
360362
await instance.focusWhenReady();
361363
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
77
import { GroupIdentifier } from '../../../common/editor.js';
88
import { IEditorGroupsService, GroupsOrder, IEditorGroup, preferredSideBySideGroupDirection } from './editorGroupsService.js';
9-
import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, SIDE_GROUP, SIDE_GROUP_TYPE } from './editorService.js';
9+
import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP, SIDE_GROUP, SIDE_GROUP_TYPE } from './editorService.js';
1010

1111
/**
1212
* A way to address editor groups through a column based system
@@ -16,7 +16,7 @@ import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, SIDE_GROUP, SIDE_GROUP_TYPE } from './
1616
export type EditorGroupColumn = number;
1717

1818
export function columnToEditorGroup(editorGroupService: IEditorGroupsService, configurationService: IConfigurationService, column = ACTIVE_GROUP): GroupIdentifier | ACTIVE_GROUP_TYPE | SIDE_GROUP_TYPE {
19-
if (column === ACTIVE_GROUP || column === SIDE_GROUP) {
19+
if (column === ACTIVE_GROUP || column === SIDE_GROUP || column === AUX_WINDOW_GROUP) {
2020
return column; // return early for when column is well known
2121
}
2222

0 commit comments

Comments
 (0)