@codingame/monaco-vscode-api 1.83.4 → 1.83.6

package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js

@@ -2,7 +2,7 @@ import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { EditorPaneDescriptor } from '../../editor.js';
 import { EditorExtensions } from '../../../common/editor.js';
-import { ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorPinnedAndUnpinnedTabsContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorDirtyContext, TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
+import { ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorPinnedAndUnpinnedTabsContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorDirtyContext } from '../../../common/contextkeys.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { TextResourceEditor } from './textResourceEditor.js';
 import { SideBySideEditor } from './sideBySideEditor.js';
@@ -16,7 +16,7 @@ import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCo
 import { registerAction2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, NavigateForwardAction, NavigateBackwardsAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, ReopenClosedEditorAction, ClearRecentFilesAction, CloseAllEditorsAction, CloseAllEditorGroupsAction, CloseLeftEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseEditorInAllGroupsAction, RevertAndCloseEditorAction, SplitEditorAction, SplitEditorOrthogonalAction, SplitEditorLeftAction, SplitEditorRightAction, SplitEditorUpAction, SplitEditorDownAction, JoinTwoGroupsAction, JoinAllGroupsAction, NavigateBetweenGroupsAction, ResetGroupSizesAction, ToggleGroupSizesAction, MaximizeGroupAction, MinimizeOtherGroupsAction, MoveEditorLeftInGroupAction, MoveEditorRightInGroupAction, MoveGroupLeftAction, MoveGroupRightAction, MoveGroupUpAction, MoveGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, DuplicateGroupDownAction, MoveEditorToPreviousGroupAction, MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorToLastGroupAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToNextGroupAction, SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToRightGroupAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, FocusPreviousGroup, FocusNextGroup, FocusLeftGroup, FocusRightGroup, FocusAboveGroup, FocusBelowGroup, NewEditorGroupLeftAction, NewEditorGroupRightAction, NewEditorGroupAboveAction, NewEditorGroupBelowAction, NavigatePreviousAction, NavigateForwardInEditsAction, NavigateBackwardsInEditsAction, NavigatePreviousInEditsAction, NavigateToLastEditLocationAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigateToLastNavigationLocationAction, ClearEditorHistoryAction, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction } from './editorActions.js';
-import { setup, UNLOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, TOGGLE_LOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, TOGGLE_DIFF_SIDE_BY_SIDE, SHOW_EDITORS_IN_GROUP, TOGGLE_KEEP_EDITORS_COMMAND_ID, SPLIT_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR } from './editorCommands.js';
+import { setup, UNLOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, TOGGLE_LOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, TOGGLE_DIFF_SIDE_BY_SIDE, SHOW_EDITORS_IN_GROUP, TOGGLE_KEEP_EDITORS_COMMAND_ID, SPLIT_EDITOR, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE } from './editorCommands.js';
 import { getQuickNavigateHandler, inQuickPickContext } from '../../quickaccess.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
@@ -31,17 +31,33 @@ import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconReg
 import { UntitledTextEditorWorkingCopyEditorHandler } from '../../../services/untitled/common/untitledTextEditorHandler.js';
 import { DynamicEditorConfigurations } from './editorConfiguration.js';
 import { ToggleTabsVisibilityAction, ToggleSeparatePinnedTabsAction } from '../../actions/layoutActions.js';
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(TextResourceEditor, TextResourceEditor.ID, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'textEditor', "Text Editor")), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(TextResourceEditor, TextResourceEditor.ID, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'textEditor',
+    "Text Editor"
+))), [
     ( new SyncDescriptor(UntitledTextEditorInput)),
     ( new SyncDescriptor(TextResourceEditorInput))
 ]);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(TextDiffEditor, TextDiffEditor.ID, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'textDiffEditor', "Text Diff Editor")), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(TextDiffEditor, TextDiffEditor.ID, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'textDiffEditor',
+    "Text Diff Editor"
+))), [
     ( new SyncDescriptor(DiffEditorInput))
 ]);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(BinaryResourceDiffEditor, BinaryResourceDiffEditor.ID, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'binaryDiffEditor', "Binary Diff Editor")), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(BinaryResourceDiffEditor, BinaryResourceDiffEditor.ID, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'binaryDiffEditor',
+    "Binary Diff Editor"
+))), [
     ( new SyncDescriptor(DiffEditorInput))
 ]);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(SideBySideEditor, SideBySideEditor.ID, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'sideBySideEditor', "Side by Side Editor")), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(SideBySideEditor, SideBySideEditor.ID, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'sideBySideEditor',
+    "Side by Side Editor"
+))), [
     ( new SyncDescriptor(SideBySideEditorInput))
 ]);
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(EditorAutoSave, 2 );
@@ -56,22 +72,46 @@ quickAccessRegistry.registerQuickAccessProvider({
     ctor: ActiveGroupEditorsByMostRecentlyUsedQuickAccess,
     prefix: ActiveGroupEditorsByMostRecentlyUsedQuickAccess.PREFIX,
     contextKey: editorPickerContextKey,
-    placeholder: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'editorQuickAccessPlaceholder', "Type the name of an editor to open it."),
-    helpEntries: [{ description: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'activeGroupEditorsByMostRecentlyUsedQuickAccess', "Show Editors in Active Group by Most Recently Used"), commandId: ShowEditorsInActiveGroupByMostRecentlyUsedAction.ID }]
+    placeholder: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'editorQuickAccessPlaceholder',
+        "Type the name of an editor to open it."
+    )),
+    helpEntries: [{ description: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'activeGroupEditorsByMostRecentlyUsedQuickAccess',
+        "Show Editors in Active Group by Most Recently Used"
+    )), commandId: ShowEditorsInActiveGroupByMostRecentlyUsedAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: AllEditorsByAppearanceQuickAccess,
     prefix: AllEditorsByAppearanceQuickAccess.PREFIX,
     contextKey: editorPickerContextKey,
