diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts index e13331895c9d2..5f4a5db854a2d 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts @@ -28,7 +28,7 @@ export class ToggleStickyScroll extends Action2 { }, menu: [ { id: MenuId.CommandPalette }, - { id: MenuId.MenubarEditorFeaturesMenu, order: 6 }, + { id: MenuId.MenubarViewMenu, group: '5_editor', order: 2 }, { id: MenuId.StickyScrollContext } ] }); diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 85282c4d19a12..5b16e48937e47 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -82,7 +82,6 @@ export class MenuId { static readonly MenubarGoMenu = new MenuId('MenubarGoMenu'); static readonly MenubarHelpMenu = new MenuId('MenubarHelpMenu'); static readonly MenubarLayoutMenu = new MenuId('MenubarLayoutMenu'); - static readonly MenubarEditorFeaturesMenu = new MenuId('MenubarEditorFeaturesMenu'); static readonly MenubarNewBreakpointMenu = new MenuId('MenubarNewBreakpointMenu'); static readonly MenubarPanelAlignmentMenu = new MenuId('MenubarPanelAlignmentMenu'); static readonly MenubarPanelPositionMenu = new MenuId('MenubarPanelPositionMenu'); diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index 0e7150e5a966b..92542a8d03fe0 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -515,7 +515,7 @@ registerAction2(class ToggleBreadcrumb extends Action2 { }, menu: [ { id: MenuId.CommandPalette }, - { id: MenuId.MenubarEditorFeaturesMenu, order: 3 }, + { id: MenuId.MenubarAppearanceMenu, group: '4_editor', order: 2 }, { id: MenuId.NotebookToolbar, group: 'notebookLayout', order: 2 }, { id: MenuId.StickyScrollContext } ] diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index 80a9fe8e82d9d..82ca36f22a648 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -779,14 +779,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, { order: 9 }); -// Features menu -MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, { - group: '2_appearance', - title: localize({ key: 'miEditorFeatures', comment: ['&& denotes a mnemonic'] }, "Editor &&Features"), - submenu: MenuId.MenubarEditorFeaturesMenu, - order: 3 -}); - // Main Menu Bar Contributions: MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts index 6703497db2d62..546e704135c2d 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts @@ -26,8 +26,9 @@ export class ToggleMinimapAction extends Action2 { f1: true, toggled: ContextKeyExpr.equals('config.editor.minimap.enabled', true), menu: { - id: MenuId.MenubarEditorFeaturesMenu, - order: 2 + id: MenuId.MenubarAppearanceMenu, + group: '4_editor', + order: 1 } }); } diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts index 9e3029dd0d88c..b34d50589355c 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts @@ -26,8 +26,9 @@ export class ToggleRenderControlCharacterAction extends Action2 { f1: true, toggled: ContextKeyExpr.equals('config.editor.renderControlCharacters', true), menu: { - id: MenuId.MenubarEditorFeaturesMenu, - order: 5 + id: MenuId.MenubarAppearanceMenu, + group: '4_editor', + order: 4 } }); } diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts index 88e06bc7547d8..af948e693be62 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.ts @@ -26,8 +26,9 @@ class ToggleRenderWhitespaceAction extends Action2 { f1: true, toggled: ContextKeyExpr.notEquals('config.editor.renderWhitespace', 'none'), menu: { - id: MenuId.MenubarEditorFeaturesMenu, - order: 4 + id: MenuId.MenubarAppearanceMenu, + group: '4_editor', + order: 3 } }); } diff --git a/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts b/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts index f877dd2e51bc7..dac8f6f94cf0f 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts @@ -349,12 +349,13 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { // View menu -MenuRegistry.appendMenuItem(MenuId.MenubarEditorFeaturesMenu, { +MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, { command: { id: TOGGLE_WORD_WRAP_ID, title: nls.localize({ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "&&Word Wrap"), toggled: EDITOR_WORD_WRAP, precondition: CAN_TOGGLE_WORD_WRAP }, - order: 1 + order: 1, + group: '5_editor' }); diff --git a/src/vs/workbench/electron-sandbox/actions/windowActions.ts b/src/vs/workbench/electron-sandbox/actions/windowActions.ts index 2c8e6d83bfcfd..f782f4579191b 100644 --- a/src/vs/workbench/electron-sandbox/actions/windowActions.ts +++ b/src/vs/workbench/electron-sandbox/actions/windowActions.ts @@ -104,7 +104,7 @@ export class ZoomInAction extends BaseZoomAction { }, menu: { id: MenuId.MenubarAppearanceMenu, - group: '3_zoom', + group: '5_zoom', order: 1 } }); @@ -138,7 +138,7 @@ export class ZoomOutAction extends BaseZoomAction { }, menu: { id: MenuId.MenubarAppearanceMenu, - group: '3_zoom', + group: '5_zoom', order: 2 } }); @@ -167,7 +167,7 @@ export class ZoomResetAction extends BaseZoomAction { }, menu: { id: MenuId.MenubarAppearanceMenu, - group: '3_zoom', + group: '5_zoom', order: 3 } });