@codingame/monaco-vscode-api 1.83.4 → 1.83.6

package/vscode/src/vs/workbench/browser/actions/layoutActions.js

@@ -1,5 +1,5 @@
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { registerAction2, Action2, MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IWorkbenchLayoutService, positionToString } from '../../services/layout/browser/layoutService.js';
@@ -9,7 +9,7 @@ import { isWindows, isLinux, isWeb, isMacintosh, isNative } from 'monaco-editor/
 import { IsMacNativeContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { ViewContainerLocationToString, IViewDescriptorService, IViewsService } from '../../common/views.js';
+import { IViewDescriptorService, IViewsService } from '../../common/views.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
@@ -22,27 +22,95 @@ import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
-const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'menuBarIcon', "Represents the menu bar"));
-const activityBarLeftIcon = registerIcon('activity-bar-left', Codicon.layoutActivitybarLeft, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'activityBarLeft', "Represents the activity bar in the left position"));
-const activityBarRightIcon = registerIcon('activity-bar-right', Codicon.layoutActivitybarRight, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'activityBarRight', "Represents the activity bar in the right position"));
-const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelLeft', "Represents a side bar in the left position"));
-const panelLeftOffIcon = registerIcon('panel-left-off', Codicon.layoutSidebarLeftOff, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelLeftOff', "Represents a side bar in the left position toggled off"));
-const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelRight', "Represents side bar in the right position"));
-const panelRightOffIcon = registerIcon('panel-right-off', Codicon.layoutSidebarRightOff, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelRightOff', "Represents side bar in the right position toggled off"));
-const panelIcon = registerIcon('panel-bottom', Codicon.layoutPanel, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelBottom', "Represents the bottom panel"));
-const statusBarIcon = registerIcon('statusBar', Codicon.layoutStatusbar, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'statusBarIcon', "Represents the status bar"));
-const panelAlignmentLeftIcon = registerIcon('panel-align-left', Codicon.layoutPanelLeft, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelBottomLeft', "Represents the bottom panel alignment set to the left"));
-const panelAlignmentRightIcon = registerIcon('panel-align-right', Codicon.layoutPanelRight, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelBottomRight', "Represents the bottom panel alignment set to the right"));
-const panelAlignmentCenterIcon = registerIcon('panel-align-center', Codicon.layoutPanelCenter, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelBottomCenter', "Represents the bottom panel alignment set to the center"));
-const panelAlignmentJustifyIcon = registerIcon('panel-align-justify', Codicon.layoutPanelJustify, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelBottomJustify', "Represents the bottom panel alignment set to justified"));
-const fullscreenIcon = registerIcon('fullscreen', Codicon.screenFull, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'fullScreenIcon', "Represents full screen"));
-const centerLayoutIcon = registerIcon('centerLayoutIcon', Codicon.layoutCentered, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'centerLayoutIcon', "Represents centered layout mode"));
-const zenModeIcon = registerIcon('zenMode', Codicon.target, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'zenModeIcon', "Represents zen mode"));
+const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'menuBarIcon',
+    "Represents the menu bar"
+)));
+const activityBarLeftIcon = registerIcon('activity-bar-left', Codicon.layoutActivitybarLeft, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'activityBarLeft',
+    "Represents the activity bar in the left position"
+)));
+const activityBarRightIcon = registerIcon('activity-bar-right', Codicon.layoutActivitybarRight, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'activityBarRight',
+    "Represents the activity bar in the right position"
+)));
+const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelLeft',
+    "Represents a side bar in the left position"
+)));
+registerIcon('panel-left-off', Codicon.layoutSidebarLeftOff, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelLeftOff',
+    "Represents a side bar in the left position toggled off"
+)));
+const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelRight',
+    "Represents side bar in the right position"
+)));
+registerIcon('panel-right-off', Codicon.layoutSidebarRightOff, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelRightOff',
+    "Represents side bar in the right position toggled off"
+)));
+const panelIcon = registerIcon('panel-bottom', Codicon.layoutPanel, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelBottom',
+    "Represents the bottom panel"
+)));
+const statusBarIcon = registerIcon('statusBar', Codicon.layoutStatusbar, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'statusBarIcon',
+    "Represents the status bar"
+)));
+const panelAlignmentLeftIcon = registerIcon('panel-align-left', Codicon.layoutPanelLeft, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelBottomLeft',
+    "Represents the bottom panel alignment set to the left"
+)));
+const panelAlignmentRightIcon = registerIcon('panel-align-right', Codicon.layoutPanelRight, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelBottomRight',
+    "Represents the bottom panel alignment set to the right"
+)));
+const panelAlignmentCenterIcon = registerIcon('panel-align-center', Codicon.layoutPanelCenter, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelBottomCenter',
+    "Represents the bottom panel alignment set to the center"
+)));
+const panelAlignmentJustifyIcon = registerIcon('panel-align-justify', Codicon.layoutPanelJustify, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'panelBottomJustify',
+    "Represents the bottom panel alignment set to justified"
+)));
+const fullscreenIcon = registerIcon('fullscreen', Codicon.screenFull, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'fullScreenIcon',
+    "Represents full screen"
+)));
+const centerLayoutIcon = registerIcon('centerLayoutIcon', Codicon.layoutCentered, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'centerLayoutIcon',
+    "Represents centered layout mode"
+)));
+const zenModeIcon = registerIcon('zenMode', Codicon.target, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'zenModeIcon',
+    "Represents zen mode"
+)));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closeSidebar',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'closeSidebar', "Close Primary Side Bar"), original: 'Close Primary Side Bar' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'closeSidebar',
+                "Close Primary Side Bar"
+            )), original: 'Close Primary Side Bar' },
             category: Categories.View,
             f1: true
         });
