@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -2,16 +2,16 @@ import { localize2, localize } from '../../../nls.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../platform/actions/common/actions.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
-import { Position, Parts, LayoutSettings, EditorTabsMode, ZenModeSettings, EditorActionsLocation, positionToString } from '../../services/layout/browser/layoutService.js';
+import { positionToString } from '../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.service.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../base/common/keyCodes.js';
+import { KeyChord } from '../../../base/common/keyCodes.js';
 import { isWindows, isLinux, isWeb, isMacintosh, isNative } from '../../../base/common/platform.js';
 import { IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
-import { KeybindingWeight, KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.service.js';
-import { ViewContainerLocationToString, ViewContainerLocation } from '../../common/views.js';
+import { ViewContainerLocationToString } from '../../common/views.js';
 import { IViewDescriptorService } from '../../common/views.service.js';
 import { IViewsService } from '../../services/views/common/viewsService.service.js';
 import { IQuickInputService } from '../../../platform/quickinput/common/quickInput.service.js';
@@ -27,35 +27,34 @@ import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.service.js';
-import { TitlebarStyle } from '../../../platform/window/common/window.js';
 import { IPreferencesService } from '../../services/preferences/common/preferences.service.js';
-const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, ( localize(6803, "Represents the menu bar")));
-const activityBarLeftIcon = registerIcon('activity-bar-left', Codicon.layoutActivitybarLeft, ( localize(6804, "Represents the activity bar in the left position")));
-const activityBarRightIcon = registerIcon('activity-bar-right', Codicon.layoutActivitybarRight, ( localize(6805, "Represents the activity bar in the right position")));
-const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, ( localize(6806, "Represents a side bar in the left position")));
-const panelLeftOffIcon = registerIcon('panel-left-off', Codicon.layoutSidebarLeftOff, ( localize(6807, "Represents a side bar in the left position toggled off")));
-const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, ( localize(6808, "Represents side bar in the right position")));
-const panelRightOffIcon = registerIcon('panel-right-off', Codicon.layoutSidebarRightOff, ( localize(6809, "Represents side bar in the right position toggled off")));
-const panelIcon = registerIcon('panel-bottom', Codicon.layoutPanel, ( localize(6810, "Represents the bottom panel")));
-const statusBarIcon = registerIcon('statusBar', Codicon.layoutStatusbar, ( localize(6811, "Represents the status bar")));
-const panelAlignmentLeftIcon = registerIcon('panel-align-left', Codicon.layoutPanelLeft, ( localize(6812, "Represents the bottom panel alignment set to the left")));
-const panelAlignmentRightIcon = registerIcon('panel-align-right', Codicon.layoutPanelRight, ( localize(6813, "Represents the bottom panel alignment set to the right")));
-const panelAlignmentCenterIcon = registerIcon('panel-align-center', Codicon.layoutPanelCenter, ( localize(6814, "Represents the bottom panel alignment set to the center")));
-const panelAlignmentJustifyIcon = registerIcon('panel-align-justify', Codicon.layoutPanelJustify, ( localize(6815, "Represents the bottom panel alignment set to justified")));
-const fullscreenIcon = registerIcon('fullscreen', Codicon.screenFull, ( localize(6816, "Represents full screen")));
-const centerLayoutIcon = registerIcon('centerLayoutIcon', Codicon.layoutCentered, ( localize(6817, "Represents centered layout mode")));
-const zenModeIcon = registerIcon('zenMode', Codicon.target, ( localize(6818, "Represents zen mode")));
+const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, ( localize(6781, "Represents the menu bar")));
+const activityBarLeftIcon = registerIcon('activity-bar-left', Codicon.layoutActivitybarLeft, ( localize(6782, "Represents the activity bar in the left position")));
+const activityBarRightIcon = registerIcon('activity-bar-right', Codicon.layoutActivitybarRight, ( localize(6783, "Represents the activity bar in the right position")));
+const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, ( localize(6784, "Represents a side bar in the left position")));
+const panelLeftOffIcon = registerIcon('panel-left-off', Codicon.layoutSidebarLeftOff, ( localize(6785, "Represents a side bar in the left position toggled off")));
+const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, ( localize(6786, "Represents side bar in the right position")));
+const panelRightOffIcon = registerIcon('panel-right-off', Codicon.layoutSidebarRightOff, ( localize(6787, "Represents side bar in the right position toggled off")));
+const panelIcon = registerIcon('panel-bottom', Codicon.layoutPanel, ( localize(6788, "Represents the bottom panel")));
+const statusBarIcon = registerIcon('statusBar', Codicon.layoutStatusbar, ( localize(6789, "Represents the status bar")));
+const panelAlignmentLeftIcon = registerIcon('panel-align-left', Codicon.layoutPanelLeft, ( localize(6790, "Represents the bottom panel alignment set to the left")));
+const panelAlignmentRightIcon = registerIcon('panel-align-right', Codicon.layoutPanelRight, ( localize(6791, "Represents the bottom panel alignment set to the right")));
+const panelAlignmentCenterIcon = registerIcon('panel-align-center', Codicon.layoutPanelCenter, ( localize(6792, "Represents the bottom panel alignment set to the center")));
+const panelAlignmentJustifyIcon = registerIcon('panel-align-justify', Codicon.layoutPanelJustify, ( localize(6793, "Represents the bottom panel alignment set to justified")));
+const fullscreenIcon = registerIcon('fullscreen', Codicon.screenFull, ( localize(6794, "Represents full screen")));
+const centerLayoutIcon = registerIcon('centerLayoutIcon', Codicon.layoutCentered, ( localize(6795, "Represents centered layout mode")));
+const zenModeIcon = registerIcon('zenMode', Codicon.target, ( localize(6796, "Represents zen mode")));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closeSidebar',
-            title: ( localize2(6819, 'Close Primary Side Bar')),
+            title: ( localize2(6797, 'Close Primary Side Bar')),
             category: Categories.View,
             f1: true
         });
     }
     run(accessor) {
-        accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.SIDEBAR_PART);
+        accessor.get(IWorkbenchLayoutService).setPartHidden(true, "workbench.parts.sidebar" );
     }
 });
 const ToggleActivityBarVisibilityActionId = 'workbench.action.toggleActivityBarVisibility';
@@ -64,8 +63,8 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.toggleCenteredLayout',
             title: {
-                ...( localize2(6820, "Toggle Centered Layout")),
-                mnemonicTitle: ( localize(6821, "&&Centered Layout")),
+                ...( localize2(6798, "Toggle Centered Layout")),
+                mnemonicTitle: ( localize(6799, "&&Centered Layout")),
             },
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated())),
             category: Categories.View,
