Skip to content

sessions - hide some menu and commands that do not apply #307172

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
bpasero merged 2 commits into from
Apr 1, 2026
Merged

sessions - hide some menu and commands that do not apply #307172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33bfb0b
sessions - hide some menu and commands that do not apply
bpasero Apr 1, 2026
c008a7f
sessions - add precondition to OpenRecentAction to hide from Command …
Copilot Apr 1, 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
9 changes: 6 additions & 3 deletions src/vs/workbench/browser/actions/helpActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { KeybindingWeight } from '../../../platform/keybinding/common/keybinding
import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
import { ICommandService } from '../../../platform/commands/common/commands.js';
import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
import { IsSessionsWindowContext } from '../../common/contextkeys.js';

class KeybindingsReferenceAction extends Action2 {

Expand Down Expand Up @@ -319,10 +320,12 @@ class GetStartedWithAccessibilityFeatures extends Action2 {
title: localize2('getStartedWithAccessibilityFeatures', 'Get Started with Accessibility Features'),
category: Categories.Help,
f1: true,
precondition: IsSessionsWindowContext.negate(),
menu: {
id: MenuId.MenubarHelpMenu,
group: '1_welcome',
order: 6
order: 6,
when: IsSessionsWindowContext.negate()
}
});
}
Expand All @@ -341,7 +344,7 @@ class AskVSCodeCopilot extends Action2 {
title: localize2('askVScode', 'Ask @vscode'),
category: Categories.Help,
f1: true,
precondition: ContextKeyExpr.equals('chatSetupHidden', false)
precondition: ContextKeyExpr.and(ContextKeyExpr.equals('chatSetupHidden', false), IsSessionsWindowContext.negate())
});
}

Expand All @@ -359,7 +362,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
},
order: 7,
group: '1_welcome',
when: ContextKeyExpr.equals('chatSetupHidden', false)
when: ContextKeyExpr.and(ContextKeyExpr.equals('chatSetupHidden', false), IsSessionsWindowContext.negate())
});

// --- Actions Registration
Expand Down
34 changes: 20 additions & 14 deletions src/vs/workbench/browser/actions/layoutActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { IPaneCompositePartService } from '../../services/panecomposite/browser/
import { ToggleAuxiliaryBarAction } from '../parts/auxiliarybar/auxiliaryBarActions.js';
import { TogglePanelAction } from '../parts/panel/panelActions.js';
import { ICommandService } from '../../../platform/commands/common/commands.js';
import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelVisibleContext, SideBarVisibleContext, FocusedViewContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, IsMainWindowFullscreenContext, PanelPositionContext, IsAuxiliaryWindowFocusedContext, TitleBarStyleContext, IsAuxiliaryWindowContext } from '../../common/contextkeys.js';
import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelVisibleContext, SideBarVisibleContext, FocusedViewContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, IsMainWindowFullscreenContext, PanelPositionContext, IsAuxiliaryWindowFocusedContext, IsSessionsWindowContext, TitleBarStyleContext, IsAuxiliaryWindowContext } from '../../common/contextkeys.js';
import { Codicon } from '../../../base/common/codicons.js';
import { ThemeIcon } from '../../../base/common/themables.js';
import { DisposableStore } from '../../../base/common/lifecycle.js';
Expand Down Expand Up @@ -151,7 +151,8 @@ export class ToggleSidebarPositionAction extends Action2 {
id: ToggleSidebarPositionAction.ID,
title: localize2('toggleSidebarPosition', "Toggle Primary Side Bar Position"),
category: Categories.View,
f1: true
f1: true,
precondition: IsSessionsWindowContext.negate()
});
}

Expand Down Expand Up @@ -233,7 +234,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
id: ToggleSidebarPositionAction.ID,
title: localize({ key: 'miMoveSidebarRight', comment: ['&& denotes a mnemonic'] }, "&&Move Primary Side Bar Right")
},
when: ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'),
when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), IsSessionsWindowContext.negate()),
order: 2
});

Expand All @@ -243,7 +244,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
id: ToggleSidebarPositionAction.ID,
title: localize({ key: 'miMoveSidebarLeft', comment: ['&& denotes a mnemonic'] }, "&&Move Primary Side Bar Left")
},
when: ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'),
when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), IsSessionsWindowContext.negate()),
order: 2
});