-    placeholder: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'editorQuickAccessPlaceholder', "Type the name of an editor to open it."),
-    helpEntries: [{ description: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'allEditorsByAppearanceQuickAccess', "Show All Opened Editors By Appearance"), commandId: ShowAllEditorsByAppearanceAction.ID }]
+    placeholder: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'editorQuickAccessPlaceholder',
+        "Type the name of an editor to open it."
+    )),
+    helpEntries: [{ description: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'allEditorsByAppearanceQuickAccess',
+        "Show All Opened Editors By Appearance"
+    )), commandId: ShowAllEditorsByAppearanceAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: AllEditorsByMostRecentlyUsedQuickAccess,
     prefix: AllEditorsByMostRecentlyUsedQuickAccess.PREFIX,
     contextKey: editorPickerContextKey,
-    placeholder: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'editorQuickAccessPlaceholder', "Type the name of an editor to open it."),
-    helpEntries: [{ description: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'allEditorsByMostRecentlyUsedQuickAccess', "Show All Opened Editors By Most Recently Used"), commandId: ShowAllEditorsByMostRecentlyUsedAction.ID }]
+    placeholder: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'editorQuickAccessPlaceholder',
+        "Type the name of an editor to open it."
+    )),
+    helpEntries: [{ description: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'allEditorsByMostRecentlyUsedQuickAccess',
+        "Show All Opened Editors By Most Recently Used"
+    )), commandId: ShowAllEditorsByMostRecentlyUsedAction.ID }]
 });
 registerAction2(ChangeLanguageAction);
 registerAction2(ChangeEOLAction);