@@ -105,27 +104,27 @@ class MoveSidebarPositionAction extends Action2 {
 class MoveSidebarRightAction extends MoveSidebarPositionAction {
     static { this.ID = 'workbench.action.moveSideBarRight'; }
     constructor() {
-        super(MoveSidebarRightAction.ID, ( localize2(6822, "Move Primary Side Bar Right")), Position.RIGHT);
+        super(MoveSidebarRightAction.ID, ( localize2(6800, "Move Primary Side Bar Right")), 1 );
     }
 }
 class MoveSidebarLeftAction extends MoveSidebarPositionAction {
     static { this.ID = 'workbench.action.moveSideBarLeft'; }
     constructor() {
-        super(MoveSidebarLeftAction.ID, ( localize2(6823, "Move Primary Side Bar Left")), Position.LEFT);
+        super(MoveSidebarLeftAction.ID, ( localize2(6801, "Move Primary Side Bar Left")), 0 );
     }
 }
 registerAction2(MoveSidebarRightAction);
 registerAction2(MoveSidebarLeftAction);
 class ToggleSidebarPositionAction extends Action2 {
     static { this.ID = 'workbench.action.toggleSidebarPosition'; }
-    static { this.LABEL = ( localize(6824, "Toggle Primary Side Bar Position")); }
+    static { this.LABEL = ( localize(6802, "Toggle Primary Side Bar Position")); }
     static getLabel(layoutService) {
-        return layoutService.getSideBarPosition() === Position.LEFT ? ( localize(6822, "Move Primary Side Bar Right")) : ( localize(6823, "Move Primary Side Bar Left"));
+        return layoutService.getSideBarPosition() === 0  ? ( localize(6800, "Move Primary Side Bar Right")) : ( localize(6801, "Move Primary Side Bar Left"));
     }
     constructor() {
         super({
             id: ToggleSidebarPositionAction.ID,
-            title: ( localize2(6824, "Toggle Primary Side Bar Position")),
+            title: ( localize2(6802, "Toggle Primary Side Bar Position")),
             category: Categories.View,
             f1: true
         });
@@ -134,15 +133,15 @@ class ToggleSidebarPositionAction extends Action2 {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const configurationService = accessor.get(IConfigurationService);
         const position = layoutService.getSideBarPosition();
-        const newPositionValue = (position === Position.LEFT) ? 'right' : 'left';
+        const newPositionValue = ((position === 0) ) ? 'right' : 'left';
         return configurationService.updateValue(sidebarPositionConfigurationKey, newPositionValue);
     }
 }
 registerAction2(ToggleSidebarPositionAction);
-const configureLayoutIcon = registerIcon('configure-layout-icon', Codicon.layout, ( localize(6825, 'Icon represents workbench layout configuration.')));
+const configureLayoutIcon = registerIcon('configure-layout-icon', Codicon.layout, ( localize(6803, 'Icon represents workbench layout configuration.')));
 MenuRegistry.appendMenuItem(MenuId.LayoutControlMenu, {
     submenu: MenuId.LayoutControlMenuSubmenu,
-    title: ( localize(6826, "Configure Layout")),
+    title: ( localize(6804, "Configure Layout")),
     icon: configureLayoutIcon,
     group: '1_workbench_layout',
     when: ( (ContextKeyExpr.equals('config.workbench.layoutControl.type', 'menu')))
@@ -153,13 +152,13 @@ MenuRegistry.appendMenuItems([{
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarPositionAction.ID,
-                title: ( localize(6827, "Move Primary Side Bar Right"))
+                title: ( localize(6805, "Move Primary Side Bar Right"))
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')),
                  (ContextKeyExpr.equals(
                     'viewContainerLocation',
-                    ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+                    ViewContainerLocationToString(0 )
                 ))
             ))),
             order: 1
@@ -170,13 +169,13 @@ MenuRegistry.appendMenuItems([{
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarPositionAction.ID,
-                title: ( localize(6828, "Move Primary Side Bar Right"))
+                title: ( localize(6806, "Move Primary Side Bar Right"))
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')),
                  (ContextKeyExpr.equals(
                     'viewLocation',
-                    ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+                    ViewContainerLocationToString(0 )
                 ))
             ))),
             order: 1
@@ -187,13 +186,13 @@ MenuRegistry.appendMenuItems([{
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarPositionAction.ID,
-                title: ( localize(6829, "Move Primary Side Bar Left"))
+                title: ( localize(6807, "Move Primary Side Bar Left"))
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')),
                  (ContextKeyExpr.equals(
                     'viewContainerLocation',
-                    ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+                    ViewContainerLocationToString(0 )
                 ))
             ))),
             order: 1
@@ -204,13 +203,13 @@ MenuRegistry.appendMenuItems([{
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarPositionAction.ID,
-                title: ( localize(6829, "Move Primary Side Bar Left"))
+                title: ( localize(6807, "Move Primary Side Bar Left"))
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')),
                  (ContextKeyExpr.equals(
                     'viewLocation',
-                    ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+                    ViewContainerLocationToString(0 )
                 ))
             ))),
             order: 1
@@ -221,13 +220,13 @@ MenuRegistry.appendMenuItems([{
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarPositionAction.ID,
-                title: ( localize(6830, "Move Secondary Side Bar Left"))
+                title: ( localize(6808, "Move Secondary Side Bar Left"))
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')),
                  (ContextKeyExpr.equals(
                     'viewLocation',
-                    ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar)
+                    ViewContainerLocationToString(2 )
                 ))
             ))),
             order: 1
@@ -238,13 +237,13 @@ MenuRegistry.appendMenuItems([{
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarPositionAction.ID,
-                title: ( localize(6831, "Move Secondary Side Bar Right"))
+                title: ( localize(6809, "Move Secondary Side Bar Right"))
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')),
                  (ContextKeyExpr.equals(
                     'viewLocation',
-                    ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar)
+                    ViewContainerLocationToString(2 )
                 ))
             ))),
             order: 1
@@ -254,7 +253,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     group: '3_workbench_layout_move',
     command: {
         id: ToggleSidebarPositionAction.ID,
-        title: ( localize(6832, "&&Move Primary Side Bar Right"))
+        title: ( localize(6810, "&&Move Primary Side Bar Right"))
     },
     when: ( (ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'))),
     order: 2
@@ -263,7 +262,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     group: '3_workbench_layout_move',
     command: {
         id: ToggleSidebarPositionAction.ID,
-        title: ( localize(6833, "&&Move Primary Side Bar Left"))
+        title: ( localize(6811, "&&Move Primary Side Bar Left"))
     },
     when: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'))),
     order: 2
@@ -273,8 +272,8 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.toggleEditorVisibility',
             title: {
-                ...( localize2(6834, "Toggle Editor Area Visibility")),
-                mnemonicTitle: ( localize(6835, "Show &&Editor Area")),
+                ...( localize2(6812, "Toggle Editor Area Visibility")),
+                mnemonicTitle: ( localize(6813, "Show &&Editor Area")),
             },
             category: Categories.View,
             f1: true,
@@ -294,7 +293,7 @@ registerAction2(class extends Action2 {
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '2_appearance',
-    title: ( localize(6836, "&&Appearance")),
+    title: ( localize(6814, "&&Appearance")),
     submenu: MenuId.MenubarAppearanceMenu,
     order: 1
 });
@@ -303,17 +302,17 @@ class ToggleSidebarVisibilityAction extends Action2 {
     constructor() {
         super({
             id: ToggleSidebarVisibilityAction.ID,
-            title: ( localize2(6837, 'Toggle Primary Side Bar Visibility')),
+            title: ( localize2(6815, 'Toggle Primary Side Bar Visibility')),
             toggled: {
                 condition: SideBarVisibleContext,
-                title: ( localize(6838, "Primary Side Bar")),
-                mnemonicTitle: ( localize(6839, "&&Primary Side Bar")),
+                title: ( localize(6816, "Primary Side Bar")),
+                mnemonicTitle: ( localize(6817, "&&Primary Side Bar")),
             },
             category: Categories.View,
             f1: true,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod$1.CtrlCmd | KeyCode.KeyB
+                weight: 200 ,
+                primary: 2048  | 32
             },
             menu: [
                 {
@@ -331,7 +330,7 @@ class ToggleSidebarVisibilityAction extends Action2 {
     }
     run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
-        layoutService.setPartHidden(layoutService.isVisible(Parts.SIDEBAR_PART), Parts.SIDEBAR_PART);
+        layoutService.setPartHidden(layoutService.isVisible("workbench.parts.sidebar" ), "workbench.parts.sidebar" );
     }
 }
 registerAction2(ToggleSidebarVisibilityAction);
@@ -342,11 +341,11 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarVisibilityAction.ID,
-                title: ( localize(6840, "Hide Primary Side Bar")),
+                title: ( localize(6818, "Hide Primary Side Bar")),
             },
             when: ( (ContextKeyExpr.and(SideBarVisibleContext,  (ContextKeyExpr.equals(
                 'viewContainerLocation',
-                ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+                ViewContainerLocationToString(0 )
             ))))),
             order: 2
         }
@@ -356,11 +355,11 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleSidebarVisibilityAction.ID,
-                title: ( localize(6840, "Hide Primary Side Bar")),
+                title: ( localize(6818, "Hide Primary Side Bar")),
             },
             when: ( (ContextKeyExpr.and(SideBarVisibleContext,  (ContextKeyExpr.equals(
                 'viewLocation',
-                ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+                ViewContainerLocationToString(0 )
             ))))),
             order: 2
         }
@@ -370,7 +369,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleSidebarVisibilityAction.ID,
-                title: ( localize(6841, "Toggle Primary Side Bar")),
+                title: ( localize(6819, "Toggle Primary Side Bar")),
                 icon: panelLeftOffIcon,
                 toggled: { condition: SideBarVisibleContext, icon: panelLeftIcon }
             },
@@ -386,7 +385,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleSidebarVisibilityAction.ID,
-                title: ( localize(6841, "Toggle Primary Side Bar")),
+                title: ( localize(6819, "Toggle Primary Side Bar")),
                 icon: panelRightOffIcon,
                 toggled: { condition: SideBarVisibleContext, icon: panelRightIcon }
             },
@@ -405,8 +404,8 @@ class ToggleStatusbarVisibilityAction extends Action2 {
         super({
             id: ToggleStatusbarVisibilityAction.ID,
             title: {
-                ...( localize2(6842, "Toggle Status Bar Visibility")),
-                mnemonicTitle: ( localize(6843, "S&&tatus Bar")),
+                ...( localize2(6820, "Toggle Status Bar Visibility")),
+                mnemonicTitle: ( localize(6821, "S&&tatus Bar")),
             },
             category: Categories.View,
             f1: true,
@@ -421,7 +420,7 @@ class ToggleStatusbarVisibilityAction extends Action2 {
     run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const configurationService = accessor.get(IConfigurationService);
-        const visibility = layoutService.isVisible(Parts.STATUSBAR_PART, mainWindow);
+        const visibility = layoutService.isVisible("workbench.parts.statusbar" , mainWindow);
         const newVisibilityValue = !visibility;
         return configurationService.updateValue(ToggleStatusbarVisibilityAction.statusbarVisibleKey, newVisibilityValue);
     }
@@ -448,67 +447,67 @@ class AbstractSetShowTabsAction extends Action2 {
 class HideEditorTabsAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.hideEditorTabs'; }
     constructor() {
-        const precondition = ( (ContextKeyExpr.and(
-             (( (ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_TABS_MODE}`, EditorTabsMode.NONE))).negate()),
-             (InEditorZenModeContext.negate())
-        )));
-        const title = ( localize2(6844, 'Hide Editor Tabs'));
-        super(LayoutSettings.EDITOR_TABS_MODE, EditorTabsMode.NONE, title, HideEditorTabsAction.ID, precondition, ( localize2(6845, "Hide Tab Bar")));
+        const precondition = ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
+            `config.${"workbench.editor.showTabs" }`,
+            "none"
+        ))).negate()),  (InEditorZenModeContext.negate()))));
+        const title = ( localize2(6822, 'Hide Editor Tabs'));
+        super("workbench.editor.showTabs" , "none" , title, HideEditorTabsAction.ID, precondition, ( localize2(6823, "Hide Tab Bar")));
     }
 }
 class ZenHideEditorTabsAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.zenHideEditorTabs'; }
     constructor() {
-        const precondition = ( (ContextKeyExpr.and(
-             (( (ContextKeyExpr.equals(`config.${ZenModeSettings.SHOW_TABS}`, EditorTabsMode.NONE))).negate()),
-            InEditorZenModeContext
-        )));
-        const title = ( localize2(6846, 'Hide Editor Tabs in Zen Mode'));
-        super(ZenModeSettings.SHOW_TABS, EditorTabsMode.NONE, title, ZenHideEditorTabsAction.ID, precondition, ( localize2(6847, "Hide Tab Bar in Zen Mode")));
+        const precondition = ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
+            `config.${"zenMode.showTabs" }`,
+            "none"
+        ))).negate()), InEditorZenModeContext)));
+        const title = ( localize2(6824, 'Hide Editor Tabs in Zen Mode'));
+        super("zenMode.showTabs" , "none" , title, ZenHideEditorTabsAction.ID, precondition, ( localize2(6825, "Hide Tab Bar in Zen Mode")));
     }
 }
 class ShowMultipleEditorTabsAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.showMultipleEditorTabs'; }
     constructor() {
-        const precondition = ( (ContextKeyExpr.and(
-             (( (ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_TABS_MODE}`, EditorTabsMode.MULTIPLE))).negate()),
-             (InEditorZenModeContext.negate())
-        )));
-        const title = ( localize2(6848, 'Show Multiple Editor Tabs'));
-        super(LayoutSettings.EDITOR_TABS_MODE, EditorTabsMode.MULTIPLE, title, ShowMultipleEditorTabsAction.ID, precondition, ( localize2(6849, "Show Tab Bar with multiple tabs")));
+        const precondition = ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
+            `config.${"workbench.editor.showTabs" }`,
+            "multiple"
+        ))).negate()),  (InEditorZenModeContext.negate()))));
+        const title = ( localize2(6826, 'Show Multiple Editor Tabs'));
+        super("workbench.editor.showTabs" , "multiple" , title, ShowMultipleEditorTabsAction.ID, precondition, ( localize2(6827, "Show Tab Bar with multiple tabs")));
     }
 }
 class ZenShowMultipleEditorTabsAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.zenShowMultipleEditorTabs'; }
     constructor() {
-        const precondition = ( (ContextKeyExpr.and(
-             (( (ContextKeyExpr.equals(`config.${ZenModeSettings.SHOW_TABS}`, EditorTabsMode.MULTIPLE))).negate()),
-            InEditorZenModeContext
-        )));
-        const title = ( localize2(6850, 'Show Multiple Editor Tabs in Zen Mode'));
-        super(ZenModeSettings.SHOW_TABS, EditorTabsMode.MULTIPLE, title, ZenShowMultipleEditorTabsAction.ID, precondition, ( localize2(6851, "Show Tab Bar in Zen Mode")));
+        const precondition = ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
+            `config.${"zenMode.showTabs" }`,
+            "multiple"
+        ))).negate()), InEditorZenModeContext)));
+        const title = ( localize2(6828, 'Show Multiple Editor Tabs in Zen Mode'));
+        super("zenMode.showTabs" , "multiple" , title, ZenShowMultipleEditorTabsAction.ID, precondition, ( localize2(6829, "Show Tab Bar in Zen Mode")));
     }
 }
 class ShowSingleEditorTabAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.showEditorTab'; }
     constructor() {
-        const precondition = ( (ContextKeyExpr.and(
-             (( (ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_TABS_MODE}`, EditorTabsMode.SINGLE))).negate()),
-             (InEditorZenModeContext.negate())
-        )));
-        const title = ( localize2(6852, 'Show Single Editor Tab'));
-        super(LayoutSettings.EDITOR_TABS_MODE, EditorTabsMode.SINGLE, title, ShowSingleEditorTabAction.ID, precondition, ( localize2(6853, "Show Tab Bar with one Tab")));
+        const precondition = ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
+            `config.${"workbench.editor.showTabs" }`,
+            "single"
+        ))).negate()),  (InEditorZenModeContext.negate()))));
+        const title = ( localize2(6830, 'Show Single Editor Tab'));
+        super("workbench.editor.showTabs" , "single" , title, ShowSingleEditorTabAction.ID, precondition, ( localize2(6831, "Show Tab Bar with one Tab")));
     }
 }
 class ZenShowSingleEditorTabAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.zenShowEditorTab'; }
     constructor() {
-        const precondition = ( (ContextKeyExpr.and(
-             (( (ContextKeyExpr.equals(`config.${ZenModeSettings.SHOW_TABS}`, EditorTabsMode.SINGLE))).negate()),
-            InEditorZenModeContext
-        )));
-        const title = ( localize2(6854, 'Show Single Editor Tab in Zen Mode'));
-        super(ZenModeSettings.SHOW_TABS, EditorTabsMode.SINGLE, title, ZenShowSingleEditorTabAction.ID, precondition, ( localize2(6855, "Show Tab Bar in Zen Mode with one Tab")));
+        const precondition = ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
+            `config.${"zenMode.showTabs" }`,
+            "single"
+        ))).negate()), InEditorZenModeContext)));
+        const title = ( localize2(6832, 'Show Single Editor Tab in Zen Mode'));
+        super("zenMode.showTabs" , "single" , title, ZenShowSingleEditorTabAction.ID, precondition, ( localize2(6833, "Show Tab Bar in Zen Mode with one Tab")));
     }
 }
 registerAction2(HideEditorTabsAction);
@@ -519,14 +518,14 @@ registerAction2(ShowSingleEditorTabAction);
 registerAction2(ZenShowSingleEditorTabAction);
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.EditorTabsBarShowTabsSubmenu,
-    title: ( localize(6856, "Tab Bar")),
+    title: ( localize(6834, "Tab Bar")),
     group: '3_workbench_layout_move',
     order: 10,
     when: ( (InEditorZenModeContext.negate()))
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.EditorTabsBarShowTabsZenModeSubmenu,
-    title: ( localize(6856, "Tab Bar")),
+    title: ( localize(6834, "Tab Bar")),
     group: '3_workbench_layout_move',
     order: 10,
     when: InEditorZenModeContext
@@ -536,19 +535,19 @@ class EditorActionsTitleBarAction extends Action2 {
     constructor() {
         super({
             id: EditorActionsTitleBarAction.ID,
-            title: ( localize2(6857, "Move Editor Actions to Title Bar")),
+            title: ( localize2(6835, "Move Editor Actions to Title Bar")),
             category: Categories.View,
             precondition: ( (( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`,
-                EditorActionsLocation.TITLEBAR
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "titleBar"
             ))).negate())),
-            metadata: { description: ( localize2(6858, "Move Editor Actions from the tab bar to the title bar")) },
+            metadata: { description: ( localize2(6836, "Move Editor Actions from the tab bar to the title bar")) },
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue(LayoutSettings.EDITOR_ACTIONS_LOCATION, EditorActionsLocation.TITLEBAR);
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "titleBar" );
     }
 }
 registerAction2(EditorActionsTitleBarAction);