@@ -58,8 +126,16 @@ class ToggleActivityBarVisibilityAction extends Action2 {
         super({
             id: ToggleActivityBarVisibilityAction.ID,
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleActivityBar', "Toggle Activity Bar Visibility"),
-                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miActivityBar', comment: ['&& denotes a mnemonic'] }, "&&Activity Bar"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleActivityBar',
+                    "Toggle Activity Bar Visibility"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'miActivityBar', comment: ['&& denotes a mnemonic'] },
+                    "&&Activity Bar"
+                )),
                 original: 'Toggle Activity Bar Visibility'
             },
             category: Categories.View,
@@ -86,8 +162,16 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.toggleCenteredLayout',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleCenteredLayout', "Toggle Centered Layout"),
-                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miToggleCenteredLayout', comment: ['&& denotes a mnemonic'] }, "&&Centered Layout"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleCenteredLayout',
+                    "Toggle Centered Layout"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'miToggleCenteredLayout', comment: ['&& denotes a mnemonic'] },
+                    "&&Centered Layout"
+                )),
                 original: 'Toggle Centered Layout'
             },
             category: Categories.View,
@@ -128,7 +212,11 @@ class MoveSidebarRightAction extends MoveSidebarPositionAction {
     static { this.ID = 'workbench.action.moveSideBarRight'; }
     constructor() {
         super(MoveSidebarRightAction.ID, {
-            value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveSidebarRight', "Move Primary Side Bar Right"),
+            value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'moveSidebarRight',
+                "Move Primary Side Bar Right"
+            )),
             original: 'Move Primary Side Bar Right'
         }, 1 );
     }
@@ -137,7 +225,11 @@ class MoveSidebarLeftAction extends MoveSidebarPositionAction {
     static { this.ID = 'workbench.action.moveSideBarLeft'; }
     constructor() {
         super(MoveSidebarLeftAction.ID, {
-            value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveSidebarLeft', "Move Primary Side Bar Left"),
+            value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'moveSidebarLeft',
+                "Move Primary Side Bar Left"
+            )),
             original: 'Move Primary Side Bar Left'
         }, 0 );
     }
@@ -146,14 +238,30 @@ registerAction2(MoveSidebarRightAction);
 registerAction2(MoveSidebarLeftAction);
 class ToggleSidebarPositionAction extends Action2 {
     static { this.ID = 'workbench.action.toggleSidebarPosition'; }
-    static { this.LABEL = localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleSidebarPosition', "Toggle Primary Side Bar Position"); }
+    static { this.LABEL = ( localizeWithPath(
+        'vs/workbench/browser/actions/layoutActions',
+        'toggleSidebarPosition',
+        "Toggle Primary Side Bar Position"
+    )); }
     static getLabel(layoutService) {
-        return layoutService.getSideBarPosition() === 0  ? localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveSidebarRight', "Move Primary Side Bar Right") : localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveSidebarLeft', "Move Primary Side Bar Left");
+        return layoutService.getSideBarPosition() === 0  ? ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'moveSidebarRight',
+            "Move Primary Side Bar Right"
+        )) : ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'moveSidebarLeft',
+            "Move Primary Side Bar Left"
+        ));
     }
     constructor() {
         super({
             id: ToggleSidebarPositionAction.ID,
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleSidebarPosition', "Toggle Primary Side Bar Position"), original: 'Toggle Primary Side Bar Position' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'toggleSidebarPosition',
+                "Toggle Primary Side Bar Position"
+            )), original: 'Toggle Primary Side Bar Position' },
             category: Categories.View,
             f1: true
         });
@@ -167,124 +275,26 @@ class ToggleSidebarPositionAction extends Action2 {
     }
 }
 registerAction2(ToggleSidebarPositionAction);