Expand Down Expand Up @@ -404,11 +405,13 @@ export class ToggleStatusbarVisibilityAction extends Action2 {
},
category: Categories.View,
f1: true,
precondition: IsSessionsWindowContext.negate(),
toggled: ContextKeyExpr.equals('config.workbench.statusBar.visible', true),
menu: [{
id: MenuId.MenubarAppearanceMenu,
group: '2_workbench_layout',
order: 3
order: 3,
when: IsSessionsWindowContext.negate()
}]
});
}
Expand All @@ -435,7 +438,7 @@ abstract class AbstractSetShowTabsAction extends Action2 {
id,
title,
category: Categories.View,
precondition,
precondition: ContextKeyExpr.and(precondition, IsSessionsWindowContext.negate()),
metadata: description ? { description } : undefined,
f1: true
});
Expand Down Expand Up @@ -537,15 +540,15 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
title: localize('tabBar', "Tab Bar"),
group: '3_workbench_layout_move',
order: 10,
when: InEditorZenModeContext.negate()
when: ContextKeyExpr.and(InEditorZenModeContext.negate(), IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
submenu: MenuId.EditorTabsBarShowTabsZenModeSubmenu,
title: localize('tabBar', "Tab Bar"),
group: '3_workbench_layout_move',
order: 10,
when: InEditorZenModeContext
when: ContextKeyExpr.and(InEditorZenModeContext, IsSessionsWindowContext.negate())
});

// --- Show Editor Actions in Title Bar
Expand All @@ -559,7 +562,7 @@ export class EditorActionsTitleBarAction extends Action2 {
id: EditorActionsTitleBarAction.ID,
title: localize2('moveEditorActionsToTitleBar', "Move Editor Actions to Title Bar"),
category: Categories.View,
precondition: ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.TITLEBAR).negate(),
precondition: ContextKeyExpr.and(ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.TITLEBAR).negate(), IsSessionsWindowContext.negate()),
metadata: { description: localize2('moveEditorActionsToTitleBarDescription', "Move Editor Actions from the tab bar to the title bar") },
f1: true
});
Expand All @@ -586,6 +589,7 @@ export class EditorActionsDefaultAction extends Action2 {
precondition: ContextKeyExpr.and(
ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.DEFAULT).negate(),
ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_TABS_MODE}`, EditorTabsMode.NONE).negate(),
IsSessionsWindowContext.negate(),
),
metadata: { description: localize2('moveEditorActionsToTabBarDescription', "Move Editor Actions from the title bar to the tab bar") },
f1: true
Expand All @@ -610,7 +614,7 @@ export class HideEditorActionsAction extends Action2 {
id: HideEditorActionsAction.ID,
title: localize2('hideEditorActons', "Hide Editor Actions"),
category: Categories.View,
precondition: ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.HIDDEN).negate(),
precondition: ContextKeyExpr.and(ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.HIDDEN).negate(), IsSessionsWindowContext.negate()),
metadata: { description: localize2('hideEditorActonsDescription', "Hide Editor Actions in the tab and title bar") },
f1: true
});
Expand All @@ -634,7 +638,7 @@ export class ShowEditorActionsAction extends Action2 {
id: ShowEditorActionsAction.ID,
title: localize2('showEditorActons', "Show Editor Actions"),
category: Categories.View,
precondition: ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.HIDDEN),
precondition: ContextKeyExpr.and(ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`, EditorActionsLocation.HIDDEN), IsSessionsWindowContext.negate()),
metadata: { description: localize2('showEditorActonsDescription', "Make Editor Actions visible.") },
f1: true
});
Expand All @@ -653,7 +657,8 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
submenu: MenuId.EditorActionsPositionSubmenu,
title: localize('editorActionsPosition', "Editor Actions Position"),
group: '3_workbench_layout_move',
order: 11
order: 11,
when: IsSessionsWindowContext.negate()
});