@@ -195,41 +235,165 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     mac: { primary: 256  | 1024  | 2  }
 });
 setup();
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: UNLOCK_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unlockGroupAction', "Unlock Group"), icon: Codicon.lock }, group: 'navigation', order: 10, when: ActiveEditorGroupLockedContext });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeGroupAction', "Close Group"), icon: Codicon.close }, group: 'navigation', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_UP, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitUp', "Split Up") }, group: '2_split', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_DOWN, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitDown', "Split Down") }, group: '2_split', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_LEFT, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitLeft', "Split Left") }, group: '2_split', order: 30 });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_RIGHT, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitRight', "Split Right") }, group: '2_split', order: 40 });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'toggleLockGroup', "Lock Group"), toggled: ActiveEditorGroupLockedContext }, group: '3_lock', order: 10, when: MultipleEditorGroupsContext });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close") }, group: '4_close', order: 10, when: MultipleEditorGroupsContext });
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_UP, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitUp', "Split Up") }, group: '2_split', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_DOWN, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitDown', "Split Down") }, group: '2_split', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_LEFT, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitLeft', "Split Left") }, group: '2_split', order: 30 });
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_RIGHT, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitRight', "Split Right") }, group: '2_split', order: 40 });
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ToggleTabsVisibilityAction.ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'toggleTabs', "Editor Tabs"), toggled: ( ContextKeyExpr.has('config.workbench.editor.showTabs')) }, group: '3_config', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ToggleSeparatePinnedTabsAction.ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'toggleSeparatePinnedEditorTabs', "Separate Pinned Editor Tabs"), toggled: ( ContextKeyExpr.has('config.workbench.editor.pinnedTabsOnSeparateRow')) }, when: EditorPinnedAndUnpinnedTabsContext, group: '3_config', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close") }, group: '1_close', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeOthers', "Close Others"), precondition: ( EditorGroupEditorsCountContext.notEqualsTo('1')) }, group: '1_close', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeRight', "Close to the Right"), precondition: ( ActiveEditorLastInGroupContext.toNegated()) }, group: '1_close', order: 30, when: EditorTabsVisibleContext });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeAllSaved', "Close Saved") }, group: '1_close', order: 40 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeAll', "Close All") }, group: '1_close', order: 50 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: REOPEN_WITH_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'reopenWith', "Reopen Editor With...") }, group: '1_open', order: 10, when: ActiveEditorAvailableEditorIdsContext });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: KEEP_EDITOR_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'keepOpen', "Keep Open"), precondition: ( ActiveEditorPinnedContext.toNegated()) }, group: '3_preview', order: 10, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: PIN_EDITOR_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'pin', "Pin") }, group: '3_preview', order: 20, when: ( ActiveEditorStickyContext.toNegated()) });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpin', "Unpin") }, group: '3_preview', order: 20, when: ActiveEditorStickyContext });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_UP, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitUp', "Split Up") }, group: '5_split', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_DOWN, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitDown', "Split Down") }, group: '5_split', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_LEFT, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitLeft', "Split Left") }, group: '5_split', order: 30 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_RIGHT, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitRight', "Split Right") }, group: '5_split', order: 40 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_IN_GROUP, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitInGroup', "Split in Group") }, group: '6_split_in_group', order: 10, when: ActiveEditorCanSplitInGroupContext });
-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: JOIN_EDITOR_IN_GROUP, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'joinInGroup', "Join in Group") }, group: '6_split_in_group', order: 10, when: SideBySideEditorActiveContext });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_DIFF_SIDE_BY_SIDE, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'inlineView', "Inline View"), toggled: ( ContextKeyExpr.equals('config.diffEditor.renderSideBySide', false)) }, group: '1_diff', order: 10, when: ( ContextKeyExpr.has('isInDiffEditor')) });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: SHOW_EDITORS_IN_GROUP, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'showOpenedEditors', "Show Opened Editors") }, group: '3_open', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeAll', "Close All") }, group: '5_close', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeAllSaved', "Close Saved") }, group: '5_close', order: 20 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_KEEP_EDITORS_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'togglePreviewMode', "Enable Preview Editors"), toggled: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) }, group: '7_settings', order: 10 });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'lockGroup', "Lock Group"), toggled: ActiveEditorGroupLockedContext }, group: '8_lock', order: 10, when: MultipleEditorGroupsContext });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: UNLOCK_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'unlockGroupAction',
+    "Unlock Group"
+)), icon: Codicon.lock }, group: 'navigation', order: 10, when: ActiveEditorGroupLockedContext });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeGroupAction',
+    "Close Group"
+)), icon: Codicon.close }, group: 'navigation', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_UP, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitUp',
+    "Split Up"
+)) }, group: '2_split', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_DOWN, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitDown',
+    "Split Down"
+)) }, group: '2_split', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_LEFT, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitLeft',
+    "Split Left"
+)) }, group: '2_split', order: 30 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_RIGHT, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitRight',
+    "Split Right"
+)) }, group: '2_split', order: 40 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'toggleLockGroup',
+    "Lock Group"
+)), toggled: ActiveEditorGroupLockedContext }, group: '3_lock', order: 10, when: MultipleEditorGroupsContext });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")) }, group: '4_close', order: 10, when: MultipleEditorGroupsContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_UP, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitUp',
+    "Split Up"
+)) }, group: '2_split', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_DOWN, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitDown',
+    "Split Down"
+)) }, group: '2_split', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_LEFT, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitLeft',
+    "Split Left"
+)) }, group: '2_split', order: 30 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_RIGHT, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitRight',
+    "Split Right"
+)) }, group: '2_split', order: 40 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ToggleTabsVisibilityAction.ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'toggleTabs',
+    "Editor Tabs"
+)), toggled: ( ContextKeyExpr.has('config.workbench.editor.showTabs')) }, group: '3_config', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ToggleSeparatePinnedTabsAction.ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'toggleSeparatePinnedEditorTabs',
+    "Separate Pinned Editor Tabs"
+)), toggled: ( ContextKeyExpr.has('config.workbench.editor.pinnedTabsOnSeparateRow')) }, when: EditorPinnedAndUnpinnedTabsContext, group: '3_config', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")) }, group: '1_close', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeOthers',
+    "Close Others"
+)), precondition: ( EditorGroupEditorsCountContext.notEqualsTo('1')) }, group: '1_close', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeRight',
+    "Close to the Right"
+)), precondition: ( ActiveEditorLastInGroupContext.toNegated()) }, group: '1_close', order: 30, when: EditorTabsVisibleContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeAllSaved',
+    "Close Saved"
+)) }, group: '1_close', order: 40 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeAll',
+    "Close All"
+)) }, group: '1_close', order: 50 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: REOPEN_WITH_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'reopenWith',
+    "Reopen Editor With..."
+)) }, group: '1_open', order: 10, when: ActiveEditorAvailableEditorIdsContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: KEEP_EDITOR_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'keepOpen',
+    "Keep Open"
+)), precondition: ( ActiveEditorPinnedContext.toNegated()) }, group: '3_preview', order: 10, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: PIN_EDITOR_COMMAND_ID, title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'pin', "Pin")) }, group: '3_preview', order: 20, when: ( ActiveEditorStickyContext.toNegated()) });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpin', "Unpin")) }, group: '3_preview', order: 20, when: ActiveEditorStickyContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_UP, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitUp',
+    "Split Up"
+)) }, group: '5_split', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_DOWN, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitDown',
+    "Split Down"
+)) }, group: '5_split', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_LEFT, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitLeft',
+    "Split Left"
+)) }, group: '5_split', order: 30 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_RIGHT, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitRight',
+    "Split Right"
+)) }, group: '5_split', order: 40 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR_IN_GROUP, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'splitInGroup',
+    "Split in Group"
+)) }, group: '6_split_in_group', order: 10, when: ActiveEditorCanSplitInGroupContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: JOIN_EDITOR_IN_GROUP, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'joinInGroup',
+    "Join in Group"
+)) }, group: '6_split_in_group', order: 10, when: SideBySideEditorActiveContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_DIFF_SIDE_BY_SIDE, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'inlineView',
+    "Inline View"
+)), toggled: ( ContextKeyExpr.equals('config.diffEditor.renderSideBySide', false)) }, group: '1_diff', order: 10, when: ( ContextKeyExpr.has('isInDiffEditor')) });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: SHOW_EDITORS_IN_GROUP, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'showOpenedEditors',
+    "Show Opened Editors"
+)) }, group: '3_open', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeAll',
+    "Close All"
+)) }, group: '5_close', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeAllSaved',
+    "Close Saved"
+)) }, group: '5_close', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_KEEP_EDITORS_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'togglePreviewMode',
+    "Enable Preview Editors"
+)), toggled: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) }, group: '7_settings', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'lockGroup',
+    "Lock Group"
+)), toggled: ActiveEditorGroupLockedContext }, group: '8_lock', order: 10, when: MultipleEditorGroupsContext });
 function appendEditorToolItem(primary, when, order, alternative, precondition) {
     const item = {
         command: {
@@ -255,85 +419,141 @@ const SPLIT_ORDER = 100000;
 const CLOSE_ORDER = 1000000;
 appendEditorToolItem({
     id: SPLIT_EDITOR,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitEditorRight', "Split Editor Right"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'splitEditorRight',
+        "Split Editor Right"
+    )),
     icon: Codicon.splitHorizontal
 }, ContextKeyExpr.not('splitEditorsVertically'), SPLIT_ORDER, {
     id: SPLIT_EDITOR_DOWN,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitEditorDown', "Split Editor Down"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'splitEditorDown',
+        "Split Editor Down"
+    )),
     icon: Codicon.splitVertical
 });
 appendEditorToolItem({
     id: SPLIT_EDITOR,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitEditorDown', "Split Editor Down"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'splitEditorDown',
+        "Split Editor Down"
+    )),
     icon: Codicon.splitVertical
 }, ( ContextKeyExpr.has('splitEditorsVertically')), SPLIT_ORDER, {
     id: SPLIT_EDITOR_RIGHT,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'splitEditorRight', "Split Editor Right"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'splitEditorRight',
+        "Split Editor Right"
+    )),
     icon: Codicon.splitHorizontal
 });
 appendEditorToolItem({
     id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'toggleSplitEditorInGroupLayout', "Toggle Layout"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'toggleSplitEditorInGroupLayout',
+        "Toggle Layout"
+    )),
     icon: Codicon.editorLayout
 }, SideBySideEditorActiveContext, SPLIT_ORDER - 1);
 appendEditorToolItem({
     id: CLOSE_EDITOR_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close"),
+    title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")),
     icon: Codicon.close
 }, ( ContextKeyExpr.and(( EditorTabsVisibleContext.toNegated()), ( ActiveEditorDirtyContext.toNegated()), ( ActiveEditorStickyContext.toNegated()))), CLOSE_ORDER, {
     id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeAll', "Close All"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'closeAll',
+        "Close All"
+    )),
     icon: Codicon.closeAll
 });
 appendEditorToolItem({
     id: CLOSE_EDITOR_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close"),
+    title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")),
     icon: Codicon.closeDirty
 }, ( ContextKeyExpr.and(( EditorTabsVisibleContext.toNegated()), ActiveEditorDirtyContext, ( ActiveEditorStickyContext.toNegated()))), CLOSE_ORDER, {
     id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeAll', "Close All"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'closeAll',
+        "Close All"
+    )),
     icon: Codicon.closeAll
 });
 appendEditorToolItem({
     id: UNPIN_EDITOR_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpin', "Unpin"),
+    title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpin', "Unpin")),
     icon: Codicon.pinned
 }, ( ContextKeyExpr.and(( EditorTabsVisibleContext.toNegated()), ( ActiveEditorDirtyContext.toNegated()), ActiveEditorStickyContext)), CLOSE_ORDER, {
     id: CLOSE_EDITOR_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close"),
+    title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")),
     icon: Codicon.close
 });
 appendEditorToolItem({
     id: UNPIN_EDITOR_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpin', "Unpin"),
+    title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpin', "Unpin")),
     icon: Codicon.pinnedDirty
 }, ( ContextKeyExpr.and(( EditorTabsVisibleContext.toNegated()), ActiveEditorDirtyContext, ActiveEditorStickyContext)), CLOSE_ORDER, {
     id: CLOSE_EDITOR_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close"),
+    title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")),
     icon: Codicon.close
 });
 appendEditorToolItem({
     id: UNLOCK_GROUP_COMMAND_ID,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unlockEditorGroup', "Unlock Group"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'unlockEditorGroup',
+        "Unlock Group"
+    )),
     icon: Codicon.lock
 }, ActiveEditorGroupLockedContext, CLOSE_ORDER - 1);