-const configureLayoutIcon = registerIcon('configure-layout-icon', Codicon.layout, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'cofigureLayoutIcon', 'Icon represents workbench layout configuration.'));
-( MenuRegistry.appendMenuItem(MenuId.LayoutControlMenu, {
-    submenu: MenuId.LayoutControlMenuSubmenu,
-    title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'configureLayout', "Configure Layout"),
-    icon: configureLayoutIcon,
-    group: '1_workbench_layout',
-    when: ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'menu'))
-}));
-( MenuRegistry.appendMenuItems([{
-        id: MenuId.ViewContainerTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarPositionAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'move side bar right', "Move Primary Side Bar Right")
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
-                'viewContainerLocation',
-                ViewContainerLocationToString(0 )
-            )))),
-            order: 1
-        }
-    }, {
-        id: MenuId.ViewTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarPositionAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'move sidebar right', "Move Primary Side Bar Right")
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
-                'viewLocation',
-                ViewContainerLocationToString(0 )
-            )))),
-            order: 1
-        }
-    }, {
-        id: MenuId.ViewContainerTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarPositionAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'move sidebar left', "Move Primary Side Bar Left")
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
-                'viewContainerLocation',
-                ViewContainerLocationToString(0 )
-            )))),
-            order: 1
-        }
-    }, {
-        id: MenuId.ViewTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarPositionAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'move sidebar left', "Move Primary Side Bar Left")
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
-                'viewLocation',
-                ViewContainerLocationToString(0 )
-            )))),
-            order: 1
-        }
-    }, {
-        id: MenuId.ViewTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarPositionAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'move second sidebar left', "Move Secondary Side Bar Left")
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
-                'viewLocation',
-                ViewContainerLocationToString(2 )
-            )))),
-            order: 1
-        }
-    }, {
-        id: MenuId.ViewTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarPositionAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'move second sidebar right', "Move Secondary Side Bar Right")
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
-                'viewLocation',
-                ViewContainerLocationToString(2 )
-            )))),
-            order: 1
-        }
-    }]));
-( MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-    group: '3_workbench_layout_move',
-    command: {
-        id: ToggleSidebarPositionAction.ID,
-        title: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miMoveSidebarRight', comment: ['&& denotes a mnemonic'] }, "&&Move Primary Side Bar Right")
-    },
-    when: ( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')),
-    order: 2
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-    group: '3_workbench_layout_move',
-    command: {
-        id: ToggleSidebarPositionAction.ID,
-        title: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miMoveSidebarLeft', comment: ['&& denotes a mnemonic'] }, "&&Move Primary Side Bar Left")
-    },
-    when: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')),
-    order: 2
-}));
+const configureLayoutIcon = registerIcon('configure-layout-icon', Codicon.layout, ( localizeWithPath(
+    'vs/workbench/browser/actions/layoutActions',
+    'cofigureLayoutIcon',
+    'Icon represents workbench layout configuration.'
+)));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleEditorVisibility',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleEditor', "Toggle Editor Area Visibility"),
-                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miShowEditorArea', comment: ['&& denotes a mnemonic'] }, "Show &&Editor Area"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleEditor',
+                    "Toggle Editor Area Visibility"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'miShowEditorArea', comment: ['&& denotes a mnemonic'] },
+                    "Show &&Editor Area"
+                )),
                 original: 'Toggle Editor Area Visibility'
             },
             category: Categories.View,
@@ -297,22 +307,28 @@ registerAction2(class extends Action2 {
         accessor.get(IWorkbenchLayoutService).toggleMaximizedPanel();
     }
 });
-( MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-    group: '2_appearance',
-    title: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miAppearance', comment: ['&& denotes a mnemonic'] }, "&&Appearance"),
-    submenu: MenuId.MenubarAppearanceMenu,
-    order: 1
-}));
 class ToggleSidebarVisibilityAction extends Action2 {
     static { this.ID = 'workbench.action.toggleSidebarVisibility'; }
     constructor() {
         super({
             id: ToggleSidebarVisibilityAction.ID,
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleSidebar', "Toggle Primary Side Bar Visibility"), original: 'Toggle Primary Side Bar Visibility' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'toggleSidebar',
+                "Toggle Primary Side Bar Visibility"
+            )), original: 'Toggle Primary Side Bar Visibility' },
             toggled: {
                 condition: SideBarVisibleContext,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'primary sidebar', "Primary Side Bar"),
-                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'primary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Primary Side Bar"),
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'primary sidebar',
+                    "Primary Side Bar"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'primary sidebar mnemonic', comment: ['&& denotes a mnemonic'] },
+                    "&&Primary Side Bar"
+                )),
             },
             category: Categories.View,
             f1: true,
@@ -340,63 +356,6 @@ class ToggleSidebarVisibilityAction extends Action2 {
     }
 }
 registerAction2(ToggleSidebarVisibilityAction);