@@ -557,19 +556,22 @@ class EditorActionsDefaultAction extends Action2 {
     constructor() {
         super({
             id: EditorActionsDefaultAction.ID,
-            title: ( localize2(6859, "Move Editor Actions to Tab Bar")),
+            title: ( localize2(6837, "Move Editor Actions to Tab Bar")),
             category: Categories.View,
             precondition: ( (ContextKeyExpr.and( (( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`,
-                EditorActionsLocation.DEFAULT
-            ))).negate()),  (( (ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_TABS_MODE}`, EditorTabsMode.NONE))).negate())))),
-            metadata: { description: ( localize2(6860, "Move Editor Actions from the title bar to the tab bar")) },
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "default"
+            ))).negate()),  (( (ContextKeyExpr.equals(
+                `config.${"workbench.editor.showTabs" }`,
+                "none"
+            ))).negate())))),
+            metadata: { description: ( localize2(6838, "Move Editor Actions from the title bar to the tab bar")) },
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue(LayoutSettings.EDITOR_ACTIONS_LOCATION, EditorActionsLocation.DEFAULT);
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "default" );
     }
 }
 registerAction2(EditorActionsDefaultAction);
@@ -578,19 +580,19 @@ class HideEditorActionsAction extends Action2 {
     constructor() {
         super({
             id: HideEditorActionsAction.ID,
-            title: ( localize2(6861, "Hide Editor Actions")),
+            title: ( localize2(6839, "Hide Editor Actions")),
             category: Categories.View,
             precondition: ( (( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`,
-                EditorActionsLocation.HIDDEN
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "hidden"
             ))).negate())),
-            metadata: { description: ( localize2(6862, "Hide Editor Actions in the tab and title bar")) },
+            metadata: { description: ( localize2(6840, "Hide Editor Actions in the tab and title bar")) },
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue(LayoutSettings.EDITOR_ACTIONS_LOCATION, EditorActionsLocation.HIDDEN);
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "hidden" );
     }
 }
 registerAction2(HideEditorActionsAction);
@@ -599,25 +601,25 @@ class ShowEditorActionsAction extends Action2 {
     constructor() {
         super({
             id: ShowEditorActionsAction.ID,
-            title: ( localize2(6863, "Show Editor Actions")),
+            title: ( localize2(6841, "Show Editor Actions")),
             category: Categories.View,
             precondition: ( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.EDITOR_ACTIONS_LOCATION}`,
-                EditorActionsLocation.HIDDEN
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "hidden"
             ))),
-            metadata: { description: ( localize2(6864, "Make Editor Actions visible.")) },
+            metadata: { description: ( localize2(6842, "Make Editor Actions visible.")) },
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue(LayoutSettings.EDITOR_ACTIONS_LOCATION, EditorActionsLocation.DEFAULT);
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "default" );
     }
 }
 registerAction2(ShowEditorActionsAction);
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.EditorActionsPositionSubmenu,
-    title: ( localize(6865, "Editor Actions Position")),
+    title: ( localize(6843, "Editor Actions Position")),
     group: '3_workbench_layout_move',
     order: 11
 });