-const previousChangeIcon = registerIcon('diff-editor-previous-change', Codicon.arrowUp, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'previousChangeIcon', 'Icon for the previous change action in the diff editor.'));
-const nextChangeIcon = registerIcon('diff-editor-next-change', Codicon.arrowDown, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'nextChangeIcon', 'Icon for the next change action in the diff editor.'));
-const toggleWhitespace = registerIcon('diff-editor-toggle-whitespace', Codicon.whitespace, localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'toggleWhitespace', 'Icon for the toggle whitespace action in the diff editor.'));
+const previousChangeIcon = registerIcon('diff-editor-previous-change', Codicon.arrowUp, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'previousChangeIcon',
+    'Icon for the previous change action in the diff editor.'
+)));
+const nextChangeIcon = registerIcon('diff-editor-next-change', Codicon.arrowDown, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'nextChangeIcon',
+    'Icon for the next change action in the diff editor.'
+)));
+const toggleWhitespace = registerIcon('diff-editor-toggle-whitespace', Codicon.whitespace, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'toggleWhitespace',
+    'Icon for the toggle whitespace action in the diff editor.'
+)));
 appendEditorToolItem({
     id: GOTO_PREVIOUS_CHANGE,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'navigate.prev.label', "Previous Change"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'navigate.prev.label',
+        "Previous Change"
+    )),
     icon: previousChangeIcon
 }, TextCompareEditorActiveContext, 10);
 appendEditorToolItem({
     id: GOTO_NEXT_CHANGE,
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'navigate.next.label', "Next Change"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'navigate.next.label',
+        "Next Change"
+    )),
     icon: nextChangeIcon
 }, TextCompareEditorActiveContext, 11);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'ignoreTrimWhitespace.label', "Show Leading/Trailing Whitespace Differences"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            'ignoreTrimWhitespace.label',