-( MenuRegistry.appendMenuItems([
-    {
-        id: MenuId.ViewContainerTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarVisibilityAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'compositePart.hideSideBarLabel', "Hide Primary Side Bar"),
-            },
-            when: ( ContextKeyExpr.and(SideBarVisibleContext, ( ContextKeyExpr.equals(
-                'viewContainerLocation',
-                ViewContainerLocationToString(0 )
-            )))),
-            order: 2
-        }
-    }, {
-        id: MenuId.ViewTitleContext,
-        item: {
-            group: '3_workbench_layout_move',
-            command: {
-                id: ToggleSidebarVisibilityAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'compositePart.hideSideBarLabel', "Hide Primary Side Bar"),
-            },
-            when: ( ContextKeyExpr.and(SideBarVisibleContext, ( ContextKeyExpr.equals(
-                'viewLocation',
-                ViewContainerLocationToString(0 )
-            )))),
-            order: 2
-        }
-    }, {
-        id: MenuId.LayoutControlMenu,
-        item: {
-            group: '0_workbench_toggles',
-            command: {
-                id: ToggleSidebarVisibilityAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleSideBar', "Toggle Primary Side Bar"),
-                icon: panelLeftOffIcon,
-                toggled: { condition: SideBarVisibleContext, icon: panelLeftIcon }
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')), ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')))), ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')))),
-            order: 0
-        }
-    }, {
-        id: MenuId.LayoutControlMenu,
-        item: {
-            group: '0_workbench_toggles',
-            command: {
-                id: ToggleSidebarVisibilityAction.ID,
-                title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleSideBar', "Toggle Primary Side Bar"),
-                icon: panelRightOffIcon,
-                toggled: { condition: SideBarVisibleContext, icon: panelRightIcon }
-            },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')), ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')))), ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')))),
-            order: 2
-        }
-    }
-]));
 class ToggleStatusbarVisibilityAction extends Action2 {
     static { this.ID = 'workbench.action.toggleStatusbarVisibility'; }
     static { this.statusbarVisibleKey = 'workbench.statusBar.visible'; }
@@ -404,8 +363,16 @@ class ToggleStatusbarVisibilityAction extends Action2 {
         super({
             id: ToggleStatusbarVisibilityAction.ID,
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleStatusbar', "Toggle Status Bar Visibility"),
-                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miStatusbar', comment: ['&& denotes a mnemonic'] }, "S&&tatus Bar"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleStatusbar',
+                    "Toggle Status Bar Visibility"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'miStatusbar', comment: ['&& denotes a mnemonic'] },
+                    "S&&tatus Bar"
+                )),
                 original: 'Toggle Status Bar Visibility'
             },
             category: Categories.View,
@@ -441,7 +408,11 @@ class ToggleTabsVisibilityAction extends BaseToggleBooleanSettingAction {
         super({
             id: ToggleTabsVisibilityAction.ID,
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleTabs', "Toggle Editor Tab Visibility"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleTabs',
+                    "Toggle Editor Tab Visibility"
+                )),
                 original: 'Toggle Editor Tab Visibility'
             },
             category: Categories.View,
@@ -459,7 +430,11 @@ class ToggleSeparatePinnedTabsAction extends BaseToggleBooleanSettingAction {
         super({
             id: ToggleSeparatePinnedTabsAction.ID,
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleSeparatePinnedEditorTabs', "Separate Pinned Editor Tabs"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleSeparatePinnedEditorTabs',
+                    "Separate Pinned Editor Tabs"
+                )),
                 original: 'Separate Pinned Editor Tabs'
             },
             category: Categories.View,
@@ -477,8 +452,16 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.toggleZenMode',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleZenMode', "Toggle Zen Mode"),
-                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miToggleZenMode', comment: ['&& denotes a mnemonic'] }, "Zen Mode"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleZenMode',
+                    "Toggle Zen Mode"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'miToggleZenMode', comment: ['&& denotes a mnemonic'] },
+                    "Zen Mode"
+                )),
                 original: 'Toggle Zen Mode'
             },
             category: Categories.View,
@@ -518,8 +501,16 @@ if (isWindows || isLinux || isWeb) {
             super({
                 id: 'workbench.action.toggleMenuBar',
                 title: {
-                    value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleMenuBar', "Toggle Menu Bar"),
-                    mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'miMenuBar', comment: ['&& denotes a mnemonic'] }, "Menu &&Bar"),
+                    value: ( localizeWithPath(
+                        'vs/workbench/browser/actions/layoutActions',
+                        'toggleMenuBar',
+                        "Toggle Menu Bar"
+                    )),
+                    mnemonicTitle: ( localizeWithPath(
+                        'vs/workbench/browser/actions/layoutActions',
+                        { key: 'miMenuBar', comment: ['&& denotes a mnemonic'] },
+                        "Menu &&Bar"
+                    )),
                     original: 'Toggle Menu Bar'
                 },
                 category: Categories.View,
@@ -536,21 +527,17 @@ if (isWindows || isLinux || isWeb) {
             return accessor.get(IWorkbenchLayoutService).toggleMenuBar();
         }
     });