// --- Configure Tabs Layout
Expand Down Expand Up @@ -734,7 +739,7 @@ registerAction2(class extends Action2 {
...localize2('toggleZenMode', "Toggle Zen Mode"),
mnemonicTitle: localize({ key: 'miToggleZenMode', comment: ['&& denotes a mnemonic'] }, "Zen Mode"),
},
precondition: IsAuxiliaryWindowFocusedContext.toNegated(),
precondition: ContextKeyExpr.and(IsAuxiliaryWindowFocusedContext.toNegated(), IsSessionsWindowContext.negate()),
category: Categories.View,
f1: true,
keybinding: {
Expand All @@ -745,7 +750,8 @@ registerAction2(class extends Action2 {
menu: [{
id: MenuId.MenubarAppearanceMenu,
group: '1_toggle_view',
order: 2
order: 2,
when: IsSessionsWindowContext.negate()
}]
});
}
Expand Down
10 changes: 7 additions & 3 deletions src/vs/workbench/browser/actions/windowActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { IWindowOpenable } from '../../../platform/window/common/window.js';
import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
import { MenuRegistry, MenuId, Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
import { KeyChord, KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
import { IsMainWindowFullscreenContext } from '../../common/contextkeys.js';
import { IsMainWindowFullscreenContext, IsSessionsWindowContext } from '../../common/contextkeys.js';
import { IsMacNativeContext, IsDevelopmentContext, IsWebContext, IsIOSContext } from '../../../platform/contextkey/common/contextkeys.js';
import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
import { KeybindingsRegistry, KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
Expand Down Expand Up @@ -290,6 +290,7 @@ export class OpenRecentAction extends BaseOpenRecentAction {
},
category: Categories.File,
f1: true,
precondition: IsSessionsWindowContext.negate(),
keybinding: {
weight: KeybindingWeight.WorkbenchContrib,
primary: KeyMod.CtrlCmd | KeyCode.KeyR,
Expand Down Expand Up @@ -421,6 +422,7 @@ class NewWindowAction extends Action2 {
mnemonicTitle: localize({ key: 'miNewWindow', comment: ['&& denotes a mnemonic'] }, "New &&Window"),
},
f1: true,
precondition: IsSessionsWindowContext.negate(),
keybinding: {
weight: KeybindingWeight.WorkbenchContrib,
primary: isWeb ? (isWindows ? KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.Shift | KeyCode.KeyN) : KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyN) : KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyN,
Expand All @@ -429,7 +431,8 @@ class NewWindowAction extends Action2 {
menu: {
id: MenuId.MenubarFileMenu,
group: '1_new',
order: 3
order: 3,
when: IsSessionsWindowContext.negate()
}
});
}
Expand Down Expand Up @@ -516,5 +519,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miOpenRecent', comment: ['&& denotes a mnemonic'] }, "Open &&Recent"),
submenu: MenuId.MenubarRecentMenu,
group: '2_open',
order: 4
order: 4,
when: IsSessionsWindowContext.negate()
});
36 changes: 18 additions & 18 deletions src/vs/workbench/browser/actions/workspaceActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { ICommandService } from '../../../platform/commands/common/commands.js';
import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID, SET_ROOT_FOLDER_COMMAND_ID } from './workspaceCommands.js';
import { IFileDialogService } from '../../../platform/dialogs/common/dialogs.js';
import { MenuRegistry, MenuId, Action2, registerAction2 } from '../../../platform/actions/common/actions.js';
import { EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, OpenFolderWorkspaceSupportContext, WorkbenchStateContext, WorkspaceFolderCountContext } from '../../common/contextkeys.js';
import { EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext, OpenFolderWorkspaceSupportContext, WorkbenchStateContext, WorkspaceFolderCountContext } from '../../common/contextkeys.js';
import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
import { IHostService } from '../../services/host/browser/host.js';
import { KeyChord, KeyCode, KeyMod } from '../../../base/common/keyCodes.js';
Expand Down Expand Up @@ -61,7 +61,7 @@ export class OpenFolderAction extends Action2 {
title: localize2('openFolder', 'Open Folder...'),
category: Categories.File,
f1: true,
precondition: OpenFolderWorkspaceSupportContext,
precondition: ContextKeyExpr.and(OpenFolderWorkspaceSupportContext, IsSessionsWindowContext.negate()),
keybinding: {
weight: KeybindingWeight.WorkbenchContrib,
primary: undefined,
Expand Down Expand Up @@ -97,7 +97,7 @@ export class OpenFolderViaWorkspaceAction extends Action2 {
title: localize2('openFolder', 'Open Folder...'),
category: Categories.File,
f1: true,
precondition: ContextKeyExpr.and(OpenFolderWorkspaceSupportContext.toNegated(), WorkbenchStateContext.isEqualTo('workspace')),
precondition: ContextKeyExpr.and(OpenFolderWorkspaceSupportContext.toNegated(), WorkbenchStateContext.isEqualTo('workspace'), IsSessionsWindowContext.negate()),
keybinding: {
weight: KeybindingWeight.WorkbenchContrib,
primary: KeyMod.CtrlCmd | KeyCode.KeyO
Expand All @@ -123,7 +123,7 @@ export class OpenFileFolderAction extends Action2 {
title: OpenFileFolderAction.LABEL,
category: Categories.File,
f1: true,
precondition: ContextKeyExpr.and(IsMacNativeContext, OpenFolderWorkspaceSupportContext),
precondition: ContextKeyExpr.and(IsMacNativeContext, OpenFolderWorkspaceSupportContext, IsSessionsWindowContext.negate()),
keybinding: {
weight: KeybindingWeight.WorkbenchContrib,
primary: KeyMod.CtrlCmd | KeyCode.KeyO
Expand All @@ -148,7 +148,7 @@ class OpenWorkspaceAction extends Action2 {
title: localize2('openWorkspaceAction', 'Open Workspace from File...'),
category: Categories.File,
f1: true,
precondition: EnterMultiRootWorkspaceSupportContext
precondition: ContextKeyExpr.and(EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext.negate())
});
}

Expand All @@ -169,7 +169,7 @@ class CloseWorkspaceAction extends Action2 {
title: localize2('closeWorkspace', 'Close Workspace'),
category: workspacesCategory,
f1: true,
precondition: ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('empty'), EmptyWorkspaceSupportContext),
precondition: ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('empty'), EmptyWorkspaceSupportContext, IsSessionsWindowContext.negate()),
keybinding: {
weight: KeybindingWeight.WorkbenchContrib,
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyF)
Expand Down Expand Up @@ -220,7 +220,7 @@ export class AddRootFolderAction extends Action2 {
title: ADD_ROOT_FOLDER_LABEL,
category: workspacesCategory,
f1: true,
precondition: ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext.isEqualTo('workspace'))
precondition: ContextKeyExpr.and(ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext.isEqualTo('workspace')), IsSessionsWindowContext.negate())
});
}