@@ -626,7 +628,7 @@ class ConfigureEditorTabsAction extends Action2 {
     constructor() {
         super({
             id: ConfigureEditorTabsAction.ID,
-            title: ( localize2(6866, "Configure Tabs")),
+            title: ( localize2(6844, "Configure Tabs")),
             category: Categories.View,
         });
     }
@@ -641,7 +643,7 @@ class ConfigureEditorAction extends Action2 {
     constructor() {
         super({
             id: ConfigureEditorAction.ID,
-            title: ( localize2(6867, "Configure Editors")),
+            title: ( localize2(6845, "Configure Editors")),
             category: Categories.View,
         });
     }
@@ -655,11 +657,14 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleSeparatePinnedEditorTabs',
-            title: ( localize2(6868, "Separate Pinned Editor Tabs")),
+            title: ( localize2(6846, "Separate Pinned Editor Tabs")),
             category: Categories.View,
-            precondition: ( (ContextKeyExpr.equals(`config.${LayoutSettings.EDITOR_TABS_MODE}`, EditorTabsMode.MULTIPLE))),
+            precondition: ( (ContextKeyExpr.equals(
+                `config.${"workbench.editor.showTabs" }`,
+                "multiple"
+            ))),
             metadata: { description: ( localize2(
-                6869,
+                6847,
                 "Toggle whether pinned editor tabs are shown on a separate row above unpinned tabs."
             )) },
             f1: true
@@ -677,15 +682,15 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.toggleZenMode',
             title: {
-                ...( localize2(6870, "Toggle Zen Mode")),
-                mnemonicTitle: ( localize(6871, "Zen Mode")),
+                ...( localize2(6848, "Toggle Zen Mode")),
+                mnemonicTitle: ( localize(6849, "Zen Mode")),
             },
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated())),
             category: Categories.View,
             f1: true,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyZ)