+            "Show Leading/Trailing Whitespace Differences"
+        )),
         icon: toggleWhitespace,
         precondition: TextCompareEditorActiveContext,
         toggled: ( ContextKeyExpr.equals('config.diffEditor.ignoreTrimWhitespace', false)),
@@ -342,22 +562,70 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     when: TextCompareEditorActiveContext,
     order: 20,
 });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: KEEP_EDITOR_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'keepEditor', "Keep Editor"), original: 'Keep Editor' }, category: Categories.View }, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: PIN_EDITOR_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'pinEditor', "Pin Editor"), original: 'Pin Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'unpinEditor', "Unpin Editor"), original: 'Unpin Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeEditor', "Close Editor"), original: 'Close Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_PINNED_EDITOR_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closePinnedEditor', "Close Pinned Editor"), original: 'Close Pinned Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeEditorsInGroup', "Close All Editors in Group"), original: 'Close All Editors in Group' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeSavedEditors', "Close Saved Editors in Group"), original: 'Close Saved Editors in Group' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeOtherEditors', "Close Other Editors in Group"), original: 'Close Other Editors in Group' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeRightEditors', "Close Editors to the Right in Group"), original: 'Close Editors to the Right in Group' }, category: Categories.View }, when: ( ActiveEditorLastInGroupContext.toNegated()) });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_AND_GROUP_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'closeEditorGroup', "Close Editor Group"), original: 'Close Editor Group' }, category: Categories.View }, when: MultipleEditorGroupsContext });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: REOPEN_WITH_COMMAND_ID, title: { value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'reopenWith', "Reopen Editor With..."), original: 'Reopen Editor With...' }, category: Categories.View }, when: ActiveEditorAvailableEditorIdsContext });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: KEEP_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'keepEditor',
+    "Keep Editor"
+)), original: 'Keep Editor' }, category: Categories.View }, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: PIN_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'pinEditor',
+    "Pin Editor"
+)), original: 'Pin Editor' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'unpinEditor',
+    "Unpin Editor"
+)), original: 'Unpin Editor' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeEditor',
+    "Close Editor"
+)), original: 'Close Editor' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_PINNED_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closePinnedEditor',
+    "Close Pinned Editor"
+)), original: 'Close Pinned Editor' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeEditorsInGroup',
+    "Close All Editors in Group"
+)), original: 'Close All Editors in Group' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeSavedEditors',
+    "Close Saved Editors in Group"
+)), original: 'Close Saved Editors in Group' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeOtherEditors',
+    "Close Other Editors in Group"
+)), original: 'Close Other Editors in Group' }, category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeRightEditors',
+    "Close Editors to the Right in Group"
+)), original: 'Close Editors to the Right in Group' }, category: Categories.View }, when: ( ActiveEditorLastInGroupContext.toNegated()) });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_AND_GROUP_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'closeEditorGroup',
+    "Close Editor Group"
+)), original: 'Close Editor Group' }, category: Categories.View }, when: MultipleEditorGroupsContext });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: REOPEN_WITH_COMMAND_ID, title: { value: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'reopenWith',
+    "Reopen Editor With..."
+)), original: 'Reopen Editor With...' }, category: Categories.View }, when: ActiveEditorAvailableEditorIdsContext });
 MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
     group: '1_editor',
     command: {
         id: ReopenClosedEditorAction.ID,
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miReopenClosedEditor', comment: ['&& denotes a mnemonic'] }, "&&Reopen Closed Editor"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miReopenClosedEditor', comment: ['&& denotes a mnemonic'] },
+            "&&Reopen Closed Editor"
+        )),
         precondition: ( ContextKeyExpr.has('canReopenClosedEditor'))
     },
     order: 1