-    ( MenuRegistry.appendMenuItem(MenuId.TitleBarContext, {
-        command: {
-            id: 'workbench.action.toggleMenuBar',
-            title: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'miMenuBarNoMnemonic', "Menu Bar"),
-            toggled: ( ContextKeyExpr.and(( IsMacNativeContext.toNegated()), ( ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden')), ( ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle')), ( ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))))
-        },
-        order: 0
-    }));
 }
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.resetViewLocations',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'resetViewLocations', "Reset View Locations"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'resetViewLocations',
+                    "Reset View Locations"
+                )),
                 original: 'Reset View Locations'
             },
             category: Categories.View,
@@ -566,7 +553,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.moveView',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveView', "Move View"),
+                value: ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveView', "Move View")),
                 original: 'Move View'
             },
             category: Categories.View,
@@ -606,7 +593,12 @@ registerAction2(class extends Action2 {
                     if (!hasAddedView) {
                         results.push({
                             type: 'separator',
-                            label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'sidebarContainer', "Side Bar / {0}", containerModel.title)
+                            label: ( localizeWithPath(
+                                'vs/workbench/browser/actions/layoutActions',
+                                'sidebarContainer',
+                                "Side Bar / {0}",
+                                containerModel.title
+                            ))
                         });
                         hasAddedView = true;
                     }
@@ -627,7 +619,12 @@ registerAction2(class extends Action2 {
                     if (!hasAddedView) {
                         results.push({
                             type: 'separator',
-                            label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelContainer', "Panel / {0}", containerModel.title)
+                            label: ( localizeWithPath(
+                                'vs/workbench/browser/actions/layoutActions',
+                                'panelContainer',
+                                "Panel / {0}",
+                                containerModel.title
+                            ))
                         });
                         hasAddedView = true;
                     }
@@ -648,7 +645,12 @@ registerAction2(class extends Action2 {
                     if (!hasAddedView) {
                         results.push({
                             type: 'separator',
-                            label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'secondarySideBarContainer', "Secondary Side Bar / {0}", containerModel.title)
+                            label: ( localizeWithPath(
+                                'vs/workbench/browser/actions/layoutActions',
+                                'secondarySideBarContainer',
+                                "Secondary Side Bar / {0}",
+                                containerModel.title
+                            ))
                         });
                         hasAddedView = true;
                     }
@@ -663,7 +665,11 @@ registerAction2(class extends Action2 {
     }
     async getView(quickInputService, viewDescriptorService, paneCompositePartService, viewId) {
         const quickPick = quickInputService.createQuickPick();
-        quickPick.placeholder = localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView.selectView', "Select a View to Move");
+        quickPick.placeholder = ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'moveFocusedView.selectView',
+            "Select a View to Move"
+        ));
         quickPick.items = this.getViewItems(viewDescriptorService, paneCompositePartService);
         quickPick.selectedItems = quickPick.items.filter(item => item.id === viewId);
         return ( new Promise((resolve, reject) => {
@@ -687,7 +693,11 @@ class MoveFocusedViewAction extends Action2 {
         super({
             id: 'workbench.action.moveFocusedView',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView', "Move Focused View"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'moveFocusedView',
+                    "Move Focused View"
+                )),
                 original: 'Move Focused View'
             },
             category: Categories.View,
@@ -704,17 +714,34 @@ class MoveFocusedViewAction extends Action2 {
         const paneCompositePartService = accessor.get(IPaneCompositePartService);
         const focusedViewId = viewId || FocusedViewContext.getValue(contextKeyService);
         if (focusedViewId === undefined || focusedViewId.trim() === '') {
-            dialogService.error(localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView.error.noFocusedView', "There is no view currently focused."));
+            dialogService.error(( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'moveFocusedView.error.noFocusedView',
+                "There is no view currently focused."
+            )));
             return;
         }
         const viewDescriptor = viewDescriptorService.getViewDescriptorById(focusedViewId);
         if (!viewDescriptor || !viewDescriptor.canMoveView) {
-            dialogService.error(localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView.error.nonMovableView', "The currently focused view is not movable."));
+            dialogService.error(( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'moveFocusedView.error.nonMovableView',
+                "The currently focused view is not movable."
+            )));
             return;
         }
         const quickPick = quickInputService.createQuickPick();
-        quickPick.placeholder = localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView.selectDestination', "Select a Destination for the View");
-        quickPick.title = localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'moveFocusedView.title', comment: ['{0} indicates the title of the view the user has selected to move.'] }, "View: Move {0}", viewDescriptor.name);
+        quickPick.placeholder = ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'moveFocusedView.selectDestination',
+            "Select a Destination for the View"
+        ));
+        quickPick.title = ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            { key: 'moveFocusedView.title', comment: ['{0} indicates the title of the view the user has selected to move.'] },
+            "View: Move {0}",
+            viewDescriptor.name
+        ));
         const items = [];
         const currentContainer = viewDescriptorService.getViewContainerByViewId(focusedViewId);
         const currentLocation = viewDescriptorService.getViewLocationById(focusedViewId);
@@ -722,24 +749,36 @@ class MoveFocusedViewAction extends Action2 {
         if (!((isViewSolo && currentLocation === 1) )) {
             items.push({
                 id: '_.panel.newcontainer',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', { key: 'moveFocusedView.newContainerInPanel', comment: ['Creates a new top-level tab in the panel.'] }, "New Panel Entry"),
+                label: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    { key: 'moveFocusedView.newContainerInPanel', comment: ['Creates a new top-level tab in the panel.'] },
+                    "New Panel Entry"
+                )),
             });
         }
         if (!((isViewSolo && currentLocation === 0) )) {
             items.push({
                 id: '_.sidebar.newcontainer',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView.newContainerInSidebar', "New Side Bar Entry")
+                label: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'moveFocusedView.newContainerInSidebar',
+                    "New Side Bar Entry"
+                ))
             });
         }
         if (!((isViewSolo && currentLocation === 2) )) {
             items.push({
                 id: '_.auxiliarybar.newcontainer',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'moveFocusedView.newContainerInSidePanel', "New Secondary Side Bar Entry")
+                label: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'moveFocusedView.newContainerInSidePanel',
+                    "New Secondary Side Bar Entry"
+                ))
             });
         }
         items.push({
             type: 'separator',
-            label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'sidebar', "Side Bar")
+            label: ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'sidebar', "Side Bar"))
         });
         const pinnedViewlets = paneCompositePartService.getVisiblePaneCompositeIds(0 );
         items.push(...( pinnedViewlets
@@ -757,7 +796,7 @@ class MoveFocusedViewAction extends Action2 {
         })));
         items.push({
             type: 'separator',
-            label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panel', "Panel")
+            label: ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panel', "Panel"))
         });
         const pinnedPanels = paneCompositePartService.getPinnedPaneCompositeIds(1 );
         items.push(...( pinnedPanels
@@ -775,7 +814,11 @@ class MoveFocusedViewAction extends Action2 {
         })));
         items.push({
             type: 'separator',
-            label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'secondarySideBar', "Secondary Side Bar")
+            label: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'secondarySideBar',
+                "Secondary Side Bar"
+            ))
         });
         const pinnedAuxPanels = paneCompositePartService.getPinnedPaneCompositeIds(2 );
         items.push(...( pinnedAuxPanels
@@ -821,7 +864,11 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.resetFocusedViewLocation',
             title: {
-                value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'resetFocusedViewLocation', "Reset Focused View Location"),
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'resetFocusedViewLocation',
+                    "Reset Focused View Location"
+                )),
                 original: 'Reset Focused View Location'
             },
             category: Categories.View,