Expand Down Expand Up @@ -266,7 +266,7 @@ class SaveWorkspaceAsAction extends Action2 {
title: localize2('saveWorkspaceAsAction', 'Save Workspace As...'),
category: workspacesCategory,
f1: true,
precondition: EnterMultiRootWorkspaceSupportContext
precondition: ContextKeyExpr.and(EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext.negate())
});
}

Expand Down Expand Up @@ -299,7 +299,7 @@ class DuplicateWorkspaceInNewWindowAction extends Action2 {
title: localize2('duplicateWorkspaceInNewWindow', 'Duplicate As Workspace in New Window'),
category: workspacesCategory,
f1: true,
precondition: EnterMultiRootWorkspaceSupportContext
precondition: ContextKeyExpr.and(EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext.negate())
});
}

Expand Down Expand Up @@ -353,7 +353,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miOpenFolder', comment: ['&& denotes a mnemonic'] }, "Open &&Folder...")
},
order: 2,
when: OpenFolderWorkspaceSupportContext
when: ContextKeyExpr.and(OpenFolderWorkspaceSupportContext, IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -363,7 +363,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miOpenFolder', comment: ['&& denotes a mnemonic'] }, "Open &&Folder...")
},
order: 2,
when: ContextKeyExpr.and(OpenFolderWorkspaceSupportContext.toNegated(), WorkbenchStateContext.isEqualTo('workspace'))
when: ContextKeyExpr.and(OpenFolderWorkspaceSupportContext.toNegated(), WorkbenchStateContext.isEqualTo('workspace'), IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -373,7 +373,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miOpen', comment: ['&& denotes a mnemonic'] }, "&&Open...")
},
order: 1,
when: ContextKeyExpr.and(IsMacNativeContext, OpenFolderWorkspaceSupportContext)
when: ContextKeyExpr.and(IsMacNativeContext, OpenFolderWorkspaceSupportContext, IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -383,7 +383,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miOpenWorkspace', comment: ['&& denotes a mnemonic'] }, "Open Wor&&kspace from File...")
},
order: 3,
when: EnterMultiRootWorkspaceSupportContext
when: ContextKeyExpr.and(EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -392,7 +392,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
id: ADD_ROOT_FOLDER_COMMAND_ID,
title: localize({ key: 'miAddFolderToWorkspace', comment: ['&& denotes a mnemonic'] }, "A&&dd Folder to Workspace...")
},
when: ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext.isEqualTo('workspace')),
when: ContextKeyExpr.and(ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext.isEqualTo('workspace')), IsSessionsWindowContext.negate()),
order: 1
});

Expand All @@ -403,7 +403,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize('miSaveWorkspaceAs', "Save Workspace As...")
},
order: 2,
when: EnterMultiRootWorkspaceSupportContext
when: ContextKeyExpr.and(EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -413,7 +413,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize('duplicateWorkspace', "Duplicate Workspace")
},
order: 3,
when: EnterMultiRootWorkspaceSupportContext
when: ContextKeyExpr.and(EnterMultiRootWorkspaceSupportContext, IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -423,7 +423,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miCloseFolder', comment: ['&& denotes a mnemonic'] }, "Close &&Folder")
},
order: 3,
when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), EmptyWorkspaceSupportContext)
when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), EmptyWorkspaceSupportContext, IsSessionsWindowContext.negate())
});

MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
Expand All @@ -433,5 +433,5 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
title: localize({ key: 'miCloseWorkspace', comment: ['&& denotes a mnemonic'] }, "Close &&Workspace")
},
order: 3,
when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), EmptyWorkspaceSupportContext)
when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), EmptyWorkspaceSupportContext, IsSessionsWindowContext.negate())
});
Loading
Loading