@@ -366,19 +634,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
     group: 'z_clear',
     command: {
         id: ClearRecentFilesAction.ID,
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miClearRecentOpen', comment: ['&& denotes a mnemonic'] }, "&&Clear Recently Opened")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miClearRecentOpen', comment: ['&& denotes a mnemonic'] },
+            "&&Clear Recently Opened"
+        ))
     },
     order: 1
 });
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miShare', "Share"),
-    submenu: MenuId.MenubarShare,
-    group: '45_share',
-    order: 1,
-}));
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '2_appearance',
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        { key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] },
+        "Editor &&Layout"
+    )),
     submenu: MenuId.MenubarLayoutMenu,
     order: 2
 });
@@ -388,8 +658,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: SPLIT_EDITOR_UP,
         title: {
             original: 'Split Up',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miSplitEditorUpWithoutMnemonic', "Split Up"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up"),
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miSplitEditorUpWithoutMnemonic',
+                "Split Up"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] },
+                "Split &&Up"
+            )),
         }
     },
     order: 1
@@ -400,8 +678,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: SPLIT_EDITOR_DOWN,
         title: {
             original: 'Split Down',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miSplitEditorDownWithoutMnemonic', "Split Down"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miSplitEditorDownWithoutMnemonic',
+                "Split Down"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] },
+                "Split &&Down"
+            ))
         }
     },
     order: 2
@@ -412,8 +698,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: SPLIT_EDITOR_LEFT,
         title: {
             original: 'Split Left',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miSplitEditorLeftWithoutMnemonic', "Split Left"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miSplitEditorLeftWithoutMnemonic',
+                "Split Left"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] },
+                "Split &&Left"
+            ))
         }
     },
     order: 3
@@ -424,8 +718,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: SPLIT_EDITOR_RIGHT,
         title: {
             original: 'Split Right',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miSplitEditorRightWithoutMnemonic', "Split Right"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miSplitEditorRightWithoutMnemonic',
+                "Split Right"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] },
+                "Split &&Right"
+            ))
         }
     },
     order: 4
@@ -436,8 +738,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: SPLIT_EDITOR_IN_GROUP,
         title: {
             original: 'Split in Group',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miSplitEditorInGroupWithoutMnemonic', "Split in Group"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSplitEditorInGroup', comment: ['&& denotes a mnemonic'] }, "Split in &&Group")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miSplitEditorInGroupWithoutMnemonic',
+                "Split in Group"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miSplitEditorInGroup', comment: ['&& denotes a mnemonic'] },
+                "Split in &&Group"
+            ))
         }
     },
     when: ActiveEditorCanSplitInGroupContext,
@@ -449,8 +759,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: JOIN_EDITOR_IN_GROUP,
         title: {
             original: 'Join in Group',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miJoinEditorInGroupWithoutMnemonic', "Join in Group"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miJoinEditorInGroup', comment: ['&& denotes a mnemonic'] }, "Join in &&Group")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miJoinEditorInGroupWithoutMnemonic',
+                "Join in Group"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miJoinEditorInGroup', comment: ['&& denotes a mnemonic'] },
+                "Join in &&Group"
+            ))
         }
     },
     when: SideBySideEditorActiveContext,
@@ -462,8 +780,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutSingleAction.ID,
         title: {
             original: 'Single',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miSingleColumnEditorLayoutWithoutMnemonic', "Single"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miSingleColumnEditorLayoutWithoutMnemonic',
+                "Single"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "&&Single"
+            ))
         }
     },
     order: 1
@@ -474,8 +800,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutTwoColumnsAction.ID,
         title: {
             original: 'Two Columns',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miTwoColumnsEditorLayoutWithoutMnemonic', "Two Columns"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Two Columns")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miTwoColumnsEditorLayoutWithoutMnemonic',
+                "Two Columns"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "&&Two Columns"
+            ))
         }
     },
     order: 3
@@ -486,8 +820,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutThreeColumnsAction.ID,
         title: {
             original: 'Three Columns',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miThreeColumnsEditorLayoutWithoutMnemonic', "Three Columns"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&hree Columns")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miThreeColumnsEditorLayoutWithoutMnemonic',
+                "Three Columns"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "T&&hree Columns"
+            ))
         }
     },
     order: 4
@@ -498,8 +840,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutTwoRowsAction.ID,
         title: {
             original: 'Two Rows',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miTwoRowsEditorLayoutWithoutMnemonic', "Two Rows"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "T&&wo Rows")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miTwoRowsEditorLayoutWithoutMnemonic',
+                "Two Rows"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "T&&wo Rows"
+            ))
         }
     },
     order: 5