+                weight: 200 ,
+                primary: KeyChord(2048  | 41 , 56 )
             },
             toggled: InEditorZenModeContext,
             menu: [{
@@ -701,7 +706,7 @@ registerAction2(class extends Action2 {
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.exitZenMode',
-    weight: KeybindingWeight.EditorContrib - 1000,
+    weight: 100  - 1000,
     handler(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const contextKeyService = accessor.get(IContextKeyService);
@@ -710,7 +715,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     },
     when: InEditorZenModeContext,
-    primary: KeyChord(KeyCode.Escape, KeyCode.Escape)
+    primary: KeyChord(9 , 9 )
 });
 if (isWindows || isLinux || isWeb) {
     registerAction2(class ToggleMenubarAction extends Action2 {
@@ -718,8 +723,8 @@ if (isWindows || isLinux || isWeb) {
             super({
                 id: 'workbench.action.toggleMenuBar',
                 title: {
-                    ...( localize2(6872, "Toggle Menu Bar")),
-                    mnemonicTitle: ( localize(6873, "Menu &&Bar")),
+                    ...( localize2(6850, "Toggle Menu Bar")),
+                    mnemonicTitle: ( localize(6851, "Menu &&Bar")),
                 },
                 category: Categories.View,
                 f1: true,
@@ -744,7 +749,7 @@ if (isWindows || isLinux || isWeb) {
         MenuRegistry.appendMenuItem(menuId, {
             command: {
                 id: 'workbench.action.toggleMenuBar',
-                title: ( localize(6874, "Menu Bar")),
+                title: ( localize(6852, "Menu Bar")),
                 toggled: ( (ContextKeyExpr.and(
                      (IsMacNativeContext.toNegated()),
                      (ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden')),
@@ -754,7 +759,7 @@ if (isWindows || isLinux || isWeb) {
             },
             when: ( (ContextKeyExpr.and(
                  (IsAuxiliaryWindowFocusedContext.toNegated()),
-                 (ContextKeyExpr.notEquals(TitleBarStyleContext.key, TitlebarStyle.NATIVE)),
+                 (ContextKeyExpr.notEquals(TitleBarStyleContext.key, "native" )),
                  (IsMainWindowFullscreenContext.negate())
             ))),
             group: '2_config',
@@ -766,7 +771,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.resetViewLocations',
-            title: ( localize2(6875, "Reset View Locations")),
+            title: ( localize2(6853, "Reset View Locations")),
             category: Categories.View,
             f1: true
         });
@@ -779,7 +784,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.moveView',
-            title: ( localize2(6876, "Move View")),
+            title: ( localize2(6854, "Move View")),
             category: Categories.View,
             f1: true
         });
@@ -807,7 +812,7 @@ registerAction2(class extends Action2 {
     }
     getViewItems(viewDescriptorService, paneCompositePartService) {
         const results = [];
-        const viewlets = paneCompositePartService.getVisiblePaneCompositeIds(ViewContainerLocation.Sidebar);
+        const viewlets = paneCompositePartService.getVisiblePaneCompositeIds(0 );
         viewlets.forEach(viewletId => {
             const container = viewDescriptorService.getViewContainerById(viewletId);
             const containerModel = viewDescriptorService.getViewContainerModel(container);
@@ -817,7 +822,7 @@ registerAction2(class extends Action2 {
                     if (!hasAddedView) {
                         results.push({
                             type: 'separator',
-                            label: ( localize(6877, "Side Bar / {0}", containerModel.title))
+                            label: ( localize(6855, "Side Bar / {0}", containerModel.title))
                         });
                         hasAddedView = true;
                     }
@@ -828,7 +833,7 @@ registerAction2(class extends Action2 {
                 }
             });
         });
-        const panels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.Panel);
+        const panels = paneCompositePartService.getPinnedPaneCompositeIds(1 );
         panels.forEach(panel => {
             const container = viewDescriptorService.getViewContainerById(panel);
             const containerModel = viewDescriptorService.getViewContainerModel(container);
@@ -838,7 +843,7 @@ registerAction2(class extends Action2 {
                     if (!hasAddedView) {
                         results.push({
                             type: 'separator',
-                            label: ( localize(6878, "Panel / {0}", containerModel.title))
+                            label: ( localize(6856, "Panel / {0}", containerModel.title))
                         });
                         hasAddedView = true;
                     }
@@ -849,7 +854,7 @@ registerAction2(class extends Action2 {
                 }
             });
         });
-        const sidePanels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.AuxiliaryBar);
+        const sidePanels = paneCompositePartService.getPinnedPaneCompositeIds(2 );
         sidePanels.forEach(panel => {
             const container = viewDescriptorService.getViewContainerById(panel);
             const containerModel = viewDescriptorService.getViewContainerModel(container);
@@ -859,7 +864,7 @@ registerAction2(class extends Action2 {
                     if (!hasAddedView) {
                         results.push({
                             type: 'separator',
-                            label: ( localize(6879, "Secondary Side Bar / {0}", containerModel.title))
+                            label: ( localize(6857, "Secondary Side Bar / {0}", containerModel.title))
                         });
                         hasAddedView = true;
                     }
@@ -875,7 +880,7 @@ registerAction2(class extends Action2 {
     async getView(quickInputService, viewDescriptorService, paneCompositePartService, viewId) {
         const disposables = ( (new DisposableStore()));
         const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
-        quickPick.placeholder = ( localize(6880, "Select a View to Move"));
+        quickPick.placeholder = ( localize(6858, "Select a View to Move"));
         quickPick.items = this.getViewItems(viewDescriptorService, paneCompositePartService);
         quickPick.selectedItems = quickPick.items.filter(item => item.id === viewId);
         return (
@@ -903,7 +908,7 @@ class MoveFocusedViewAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.moveFocusedView',
-            title: ( localize2(6881, "Move Focused View")),
+            title: ( localize2(6859, "Move Focused View")),
             category: Categories.View,
             precondition: ( (FocusedViewContext.notEqualsTo(''))),
             f1: true
@@ -918,45 +923,45 @@ class MoveFocusedViewAction extends Action2 {
         const paneCompositePartService = accessor.get(IPaneCompositePartService);
         const focusedViewId = viewId || FocusedViewContext.getValue(contextKeyService);
         if (focusedViewId === undefined || focusedViewId.trim() === '') {
-            dialogService.error(( localize(6882, "There is no view currently focused.")));
+            dialogService.error(( localize(6860, "There is no view currently focused.")));
             return;
         }
         const viewDescriptor = viewDescriptorService.getViewDescriptorById(focusedViewId);
         if (!viewDescriptor || !viewDescriptor.canMoveView) {
-            dialogService.error(( localize(6883, "The currently focused view is not movable.")));
+            dialogService.error(( localize(6861, "The currently focused view is not movable.")));
             return;
         }
         const disposables = ( (new DisposableStore()));
         const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
-        quickPick.placeholder = ( localize(6884, "Select a Destination for the View"));
-        quickPick.title = ( localize(6885, "View: Move {0}", viewDescriptor.name.value));
+        quickPick.placeholder = ( localize(6862, "Select a Destination for the View"));
+        quickPick.title = ( localize(6863, "View: Move {0}", viewDescriptor.name.value));
         const items = [];
         const currentContainer = viewDescriptorService.getViewContainerByViewId(focusedViewId);
         const currentLocation = viewDescriptorService.getViewLocationById(focusedViewId);
         const isViewSolo = viewDescriptorService.getViewContainerModel(currentContainer).allViewDescriptors.length === 1;
-        if (!(isViewSolo && currentLocation === ViewContainerLocation.Panel)) {
+        if (!((isViewSolo && currentLocation === 1) )) {
             items.push({
                 id: '_.panel.newcontainer',
-                label: ( localize(6886, "New Panel Entry")),
+                label: ( localize(6864, "New Panel Entry")),
             });
         }
-        if (!(isViewSolo && currentLocation === ViewContainerLocation.Sidebar)) {
+        if (!((isViewSolo && currentLocation === 0) )) {
             items.push({
                 id: '_.sidebar.newcontainer',
-                label: ( localize(6887, "New Side Bar Entry"))
+                label: ( localize(6865, "New Side Bar Entry"))
             });
         }
-        if (!(isViewSolo && currentLocation === ViewContainerLocation.AuxiliaryBar)) {
+        if (!((isViewSolo && currentLocation === 2) )) {
             items.push({
                 id: '_.auxiliarybar.newcontainer',
-                label: ( localize(6888, "New Secondary Side Bar Entry"))
+                label: ( localize(6866, "New Secondary Side Bar Entry"))
             });
         }
         items.push({
             type: 'separator',
-            label: ( localize(6889, "Side Bar"))
+            label: ( localize(6867, "Side Bar"))
         });
-        const pinnedViewlets = paneCompositePartService.getVisiblePaneCompositeIds(ViewContainerLocation.Sidebar);
+        const pinnedViewlets = paneCompositePartService.getVisiblePaneCompositeIds(0 );
         items.push(...( (pinnedViewlets
             .filter(viewletId => {
             if (viewletId === viewDescriptorService.getViewContainerByViewId(focusedViewId).id) {
@@ -972,9 +977,9 @@ class MoveFocusedViewAction extends Action2 {
         }))));
         items.push({
             type: 'separator',
-            label: ( localize(6890, "Panel"))
+            label: ( localize(6868, "Panel"))
         });
-        const pinnedPanels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.Panel);
+        const pinnedPanels = paneCompositePartService.getPinnedPaneCompositeIds(1 );
         items.push(...( (pinnedPanels
             .filter(panel => {
             if (panel === viewDescriptorService.getViewContainerByViewId(focusedViewId).id) {
@@ -990,9 +995,9 @@ class MoveFocusedViewAction extends Action2 {
         }))));
         items.push({
             type: 'separator',
-            label: ( localize(6891, "Secondary Side Bar"))
+            label: ( localize(6869, "Secondary Side Bar"))
         });
-        const pinnedAuxPanels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.AuxiliaryBar);
+        const pinnedAuxPanels = paneCompositePartService.getPinnedPaneCompositeIds(2 );
         items.push(...( (pinnedAuxPanels
             .filter(panel => {
             if (panel === viewDescriptorService.getViewContainerByViewId(focusedViewId).id) {
@@ -1010,15 +1015,15 @@ class MoveFocusedViewAction extends Action2 {
         disposables.add(quickPick.onDidAccept(() => {
             const destination = quickPick.selectedItems[0];
             if (destination.id === '_.panel.newcontainer') {
-                viewDescriptorService.moveViewToLocation(viewDescriptor, ViewContainerLocation.Panel, this.desc.id);
+                viewDescriptorService.moveViewToLocation(viewDescriptor, 1 , this.desc.id);
                 viewsService.openView(focusedViewId, true);
             }
             else if (destination.id === '_.sidebar.newcontainer') {
-                viewDescriptorService.moveViewToLocation(viewDescriptor, ViewContainerLocation.Sidebar, this.desc.id);
+                viewDescriptorService.moveViewToLocation(viewDescriptor, 0 , this.desc.id);
                 viewsService.openView(focusedViewId, true);
             }
             else if (destination.id === '_.auxiliarybar.newcontainer') {
-                viewDescriptorService.moveViewToLocation(viewDescriptor, ViewContainerLocation.AuxiliaryBar, this.desc.id);
+                viewDescriptorService.moveViewToLocation(viewDescriptor, 2 , this.desc.id);
                 viewsService.openView(focusedViewId, true);
             }
             else if (destination.id) {
@@ -1036,7 +1041,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.resetFocusedViewLocation',
-            title: ( localize2(6892, "Reset Focused View Location")),
+            title: ( localize2(6870, "Reset Focused View Location")),
             category: Categories.View,
             f1: true,
             precondition: ( (FocusedViewContext.notEqualsTo('')))
@@ -1053,7 +1058,7 @@ registerAction2(class extends Action2 {
             viewDescriptor = viewDescriptorService.getViewDescriptorById(focusedViewId);
         }
         if (!viewDescriptor) {
-            dialogService.error(( localize(6893, "There is no view currently focused.")));
+            dialogService.error(( localize(6871, "There is no view currently focused.")));
             return;
         }
         const defaultContainer = viewDescriptorService.getDefaultContainerById(viewDescriptor.id);
@@ -1069,21 +1074,21 @@ class BaseResizeViewAction extends Action2 {
     resizePart(widthChange, heightChange, layoutService, partToResize) {
         let part;
         if (partToResize === undefined) {
-            const isEditorFocus = layoutService.hasFocus(Parts.EDITOR_PART);
-            const isSidebarFocus = layoutService.hasFocus(Parts.SIDEBAR_PART);
-            const isPanelFocus = layoutService.hasFocus(Parts.PANEL_PART);
-            const isAuxiliaryBarFocus = layoutService.hasFocus(Parts.AUXILIARYBAR_PART);
+            const isEditorFocus = layoutService.hasFocus("workbench.parts.editor" );
+            const isSidebarFocus = layoutService.hasFocus("workbench.parts.sidebar" );
+            const isPanelFocus = layoutService.hasFocus("workbench.parts.panel" );
+            const isAuxiliaryBarFocus = layoutService.hasFocus("workbench.parts.auxiliarybar" );
             if (isSidebarFocus) {
-                part = Parts.SIDEBAR_PART;
+                part = "workbench.parts.sidebar" ;
             }
             else if (isPanelFocus) {
-                part = Parts.PANEL_PART;
+                part = "workbench.parts.panel" ;
             }
             else if (isEditorFocus) {
-                part = Parts.EDITOR_PART;
+                part = "workbench.parts.editor" ;
             }
             else if (isAuxiliaryBarFocus) {
-                part = Parts.AUXILIARYBAR_PART;
+                part = "workbench.parts.auxiliarybar" ;
             }
         }
         else {
@@ -1098,7 +1103,7 @@ class IncreaseViewSizeAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewSize',
-            title: ( localize2(6894, 'Increase Current View Size')),
+            title: ( localize2(6872, 'Increase Current View Size')),
             f1: true,
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated()))
         });
@@ -1111,33 +1116,33 @@ class IncreaseViewWidthAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewWidth',
-            title: ( localize2(6895, 'Increase Editor Width')),
+            title: ( localize2(6873, 'Increase Editor Width')),
             f1: true,
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated()))
         });
     }
     run(accessor) {
-        this.resizePart(BaseResizeViewAction.RESIZE_INCREMENT, 0, accessor.get(IWorkbenchLayoutService), Parts.EDITOR_PART);
+        this.resizePart(BaseResizeViewAction.RESIZE_INCREMENT, 0, accessor.get(IWorkbenchLayoutService), "workbench.parts.editor" );
     }
 }
 class IncreaseViewHeightAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewHeight',
-            title: ( localize2(6896, 'Increase Editor Height')),
+            title: ( localize2(6874, 'Increase Editor Height')),
             f1: true,
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated()))
         });
     }
     run(accessor) {
-        this.resizePart(0, BaseResizeViewAction.RESIZE_INCREMENT, accessor.get(IWorkbenchLayoutService), Parts.EDITOR_PART);
+        this.resizePart(0, BaseResizeViewAction.RESIZE_INCREMENT, accessor.get(IWorkbenchLayoutService), "workbench.parts.editor" );
     }
 }
 class DecreaseViewSizeAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewSize',
-            title: ( localize2(6897, 'Decrease Current View Size')),
+            title: ( localize2(6875, 'Decrease Current View Size')),
             f1: true,
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated()))
         });
@@ -1150,26 +1155,26 @@ class DecreaseViewWidthAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewWidth',
-            title: ( localize2(6898, 'Decrease Editor Width')),
+            title: ( localize2(6876, 'Decrease Editor Width')),
             f1: true,
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated()))
         });
     }
     run(accessor) {
-        this.resizePart(-BaseResizeViewAction.RESIZE_INCREMENT, 0, accessor.get(IWorkbenchLayoutService), Parts.EDITOR_PART);
+        this.resizePart(-BaseResizeViewAction.RESIZE_INCREMENT, 0, accessor.get(IWorkbenchLayoutService), "workbench.parts.editor" );
     }
 }
 class DecreaseViewHeightAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewHeight',
-            title: ( localize2(6899, 'Decrease Editor Height')),
+            title: ( localize2(6877, 'Decrease Editor Height')),
             f1: true,
             precondition: ( (IsAuxiliaryWindowFocusedContext.toNegated()))
         });
     }
     run(accessor) {
-        this.resizePart(0, -BaseResizeViewAction.RESIZE_INCREMENT, accessor.get(IWorkbenchLayoutService), Parts.EDITOR_PART);
+        this.resizePart(0, -BaseResizeViewAction.RESIZE_INCREMENT, accessor.get(IWorkbenchLayoutService), "workbench.parts.editor" );
     }
 }
 registerAction2(IncreaseViewSizeAction);
@@ -1189,8 +1194,8 @@ const CreateToggleLayoutItem = (id, active, label, visualIcon) => {
         visualIcon,
         activeIcon: Codicon.eye,
         inactiveIcon: Codicon.eyeClosed,
-        activeAriaLabel: ( localize(6900, "Select to Hide")),
-        inactiveAriaLabel: ( localize(6901, "Select to Show")),
+        activeAriaLabel: ( localize(6878, "Select to Hide")),
+        inactiveAriaLabel: ( localize(6879, "Select to Show")),
         useButtons: true,
     };
 };
@@ -1201,7 +1206,7 @@ const CreateOptionLayoutItem = (id, active, label, visualIcon) => {
         label,
         visualIcon,
         activeIcon: Codicon.check,
-        activeAriaLabel: ( localize(6902, "Active")),
+        activeAriaLabel: ( localize(6880, "Active")),
         useButtons: false
     };
 };
@@ -1213,29 +1218,29 @@ const MenuBarToggledContext = ( (ContextKeyExpr.and(
 )));
 const ToggleVisibilityActions = [];
 if (!isMacintosh || !isNative) {
-    ToggleVisibilityActions.push(CreateToggleLayoutItem('workbench.action.toggleMenuBar', MenuBarToggledContext, ( localize(6903, "Menu Bar")), menubarIcon));
+    ToggleVisibilityActions.push(CreateToggleLayoutItem('workbench.action.toggleMenuBar', MenuBarToggledContext, ( localize(6881, "Menu Bar")), menubarIcon));
 }
 ToggleVisibilityActions.push(...[
-    CreateToggleLayoutItem(ToggleActivityBarVisibilityActionId, ( (ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'hidden'))), ( localize(6904, "Activity Bar")), { whenA: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
-    CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, ( localize(6905, "Primary Side Bar")), { whenA: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), iconA: panelLeftIcon, iconB: panelRightIcon }),
-    CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, ( localize(6891, "Secondary Side Bar")), { whenA: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), iconA: panelRightIcon, iconB: panelLeftIcon }),
-    CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, ( localize(6890, "Panel")), panelIcon),
-    CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ( (ContextKeyExpr.equals('config.workbench.statusBar.visible', true))), ( localize(6906, "Status Bar")), statusBarIcon),
+    CreateToggleLayoutItem(ToggleActivityBarVisibilityActionId, ( (ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'hidden'))), ( localize(6882, "Activity Bar")), { whenA: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
+    CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, ( localize(6883, "Primary Side Bar")), { whenA: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), iconA: panelLeftIcon, iconB: panelRightIcon }),
+    CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, ( localize(6869, "Secondary Side Bar")), { whenA: ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), iconA: panelRightIcon, iconB: panelLeftIcon }),
+    CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, ( localize(6868, "Panel")), panelIcon),
+    CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ( (ContextKeyExpr.equals('config.workbench.statusBar.visible', true))), ( localize(6884, "Status Bar")), statusBarIcon),
 ]);
 const MoveSideBarActions = [
-    CreateOptionLayoutItem(MoveSidebarLeftAction.ID, ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), ( localize(6907, "Left")), panelLeftIcon),
-    CreateOptionLayoutItem(MoveSidebarRightAction.ID, ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'))), ( localize(6908, "Right")), panelRightIcon),
+    CreateOptionLayoutItem(MoveSidebarLeftAction.ID, ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))), ( localize(6885, "Left")), panelLeftIcon),
+    CreateOptionLayoutItem(MoveSidebarRightAction.ID, ( (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'))), ( localize(6886, "Right")), panelRightIcon),
 ];
 const AlignPanelActions = [
-    CreateOptionLayoutItem('workbench.action.alignPanelLeft', ( (PanelAlignmentContext.isEqualTo('left'))), ( localize(6909, "Left")), panelAlignmentLeftIcon),
-    CreateOptionLayoutItem('workbench.action.alignPanelRight', ( (PanelAlignmentContext.isEqualTo('right'))), ( localize(6910, "Right")), panelAlignmentRightIcon),
-    CreateOptionLayoutItem('workbench.action.alignPanelCenter', ( (PanelAlignmentContext.isEqualTo('center'))), ( localize(6911, "Center")), panelAlignmentCenterIcon),
-    CreateOptionLayoutItem('workbench.action.alignPanelJustify', ( (PanelAlignmentContext.isEqualTo('justify'))), ( localize(6912, "Justify")), panelAlignmentJustifyIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelLeft', ( (PanelAlignmentContext.isEqualTo('left'))), ( localize(6887, "Left")), panelAlignmentLeftIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelRight', ( (PanelAlignmentContext.isEqualTo('right'))), ( localize(6888, "Right")), panelAlignmentRightIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelCenter', ( (PanelAlignmentContext.isEqualTo('center'))), ( localize(6889, "Center")), panelAlignmentCenterIcon),
+    CreateOptionLayoutItem('workbench.action.alignPanelJustify', ( (PanelAlignmentContext.isEqualTo('justify'))), ( localize(6890, "Justify")), panelAlignmentJustifyIcon),
 ];
 const MiscLayoutOptions = [
-    CreateOptionLayoutItem('workbench.action.toggleFullScreen', IsMainWindowFullscreenContext, ( localize(6913, "Full Screen")), fullscreenIcon),
-    CreateOptionLayoutItem('workbench.action.toggleZenMode', InEditorZenModeContext, ( localize(6914, "Zen Mode")), zenModeIcon),
-    CreateOptionLayoutItem('workbench.action.toggleCenteredLayout', IsMainEditorCenteredLayoutContext, ( localize(6915, "Centered Layout")), centerLayoutIcon),
+    CreateOptionLayoutItem('workbench.action.toggleFullScreen', IsMainWindowFullscreenContext, ( localize(6891, "Full Screen")), fullscreenIcon),
+    CreateOptionLayoutItem('workbench.action.toggleZenMode', InEditorZenModeContext, ( localize(6892, "Zen Mode")), zenModeIcon),
+    CreateOptionLayoutItem('workbench.action.toggleCenteredLayout', IsMainEditorCenteredLayoutContext, ( localize(6893, "Centered Layout")), centerLayoutIcon),
 ];
 const LayoutContextKeySet = ( (new Set()));
 for (const { active } of [...ToggleVisibilityActions, ...MoveSideBarActions, ...AlignPanelActions, ...MiscLayoutOptions]) {
@@ -1247,7 +1252,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.customizeLayout',
-            title: ( localize2(6916, "Customize Layout...")),
+            title: ( localize2(6894, "Customize Layout...")),
             f1: true,
             icon: configureLayoutIcon,
             menu: [
@@ -1297,22 +1302,22 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         return [
             {
                 type: 'separator',
-                label: ( localize(6917, "Visibility"))
+                label: ( localize(6895, "Visibility"))
             },
             ...( (ToggleVisibilityActions.map(toQuickPickItem))),
             {
                 type: 'separator',
-                label: ( localize(6918, "Primary Side Bar Position"))
+                label: ( localize(6896, "Primary Side Bar Position"))
             },
             ...( (MoveSideBarActions.map(toQuickPickItem))),
             {
                 type: 'separator',
-                label: ( localize(6919, "Panel Alignment"))
+                label: ( localize(6897, "Panel Alignment"))
             },
             ...( (AlignPanelActions.map(toQuickPickItem))),
             {
                 type: 'separator',
-                label: ( localize(6920, "Modes")),
+                label: ( localize(6898, "Modes")),
             },
             ...( (MiscLayoutOptions.map(toQuickPickItem))),
         ];
@@ -1333,16 +1338,16 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         quickPick.items = this.getItems(contextKeyService, keybindingService);
         quickPick.ignoreFocusOut = true;
         quickPick.hideInput = true;
-        quickPick.title = ( localize(6921, "Customize Layout"));
+        quickPick.title = ( localize(6899, "Customize Layout"));
         const closeButton = {
             alwaysVisible: true,
             iconClass: ThemeIcon.asClassName(Codicon.close),
-            tooltip: ( localize(6922, "Close"))
+            tooltip: ( localize(6900, "Close"))
         };
         const resetButton = {
             alwaysVisible: true,
             iconClass: ThemeIcon.asClassName(Codicon.discard),
-            tooltip: ( localize(6923, "Restore Defaults"))
+            tooltip: ( localize(6901, "Restore Defaults"))
         };
         quickPick.buttons = [
             resetButton,