@@ -840,7 +887,11 @@ registerAction2(class extends Action2 {
             viewDescriptor = viewDescriptorService.getViewDescriptorById(focusedViewId);
         }
         if (!viewDescriptor) {
-            dialogService.error(localizeWithPath('vs/workbench/browser/actions/layoutActions', 'resetFocusedView.error.noFocusedView', "There is no view currently focused."));
+            dialogService.error(( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'resetFocusedView.error.noFocusedView',
+                "There is no view currently focused."
+            )));
             return;
         }
         const defaultContainer = viewDescriptorService.getDefaultContainerById(viewDescriptor.id);
@@ -885,7 +936,11 @@ class IncreaseViewSizeAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewSize',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'increaseViewSize', "Increase Current View Size"), original: 'Increase Current View Size' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'increaseViewSize',
+                "Increase Current View Size"
+            )), original: 'Increase Current View Size' },
             f1: true
         });
     }
@@ -897,7 +952,11 @@ class IncreaseViewWidthAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewWidth',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'increaseEditorWidth', "Increase Editor Width"), original: 'Increase Editor Width' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'increaseEditorWidth',
+                "Increase Editor Width"
+            )), original: 'Increase Editor Width' },
             f1: true
         });
     }
@@ -909,7 +968,11 @@ class IncreaseViewHeightAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewHeight',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'increaseEditorHeight', "Increase Editor Height"), original: 'Increase Editor Height' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'increaseEditorHeight',
+                "Increase Editor Height"
+            )), original: 'Increase Editor Height' },
             f1: true
         });
     }
@@ -921,7 +984,11 @@ class DecreaseViewSizeAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewSize',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'decreaseViewSize', "Decrease Current View Size"), original: 'Decrease Current View Size' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'decreaseViewSize',
+                "Decrease Current View Size"
+            )), original: 'Decrease Current View Size' },
             f1: true
         });
     }
@@ -933,7 +1000,11 @@ class DecreaseViewWidthAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewWidth',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'decreaseEditorWidth', "Decrease Editor Width"), original: 'Decrease Editor Width' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'decreaseEditorWidth',
+                "Decrease Editor Width"
+            )), original: 'Decrease Editor Width' },
             f1: true
         });
     }