@@ -510,8 +860,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutThreeRowsAction.ID,
         title: {
             original: 'Three Rows',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miThreeRowsEditorLayoutWithoutMnemonic', "Three Rows"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] }, "Three &&Rows")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miThreeRowsEditorLayoutWithoutMnemonic',
+                "Three Rows"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "Three &&Rows"
+            ))
         }
     },
     order: 6
@@ -522,8 +880,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutTwoByTwoGridAction.ID,
         title: {
             original: 'Grid (2x2)',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miTwoByTwoGridEditorLayoutWithoutMnemonic', "Grid (2x2)"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Grid (2x2)")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miTwoByTwoGridEditorLayoutWithoutMnemonic',
+                "Grid (2x2)"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "&&Grid (2x2)"
+            ))
         }
     },
     order: 7
@@ -534,8 +900,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutTwoRowsRightAction.ID,
         title: {
             original: 'Two Rows Right',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miTwoRowsRightEditorLayoutWithoutMnemonic', "Two Rows Right"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two R&&ows Right")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miTwoRowsRightEditorLayoutWithoutMnemonic',
+                "Two Rows Right"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "Two R&&ows Right"
+            ))
         }
     },
     order: 8
@@ -546,8 +920,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
         id: EditorLayoutTwoColumnsBottomAction.ID,
         title: {
             original: 'Two Columns Bottom',
-            value: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'miTwoColumnsBottomEditorLayoutWithoutMnemonic', "Two Columns Bottom"),
-            mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] }, "Two &&Columns Bottom")
+            value: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                'miTwoColumnsBottomEditorLayoutWithoutMnemonic',
+                "Two Columns Bottom"
+            )),
+            mnemonicTitle: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editor.contribution',
+                { key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] },
+                "Two &&Columns Bottom"
+            ))
         }
     },
     order: 9
@@ -556,7 +938,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '1_history_nav',
     command: {
         id: 'workbench.action.navigateToLastEditLocation',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miLastEditLocation', comment: ['&& denotes a mnemonic'] }, "&&Last Edit Location"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miLastEditLocation', comment: ['&& denotes a mnemonic'] },
+            "&&Last Edit Location"
+        )),
         precondition: ( ContextKeyExpr.has('canNavigateToLastEditLocation'))
     },
     order: 3
@@ -565,7 +951,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '1_sideBySide',
     command: {
         id: FOCUS_FIRST_SIDE_EDITOR,
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFirstSideEditor', comment: ['&& denotes a mnemonic'] }, "&&First Side in Editor")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFirstSideEditor', comment: ['&& denotes a mnemonic'] },
+            "&&First Side in Editor"
+        ))
     },
     when: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
     order: 1
@@ -574,7 +964,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '1_sideBySide',
     command: {
         id: FOCUS_SECOND_SIDE_EDITOR,
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSecondSideEditor', comment: ['&& denotes a mnemonic'] }, "&&Second Side in Editor")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miSecondSideEditor', comment: ['&& denotes a mnemonic'] },
+            "&&Second Side in Editor"
+        ))
     },
     when: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
     order: 2
@@ -583,7 +977,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '2_any',
     command: {
         id: 'workbench.action.nextEditor',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miNextEditor', comment: ['&& denotes a mnemonic'] }, "&&Next Editor")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miNextEditor', comment: ['&& denotes a mnemonic'] },
+            "&&Next Editor"
+        ))
     },
     order: 1
 });
@@ -591,7 +989,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '2_any',
     command: {
         id: 'workbench.action.previousEditor',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miPreviousEditor', comment: ['&& denotes a mnemonic'] }, "&&Previous Editor")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miPreviousEditor', comment: ['&& denotes a mnemonic'] },
+            "&&Previous Editor"
+        ))
     },
     order: 2
 });
@@ -599,7 +1001,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '3_any_used',
     command: {
         id: 'workbench.action.openNextRecentlyUsedEditor',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miNextRecentlyUsedEditor', comment: ['&& denotes a mnemonic'] }, "&&Next Used Editor")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miNextRecentlyUsedEditor', comment: ['&& denotes a mnemonic'] },
+            "&&Next Used Editor"
+        ))
     },
     order: 1
 });
@@ -607,7 +1013,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '3_any_used',
     command: {
         id: 'workbench.action.openPreviousRecentlyUsedEditor',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miPreviousRecentlyUsedEditor', comment: ['&& denotes a mnemonic'] }, "&&Previous Used Editor")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miPreviousRecentlyUsedEditor', comment: ['&& denotes a mnemonic'] },
+            "&&Previous Used Editor"
+        ))
     },
     order: 2
 });
@@ -615,7 +1025,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '4_group',
     command: {
         id: 'workbench.action.nextEditorInGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miNextEditorInGroup', comment: ['&& denotes a mnemonic'] }, "&&Next Editor in Group")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miNextEditorInGroup', comment: ['&& denotes a mnemonic'] },