@@ -945,7 +1016,11 @@ class DecreaseViewHeightAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewHeight',
-            title: { value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'decreaseEditorHeight', "Decrease Editor Height"), original: 'Decrease Editor Height' },
+            title: { value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'decreaseEditorHeight',
+                "Decrease Editor Height"
+            )), original: 'Decrease Editor Height' },
             f1: true
         });
     }
@@ -970,8 +1045,16 @@ const CreateToggleLayoutItem = (id, active, label, visualIcon) => {
         visualIcon,
         activeIcon: Codicon.eye,
         inactiveIcon: Codicon.eyeClosed,
-        activeAriaLabel: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'selectToHide', "Select to Hide"),
-        inactiveAriaLabel: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'selectToShow', "Select to Show"),
+        activeAriaLabel: ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'selectToHide',
+            "Select to Hide"
+        )),
+        inactiveAriaLabel: ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'selectToShow',
+            "Select to Show"
+        )),
         useButtons: true,
     };
 };
@@ -982,36 +1065,52 @@ const CreateOptionLayoutItem = (id, active, label, visualIcon) => {
         label,
         visualIcon,
         activeIcon: Codicon.check,
-        activeAriaLabel: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'active', "Active"),
+        activeAriaLabel: ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'active', "Active")),
         useButtons: false
     };
 };
 const MenuBarToggledContext = ( ContextKeyExpr.and(( IsMacNativeContext.toNegated()), ( ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden')), ( ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle')), ( ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))));
 const ToggleVisibilityActions = [];
 if (!isMacintosh || !isNative) {
-    ToggleVisibilityActions.push(CreateToggleLayoutItem('workbench.action.toggleMenuBar', MenuBarToggledContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'menuBar', "Menu Bar"), menubarIcon));
+    ToggleVisibilityActions.push(CreateToggleLayoutItem('workbench.action.toggleMenuBar', MenuBarToggledContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'menuBar', "Menu Bar")), menubarIcon));
 }
 ToggleVisibilityActions.push(...[
-    CreateToggleLayoutItem(ToggleActivityBarVisibilityAction.ID, ( ContextKeyExpr.equals('config.workbench.activityBar.visible', true)), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'activityBar', "Activity Bar"), { whenA: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
-    CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'sideBar', "Primary Side Bar"), { whenA: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), iconA: panelLeftIcon, iconB: panelRightIcon }),
-    CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'secondarySideBar', "Secondary Side Bar"), { whenA: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), iconA: panelRightIcon, iconB: panelLeftIcon }),
-    CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panel', "Panel"), panelIcon),
-    CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ( ContextKeyExpr.equals('config.workbench.statusBar.visible', true)), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'statusBar', "Status Bar"), statusBarIcon),
+    CreateToggleLayoutItem(ToggleActivityBarVisibilityAction.ID, ( ContextKeyExpr.equals('config.workbench.activityBar.visible', true)), ( localizeWithPath(
+        'vs/workbench/browser/actions/layoutActions',
+        'activityBar',
+        "Activity Bar"
+    )), { whenA: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
+    CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, ( localizeWithPath(
+        'vs/workbench/browser/actions/layoutActions',
+        'sideBar',
+        "Primary Side Bar"
+    )), { whenA: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), iconA: panelLeftIcon, iconB: panelRightIcon }),
+    CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, ( localizeWithPath(
+        'vs/workbench/browser/actions/layoutActions',
+        'secondarySideBar',
+        "Secondary Side Bar"
+    )), { whenA: ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), iconA: panelRightIcon, iconB: panelLeftIcon }),
+    CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panel', "Panel")), panelIcon),
+    CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ( ContextKeyExpr.equals('config.workbench.statusBar.visible', true)), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'statusBar', "Status Bar")), statusBarIcon),
 ]);
 const MoveSideBarActions = [
-    CreateOptionLayoutItem(MoveSidebarLeftAction.ID, ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'leftSideBar', "Left"), panelLeftIcon),
-    CreateOptionLayoutItem(MoveSidebarRightAction.ID, ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'rightSideBar', "Right"), panelRightIcon),
+    CreateOptionLayoutItem(MoveSidebarLeftAction.ID, ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'leftSideBar', "Left")), panelLeftIcon),
+    CreateOptionLayoutItem(MoveSidebarRightAction.ID, ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'rightSideBar', "Right")), panelRightIcon),
 ];
 const AlignPanelActions = [
-    CreateOptionLayoutItem('workbench.action.alignPanelLeft', ( PanelAlignmentContext.isEqualTo('left')), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'leftPanel', "Left"), panelAlignmentLeftIcon),
-    CreateOptionLayoutItem('workbench.action.alignPanelRight', ( PanelAlignmentContext.isEqualTo('right')), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'rightPanel', "Right"), panelAlignmentRightIcon),
-    CreateOptionLayoutItem('workbench.action.alignPanelCenter', ( PanelAlignmentContext.isEqualTo('center')), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'centerPanel', "Center"), panelAlignmentCenterIcon),
-    CreateOptionLayoutItem('workbench.action.alignPanelJustify', ( PanelAlignmentContext.isEqualTo('justify')), localizeWithPath('vs/workbench/browser/actions/layoutActions', 'justifyPanel', "Justify"), panelAlignmentJustifyIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelLeft', ( PanelAlignmentContext.isEqualTo('left')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'leftPanel', "Left")), panelAlignmentLeftIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelRight', ( PanelAlignmentContext.isEqualTo('right')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'rightPanel', "Right")), panelAlignmentRightIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelCenter', ( PanelAlignmentContext.isEqualTo('center')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'centerPanel', "Center")), panelAlignmentCenterIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelJustify', ( PanelAlignmentContext.isEqualTo('justify')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'justifyPanel', "Justify")), panelAlignmentJustifyIcon),
 ];
 const MiscLayoutOptions = [
-    CreateOptionLayoutItem('workbench.action.toggleFullScreen', IsFullscreenContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'fullscreen', "Full Screen"), fullscreenIcon),
-    CreateOptionLayoutItem('workbench.action.toggleZenMode', InEditorZenModeContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'zenMode', "Zen Mode"), zenModeIcon),
-    CreateOptionLayoutItem('workbench.action.toggleCenteredLayout', IsCenteredLayoutContext, localizeWithPath('vs/workbench/browser/actions/layoutActions', 'centeredLayout', "Centered Layout"), centerLayoutIcon),
+    CreateOptionLayoutItem('workbench.action.toggleFullScreen', IsFullscreenContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'fullscreen', "Full Screen")), fullscreenIcon),
+    CreateOptionLayoutItem('workbench.action.toggleZenMode', InEditorZenModeContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'zenMode', "Zen Mode")), zenModeIcon),
+    CreateOptionLayoutItem('workbench.action.toggleCenteredLayout', IsCenteredLayoutContext, ( localizeWithPath(
+        'vs/workbench/browser/actions/layoutActions',
+        'centeredLayout',
+        "Centered Layout"
+    )), centerLayoutIcon),
 ];
 const LayoutContextKeySet = ( new Set());
 for (const { active } of [...ToggleVisibilityActions, ...MoveSideBarActions, ...AlignPanelActions, ...MiscLayoutOptions]) {
@@ -1023,7 +1122,11 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.customizeLayout',
-            title: { original: 'Customize Layout...', value: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'customizeLayout', "Customize Layout...") },
+            title: { original: 'Customize Layout...', value: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'customizeLayout',
+                "Customize Layout..."
+            )) },
             f1: true,
             icon: configureLayoutIcon,
             menu: [
@@ -1072,22 +1175,34 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         return [
             {
                 type: 'separator',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'toggleVisibility', "Visibility")
+                label: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleVisibility',
+                    "Visibility"
+                ))
             },
             ...( ToggleVisibilityActions.map(toQuickPickItem)),
             {
                 type: 'separator',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'sideBarPosition', "Primary Side Bar Position")