+            "&&Next Editor in Group"
+        ))
     },
     order: 1
 });
@@ -623,7 +1037,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '4_group',
     command: {
         id: 'workbench.action.previousEditorInGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miPreviousEditorInGroup', comment: ['&& denotes a mnemonic'] }, "&&Previous Editor in Group")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miPreviousEditorInGroup', comment: ['&& denotes a mnemonic'] },
+            "&&Previous Editor in Group"
+        ))
     },
     order: 2
 });
@@ -631,7 +1049,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '5_group_used',
     command: {
         id: 'workbench.action.openNextRecentlyUsedEditorInGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miNextUsedEditorInGroup', comment: ['&& denotes a mnemonic'] }, "&&Next Used Editor in Group")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miNextUsedEditorInGroup', comment: ['&& denotes a mnemonic'] },
+            "&&Next Used Editor in Group"
+        ))
     },
     order: 1
 });
@@ -639,13 +1061,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchEditorMenu, {
     group: '5_group_used',
     command: {
         id: 'workbench.action.openPreviousRecentlyUsedEditorInGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miPreviousUsedEditorInGroup', comment: ['&& denotes a mnemonic'] }, "&&Previous Used Editor in Group")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miPreviousUsedEditorInGroup', comment: ['&& denotes a mnemonic'] },
+            "&&Previous Used Editor in Group"
+        ))
     },
     order: 2
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '2_editor_nav',
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSwitchEditor', comment: ['&& denotes a mnemonic'] }, "Switch &&Editor"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        { key: 'miSwitchEditor', comment: ['&& denotes a mnemonic'] },
+        "Switch &&Editor"
+    )),
     submenu: MenuId.MenubarSwitchEditorMenu,
     order: 1
 });
@@ -653,7 +1083,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '1_focus_index',
     command: {
         id: 'workbench.action.focusFirstEditorGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusFirstGroup', comment: ['&& denotes a mnemonic'] }, "Group &&1")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusFirstGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&1"
+        ))
     },
     order: 1
 });
@@ -661,7 +1095,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '1_focus_index',
     command: {
         id: 'workbench.action.focusSecondEditorGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusSecondGroup', comment: ['&& denotes a mnemonic'] }, "Group &&2")
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusSecondGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&2"
+        ))
     },
     order: 2
 });
@@ -669,7 +1107,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '1_focus_index',
     command: {
         id: 'workbench.action.focusThirdEditorGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusThirdGroup', comment: ['&& denotes a mnemonic'] }, "Group &&3"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusThirdGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&3"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 3
@@ -678,7 +1120,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '1_focus_index',
     command: {
         id: 'workbench.action.focusFourthEditorGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusFourthGroup', comment: ['&& denotes a mnemonic'] }, "Group &&4"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusFourthGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&4"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 4
@@ -687,7 +1133,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '1_focus_index',
     command: {
         id: 'workbench.action.focusFifthEditorGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusFifthGroup', comment: ['&& denotes a mnemonic'] }, "Group &&5"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusFifthGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&5"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 5
@@ -696,7 +1146,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '2_next_prev',
     command: {
         id: 'workbench.action.focusNextGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miNextGroup', comment: ['&& denotes a mnemonic'] }, "&&Next Group"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miNextGroup', comment: ['&& denotes a mnemonic'] },
+            "&&Next Group"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 1
@@ -705,7 +1159,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '2_next_prev',
     command: {
         id: 'workbench.action.focusPreviousGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miPreviousGroup', comment: ['&& denotes a mnemonic'] }, "&&Previous Group"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miPreviousGroup', comment: ['&& denotes a mnemonic'] },
+            "&&Previous Group"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 2
@@ -714,7 +1172,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '3_directional',
     command: {
         id: 'workbench.action.focusLeftGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusLeftGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Left"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusLeftGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&Left"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 1
@@ -723,7 +1185,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '3_directional',
     command: {
         id: 'workbench.action.focusRightGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusRightGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Right"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusRightGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&Right"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 2
@@ -732,7 +1198,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '3_directional',
     command: {
         id: 'workbench.action.focusAboveGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusAboveGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Above"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusAboveGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&Above"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 3
@@ -741,14 +1211,22 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSwitchGroupMenu, {
     group: '3_directional',
     command: {
         id: 'workbench.action.focusBelowGroup',
-        title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miFocusBelowGroup', comment: ['&& denotes a mnemonic'] }, "Group &&Below"),
+        title: ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/editor.contribution',
+            { key: 'miFocusBelowGroup', comment: ['&& denotes a mnemonic'] },
+            "Group &&Below"
+        )),
         precondition: MultipleEditorGroupsContext
     },
     order: 4
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '2_editor_nav',
-    title: localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', { key: 'miSwitchGroup', comment: ['&& denotes a mnemonic'] }, "Switch &&Group"),
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        { key: 'miSwitchGroup', comment: ['&& denotes a mnemonic'] },
+        "Switch &&Group"
+    )),
     submenu: MenuId.MenubarSwitchGroupMenu,
     order: 2
 });