+                label: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'sideBarPosition',
+                    "Primary Side Bar Position"
+                ))
             },
             ...( MoveSideBarActions.map(toQuickPickItem)),
             {
                 type: 'separator',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'panelAlignment', "Panel Alignment")
+                label: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'panelAlignment',
+                    "Panel Alignment"
+                ))
             },
             ...( AlignPanelActions.map(toQuickPickItem)),
             {
                 type: 'separator',
-                label: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'layoutModes', "Modes"),
+                label: ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'layoutModes', "Modes")),
             },
             ...( MiscLayoutOptions.map(toQuickPickItem)),
         ];
@@ -1106,16 +1221,24 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         quickPick.items = this.getItems(contextKeyService);
         quickPick.ignoreFocusOut = true;
         quickPick.hideInput = true;
-        quickPick.title = localizeWithPath('vs/workbench/browser/actions/layoutActions', 'customizeLayoutQuickPickTitle', "Customize Layout");
+        quickPick.title = ( localizeWithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'customizeLayoutQuickPickTitle',
+            "Customize Layout"
+        ));
         const closeButton = {
             alwaysVisible: true,
             iconClass: ThemeIcon.asClassName(Codicon.close),
-            tooltip: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'close', "Close")
+            tooltip: ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'close', "Close"))
         };
         const resetButton = {
             alwaysVisible: true,
             iconClass: ThemeIcon.asClassName(Codicon.discard),
-            tooltip: localizeWithPath('vs/workbench/browser/actions/layoutActions', 'restore defaults', "Restore Defaults")
+            tooltip: ( localizeWithPath(
+                'vs/workbench/browser/actions/layoutActions',
+                'restore defaults',
+                "Restore Defaults"
+            ))
         };
         quickPick.buttons = [
             resetButton,