@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js

@@ -2,9 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/activitybarpart.css.js';
 import './media/activityaction.css.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
-import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
-import { Parts, Position, LayoutSettings, ActivityBarPosition } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MutableDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -30,8 +28,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { getMenuBarVisibility } from 'vscode/vscode/vs/platform/window/common/window';
 import { toAction, Separator, SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { PaneCompositeBar } from '../paneCompositeBar.js';
 import { GlobalCompositeBar } from 'vscode/vscode/vs/workbench/browser/parts/globalCompositeBar';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
@@ -41,11 +37,12 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { ViewContainerLocationToString, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocationToString } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 var ActivitybarPart_1;
 let ActivitybarPart = class ActivitybarPart extends Part {
@@ -55,7 +52,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
     static { this.placeholderViewContainersKey = 'workbench.activity.placeholderViewlets'; }
     static { this.viewContainersWorkspaceStateKey = 'workbench.activity.viewletsWorkspaceState'; }
     constructor(paneCompositePart, instantiationService, layoutService, themeService, storageService) {
-        super(Parts.ACTIVITYBAR_PART, { hasTitle: false }, themeService, storageService, layoutService);
+        super("workbench.parts.activitybar" , { hasTitle: false }, themeService, storageService, layoutService);
         this.paneCompositePart = paneCompositePart;
         this.instantiationService = instantiationService;
         this.minimumWidth = 48;
@@ -70,11 +67,11 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             pinnedViewContainersKey: ActivitybarPart_1.pinnedViewContainersKey,
             placeholderViewContainersKey: ActivitybarPart_1.placeholderViewContainersKey,
             viewContainersWorkspaceStateKey: ActivitybarPart_1.viewContainersWorkspaceStateKey,
-            orientation: ActionsOrientation.VERTICAL,
+            orientation: 1 ,
             icon: true,
             iconSize: 24,
             activityHoverOptions: {
-                position: () => this.layoutService.getSideBarPosition() === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT,
+                position: () => this.layoutService.getSideBarPosition() === 0  ? 1  : 0 ,
             },
             preventLoopNavigation: true,
             recomputeSizes: false,
@@ -91,12 +88,12 @@ let ActivitybarPart = class ActivitybarPart extends Part {
                 activeBackgroundColor: undefined, inactiveBackgroundColor: undefined, activeBorderBottomColor: undefined,
             }),
             overflowActionSize: ActivitybarPart_1.ACTION_HEIGHT,
-        }, Parts.ACTIVITYBAR_PART, this.paneCompositePart, true);
+        }, "workbench.parts.activitybar" , this.paneCompositePart, true);
     }
     createContentArea(parent) {
         this.element = parent;
         this.content = append(this.element, $('.content'));
-        if (this.layoutService.isVisible(Parts.ACTIVITYBAR_PART)) {
+        if (this.layoutService.isVisible("workbench.parts.activitybar" )) {
             this.show();
         }
         return this.content;
@@ -153,7 +150,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
     }
     toJSON() {
         return {
-            type: Parts.ACTIVITYBAR_PART
+            type: "workbench.parts.activitybar"
         };
     }
 };
@@ -164,14 +161,14 @@ ActivitybarPart = ActivitybarPart_1 = ( (__decorate([
     ( (__param(4, IStorageService)))
 ], ActivitybarPart)));
 let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneCompositeBar {
-    constructor(options, part, paneCompositePart, showGlobalActivities, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, configurationService, menuService, layoutService) {
+    constructor(options, part, paneCompositePart, showGlobalActivities, instantiationService, storageService, extensionService, viewDescriptorService, viewService, contextKeyService, environmentService, configurationService, menuService, layoutService) {
         super({
             ...options,
             fillExtraContextMenuActions: (actions, e) => {
                 options.fillExtraContextMenuActions(actions, e);
                 this.fillContextMenuActions(actions, e);
             }
-        }, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, layoutService);
+        }, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, viewService, contextKeyService, environmentService, layoutService);
         this.configurationService = configurationService;
         this.menuService = menuService;
         this.keyboardNavigationDisposables = this._register(( (new DisposableStore())));
@@ -192,11 +189,11 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
     fillContextMenuActions(actions, e) {
         const menuBarVisibility = getMenuBarVisibility(this.configurationService);
         if (menuBarVisibility === 'compact' || menuBarVisibility === 'hidden' || menuBarVisibility === 'toggle') {
-            actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localize(3726, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
+            actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localize(3755, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
         }
         if (menuBarVisibility === 'compact' && this.menuBarContainer && e?.target) {
             if (isAncestor(e.target, this.menuBarContainer)) {
-                actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localize(3727, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
+                actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localize(3756, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
             }
         }
         if (this.globalCompositeBar) {
@@ -232,7 +229,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
         if (this.menuBarContainer) {
             this.keyboardNavigationDisposables.add(addDisposableListener(this.menuBarContainer, EventType.KEY_DOWN, e => {
                 const kbEvent = ( (new StandardKeyboardEvent(e)));
-                if (kbEvent.equals(KeyCode.DownArrow) || kbEvent.equals(KeyCode.RightArrow)) {
+                if (kbEvent.equals(18 ) || kbEvent.equals(17 )) {
                     this.focus();
                 }
             }));
@@ -240,10 +237,10 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
         if (this.compositeBarContainer) {
             this.keyboardNavigationDisposables.add(addDisposableListener(this.compositeBarContainer, EventType.KEY_DOWN, e => {
                 const kbEvent = ( (new StandardKeyboardEvent(e)));
-                if (kbEvent.equals(KeyCode.DownArrow) || kbEvent.equals(KeyCode.RightArrow)) {
+                if (kbEvent.equals(18 ) || kbEvent.equals(17 )) {
                     this.globalCompositeBar?.focus();
                 }
-                else if (kbEvent.equals(KeyCode.UpArrow) || kbEvent.equals(KeyCode.LeftArrow)) {
+                else if (kbEvent.equals(16 ) || kbEvent.equals(15 )) {
                     this.menuBar?.toggleFocus();
                 }
             }));
@@ -251,7 +248,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
         if (this.globalCompositeBar) {
             this.keyboardNavigationDisposables.add(addDisposableListener(this.globalCompositeBar.element, EventType.KEY_DOWN, e => {
                 const kbEvent = ( (new StandardKeyboardEvent(e)));
-                if (kbEvent.equals(KeyCode.UpArrow) || kbEvent.equals(KeyCode.LeftArrow)) {
+                if (kbEvent.equals(16 ) || kbEvent.equals(15 )) {
                     this.focus(this.getVisiblePaneCompositeIds().length - 1);
                 }
             }));
@@ -271,7 +268,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
     }
     layout(width, height) {
         if (this.menuBarContainer) {
-            if (this.options.orientation === ActionsOrientation.VERTICAL) {
+            if (this.options.orientation === 1 ) {
                 height -= this.menuBarContainer.clientHeight;
             }
             else {
@@ -279,7 +276,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
             }
         }
         if (this.globalCompositeBar) {
-            if (this.options.orientation === ActionsOrientation.VERTICAL) {
+            if (this.options.orientation === 1 ) {
                 height -= (this.globalCompositeBar.size() * ActivitybarPart.ACTION_HEIGHT);
             }
             else {
@@ -293,7 +290,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
         const positionActions = [];
         createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
         return [
-            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3728, "Activity Bar Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3757, "Activity Bar Position")), positionActions))),
             toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => ( (new ToggleSidebarPositionAction())).run(accessor)) })
         ];
     }
@@ -303,25 +300,26 @@ ActivityBarCompositeBar = ( (__decorate([
     ( (__param(5, IStorageService))),
     ( (__param(6, IExtensionService))),
     ( (__param(7, IViewDescriptorService))),
-    ( (__param(8, IContextKeyService))),
-    ( (__param(9, IWorkbenchEnvironmentService))),
-    ( (__param(10, IConfigurationService))),
-    ( (__param(11, IMenuService))),
-    ( (__param(12, IWorkbenchLayoutService)))
+    ( (__param(8, IViewsService))),
+    ( (__param(9, IContextKeyService))),
+    ( (__param(10, IWorkbenchEnvironmentService))),
+    ( (__param(11, IConfigurationService))),
+    ( (__param(12, IMenuService))),
+    ( (__param(13, IWorkbenchLayoutService)))
 ], ActivityBarCompositeBar)));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.activityBarLocation.default',
             title: {
-                ...( localize2(3729, 'Move Activity Bar to Side')),
-                mnemonicTitle: ( localize(3730, "&&Default")),
+                ...( localize2(3758, 'Move Activity Bar to Side')),
+                mnemonicTitle: ( localize(3759, "&&Default")),
             },
-            shortTitle: ( localize(3731, "Default")),
+            shortTitle: ( localize(3760, "Default")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
-                ActivityBarPosition.DEFAULT
+                `config.${"workbench.activityBar.location" }`,
+                "default"
             ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
@@ -329,15 +327,15 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.CommandPalette,
                     when: ( (ContextKeyExpr.notEquals(
-                        `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
-                        ActivityBarPosition.DEFAULT
+                        `config.${"workbench.activityBar.location" }`,
+                        "default"
                     ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.DEFAULT);
+        configurationService.updateValue("workbench.activityBar.location" , "default" );
     }
 });
 registerAction2(class extends Action2 {
@@ -345,24 +343,30 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.top',
             title: {
-                ...( localize2(3732, 'Move Activity Bar to Top')),
-                mnemonicTitle: ( localize(3733, "&&Top")),
+                ...( localize2(3761, 'Move Activity Bar to Top')),
+                mnemonicTitle: ( localize(3762, "&&Top")),
             },
-            shortTitle: ( localize(3734, "Top")),
+            shortTitle: ( localize(3763, "Top")),
             category: Categories.View,
-            toggled: ( (ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP))),
+            toggled: ( (ContextKeyExpr.equals(
+                `config.${"workbench.activityBar.location" }`,
+                "top"
+            ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
                     order: 2
                 }, {
                     id: MenuId.CommandPalette,
-                    when: ( (ContextKeyExpr.notEquals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP))),
+                    when: ( (ContextKeyExpr.notEquals(
+                        `config.${"workbench.activityBar.location" }`,
+                        "top"
+                    ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.TOP);
+        configurationService.updateValue("workbench.activityBar.location" , "top" );
     }
 });
 registerAction2(class extends Action2 {
@@ -370,14 +374,14 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.bottom',
             title: {
-                ...( localize2(3735, 'Move Activity Bar to Bottom')),
-                mnemonicTitle: ( localize(3736, "&&Bottom")),
+                ...( localize2(3764, 'Move Activity Bar to Bottom')),
+                mnemonicTitle: ( localize(3765, "&&Bottom")),
             },
-            shortTitle: ( localize(3737, "Bottom")),
+            shortTitle: ( localize(3766, "Bottom")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
-                ActivityBarPosition.BOTTOM
+                `config.${"workbench.activityBar.location" }`,
+                "bottom"
             ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
@@ -385,15 +389,15 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.CommandPalette,
                     when: ( (ContextKeyExpr.notEquals(
-                        `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
-                        ActivityBarPosition.BOTTOM
+                        `config.${"workbench.activityBar.location" }`,
+                        "bottom"
                     ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.BOTTOM);
+        configurationService.updateValue("workbench.activityBar.location" , "bottom" );
     }
 });
 registerAction2(class extends Action2 {
@@ -401,14 +405,14 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.hide',
             title: {
-                ...( localize2(3738, 'Hide Activity Bar')),
-                mnemonicTitle: ( localize(3739, "&&Hidden")),
+                ...( localize2(3767, 'Hide Activity Bar')),
+                mnemonicTitle: ( localize(3768, "&&Hidden")),
             },
-            shortTitle: ( localize(3740, "Hidden")),
+            shortTitle: ( localize(3769, "Hidden")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
-                `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
-                ActivityBarPosition.HIDDEN
+                `config.${"workbench.activityBar.location" }`,
+                "hidden"
             ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
@@ -416,39 +420,39 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.CommandPalette,
                     when: ( (ContextKeyExpr.notEquals(
-                        `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
-                        ActivityBarPosition.HIDDEN
+                        `config.${"workbench.activityBar.location" }`,
+                        "hidden"
                     ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.HIDDEN);
+        configurationService.updateValue("workbench.activityBar.location" , "hidden" );
     }
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localize(3741, "Activity Bar Position")),
+    title: ( localize(3770, "Activity Bar Position")),
     group: '3_workbench_layout_move',
     order: 2
 });
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localize(3741, "Activity Bar Position")),
+    title: ( localize(3770, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewContainerLocation',
-        ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+        ViewContainerLocationToString(0 )
     ))),
     group: '3_workbench_layout_move',
     order: 1
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localize(3741, "Activity Bar Position")),
+    title: ( localize(3770, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewLocation',
-        ViewContainerLocationToString(ViewContainerLocation.Sidebar)
+        ViewContainerLocationToString(0 )
     ))),
     group: '3_workbench_layout_move',
     order: 1
@@ -460,8 +464,8 @@ class SwitchSideBarViewAction extends Action2 {
     }
     async run(accessor) {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const visibleViewletIds = paneCompositeService.getVisiblePaneCompositeIds(ViewContainerLocation.Sidebar);
-        const activeViewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
+        const visibleViewletIds = paneCompositeService.getVisiblePaneCompositeIds(0 );
+        const activeViewlet = paneCompositeService.getActivePaneComposite(0 );
         if (!activeViewlet) {
             return;
         }
@@ -472,14 +476,14 @@ class SwitchSideBarViewAction extends Action2 {
                 break;
             }
         }
-        await paneCompositeService.openPaneComposite(targetViewletId, ViewContainerLocation.Sidebar, true);
+        await paneCompositeService.openPaneComposite(targetViewletId, 0 , true);
     }
 }
 registerAction2(class PreviousSideBarViewAction extends SwitchSideBarViewAction {
     constructor() {
         super({
             id: 'workbench.action.previousSideBarView',
-            title: ( localize2(3742, 'Previous Primary Side Bar View')),
+            title: ( localize2(3771, 'Previous Primary Side Bar View')),
             category: Categories.View,
             f1: true
         }, -1);
@@ -489,7 +493,7 @@ registerAction2(class NextSideBarViewAction extends SwitchSideBarViewAction {
     constructor() {
         super({
             id: 'workbench.action.nextSideBarView',
-            title: ( localize2(3743, 'Next Primary Side Bar View')),
+            title: ( localize2(3772, 'Next Primary Side Bar View')),
             category: Categories.View,
             f1: true
         }, 1);
@@ -499,14 +503,14 @@ registerAction2(class FocusActivityBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusActivityBar',
-            title: ( localize2(3744, 'Focus Activity Bar')),
+            title: ( localize2(3773, 'Focus Activity Bar')),
             category: Categories.View,
             f1: true
         });
     }
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
-        layoutService.focusPart(Parts.ACTIVITYBAR_PART);
+        layoutService.focusPart("workbench.parts.activitybar" );
     }
 });
 registerThemingParticipant((theme, collector) => {

package/vscode/src/vs/workbench/browser/parts/activitybar/media/activityaction.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item{display:block;position:relative}.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:before{background-color:transparent;content:\"\";display:none;height:2px;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:background-color;width:48px}.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before{transition-delay:0s}.monaco-workbench .activitybar>.content.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .activitybar>.content.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom+.action-item:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type.bottom:after{background-color:var(--insert-border-color)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label{box-sizing:border-box;display:flex;height:48px;margin-right:0;overflow:hidden;position:relative;width:48px;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label:not(.codicon){font-size:15px;line-height:40px;padding:0 0 0 48px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label.codicon{align-items:center;font-size:24px;justify-content:center}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.uri-icon{background-color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-left:2px solid;content:\"\";height:100%;position:absolute;top:0;width:0;z-index:1}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-color:var(--vscode-activityBar-activeBorder)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before{height:100%;top:0}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator.action-item,.monaco-workbench.hc-light .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator{display:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus:before{border-left:none!important}.monaco-workbench .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{left:0}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{right:0}.monaco-workbench.hc-black .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-black .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before{outline:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge{z-index:2}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{pointer-events:none}.monaco-workbench.border .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{left:-2px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .badge-content{border-radius:20px;font-size:9px;font-weight:600;height:16px;line-height:16px;min-width:8px;padding:0 4px;position:absolute;right:8px;text-align:center;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay{background-color:var(--vscode-activityBar-background);position:absolute;right:6px;top:27px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-inactiveForeground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-badge .profile-icon-overlay .codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-badge .profile-icon-overlay .codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-text-overlay{background-color:var(--vscode-profileBadge-background);border:2px solid var(--vscode-activityBar-background);border-radius:7px;color:var(--vscode-profileBadge-foreground);font-size:9px;font-weight:600;line-height:10px;padding:2px 3px;position:absolute;right:6px;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:active .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-text-overlay{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content{font-size:12px;font-weight:unset;justify-content:center;padding:0}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content:before{text-align:center;vertical-align:baseline}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{left:auto;right:0}";
+var css = ".monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item{display:block;position:relative}.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content .composite-bar>.monaco-action-bar .action-item:before{background-color:transparent;content:\"\";display:none;height:2px;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:background-color;width:48px}.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .activitybar>.content.dragged-over .composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before{transition-delay:0s}.monaco-workbench .activitybar>.content.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .activitybar>.content.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.bottom+.action-item:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item.top:before,.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type.bottom:after{background-color:var(--insert-border-color)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label{box-sizing:border-box;display:flex;height:48px;margin-right:0;overflow:hidden;position:relative;width:48px;z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label:not(.codicon){font-size:15px;line-height:40px;padding:0 0 0 48px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-label.codicon{align-items:center;font-size:24px;justify-content:center}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.codicon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.codicon{color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.active .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .action-label.uri-icon,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .action-label.uri-icon{background-color:var(--vscode-activityBar-foreground)!important}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-left:2px solid;content:\"\";height:100%;position:absolute;top:0;width:0;z-index:1}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-color:var(--vscode-activityBar-activeBorder)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked .active-item-indicator:before{height:100%;top:0}.monaco-workbench.hc-black .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator.action-item,.monaco-workbench.hc-light .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator{display:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus .active-item-indicator:before,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item.clicked:focus:before{border-left:none!important}.monaco-workbench .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{left:0}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item .active-item-indicator:before{right:0}.monaco-workbench.hc-black .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-black .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.left>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before,.monaco-workbench.hc-light .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus:before{outline:none}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge{z-index:2}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{z-index:1}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{pointer-events:none}.monaco-workbench.border .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .active-item-indicator{left:-2px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .badge-content{border-radius:20px;font-size:9px;font-weight:600;height:16px;line-height:16px;min-width:8px;padding:0 4px;position:absolute;right:8px;text-align:center;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge .profile-text-overlay{background-color:var(--vscode-profileBadge-background);border:2px solid var(--vscode-activityBar-background);border-radius:7px;color:var(--vscode-profileBadge-foreground);font-size:9px;font-weight:600;line-height:10px;padding:2px 3px;position:absolute;right:6px;top:24px}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:active .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:focus .profile-text-overlay,.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .action-item:hover .profile-text-overlay{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content{font-size:12px;font-weight:unset;justify-content:center;padding:0}.monaco-workbench .activitybar>.content :not(.monaco-menu)>.monaco-action-bar .badge .codicon.badge-content:before{text-align:center;vertical-align:baseline}.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .badge,.monaco-workbench .activitybar.right>.content :not(.monaco-menu)>.monaco-action-bar .profile-badge{left:auto;right:0}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js

@@ -23,23 +23,20 @@ import { ActiveAuxiliaryContext, AuxiliaryBarFocusContext } from 'vscode/vscode/
 import { SIDE_BAR_BORDER, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, ACTIVITY_BAR_TOP_ACTIVE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, ACTIVITY_BAR_TOP_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { Parts, LayoutSettings, Position, ActivityBarPosition } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { Separator, SubmenuAction, toAction } from 'vscode/vscode/vs/base/common/actions';
 import { ToggleAuxiliaryBarAction } from 'vscode/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
-import { LayoutPriority } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { ToggleSidebarPositionAction } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
-import { ActionsOrientation, prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { $ } from 'vscode/vscode/vs/base/browser/dom';
-import { WorkbenchToolBar, HiddenItemStrategy } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
@@ -66,7 +63,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         return Math.max(width, 300);
     }
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
-        super(Parts.AUXILIARYBAR_PART, {
+        super("workbench.parts.auxiliarybar" , {
             hasTitle: true,
             borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0,
         }, AuxiliaryBarPart_1.activePanelSettingsKey, ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), 'auxiliarybar', 'auxiliarybar', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
@@ -76,9 +73,9 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
         this.maximumHeight = Number.POSITIVE_INFINITY;
-        this.priority = LayoutPriority.Low;
+        this.priority = 1 ;
         this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
+            if (e.affectsConfiguration("workbench.activityBar.location" )) {
                 this.onDidChangeActivityBarLocation();
             }
         }));
@@ -95,7 +92,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         const container = assertIsDefined(this.getContainer());
         container.style.backgroundColor = this.getColor(SIDE_BAR_BACKGROUND) || '';
         const borderColor = this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder);
-        const isPositionLeft = this.layoutService.getSideBarPosition() === Position.RIGHT;
+        const isPositionLeft = this.layoutService.getSideBarPosition() === 1 ;
         container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
         container.style.borderLeftColor = borderColor ?? '';
         container.style.borderRightColor = borderColor ?? '';
@@ -112,10 +109,10 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
             placeholderViewContainersKey: AuxiliaryBarPart_1.placeholdeViewContainersKey,
             viewContainersWorkspaceStateKey: AuxiliaryBarPart_1.viewContainersWorkspaceStateKey,
             icon: true,
-            orientation: ActionsOrientation.HORIZONTAL,
+            orientation: 0 ,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? HoverPosition.ABOVE : HoverPosition.BELOW,
+                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? 3  : 2 ,
             },
             fillExtraContextMenuActions: actions => this.fillExtraContextMenuActions(actions),
             compositeSize: 0,
@@ -135,7 +132,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         };
     }
     fillExtraContextMenuActions(actions) {
-        const currentPositionRight = this.layoutService.getSideBarPosition() === Position.LEFT;
+        const currentPositionRight = this.layoutService.getSideBarPosition() === 0 ;
         const viewsSubmenuAction = this.getViewsSubmenuAction();
         if (viewsSubmenuAction) {
             actions.push(( (new Separator())));
@@ -146,21 +143,21 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
         actions.push(...[
             ( (new Separator())),
-            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3748, "Activity Bar Position")), positionActions))),
-            toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localize(3749, "Move Secondary Side Bar Left")) : ( localize(3750, "Move Secondary Side Bar Right")), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
-            toAction({ id: ToggleAuxiliaryBarAction.ID, label: ( localize(3751, "Hide Secondary Side Bar")), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3777, "Activity Bar Position")), positionActions))),
+            toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localize(3778, "Move Secondary Side Bar Left")) : ( localize(3779, "Move Secondary Side Bar Right")), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
+            toAction({ id: ToggleAuxiliaryBarAction.ID, label: ( localize(3780, "Hide Secondary Side Bar")), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
         ]);
     }
     shouldShowCompositeBar() {
-        return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.HIDDEN;
+        return this.configurationService.getValue("workbench.activityBar.location" ) !== "hidden" ;
     }
     getCompositeBarPosition() {
-        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
         switch (activityBarPosition) {
-            case ActivityBarPosition.TOP: return CompositeBarPosition.TOP;
-            case ActivityBarPosition.BOTTOM: return CompositeBarPosition.BOTTOM;
-            case ActivityBarPosition.HIDDEN: return CompositeBarPosition.TITLE;
-            case ActivityBarPosition.DEFAULT: return CompositeBarPosition.TITLE;
+            case "top" : return CompositeBarPosition.TOP;
+            case "bottom" : return CompositeBarPosition.BOTTOM;
+            case "hidden" : return CompositeBarPosition.TITLE;
+            case "default" : return CompositeBarPosition.TITLE;
             default: return CompositeBarPosition.TITLE;
         }
     }
@@ -170,8 +167,8 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         const menu = this.headerFooterCompositeBarDispoables.add(this.instantiationService.createInstance(CompositeMenuActions, MenuId.AuxiliaryBarHeader, undefined, undefined));
         const toolBar = this.headerFooterCompositeBarDispoables.add(this.instantiationService.createInstance(WorkbenchToolBar, globalHeaderContainer, {
             actionViewItemProvider: (action, options) => this.headerActionViewItemProvider(action, options),
-            orientation: ActionsOrientation.HORIZONTAL,
-            hiddenItemStrategy: HiddenItemStrategy.NoHide,
+            orientation: 0 ,
+            hiddenItemStrategy: -1 ,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
         }));
         toolBar.setActions(prepareActions(menu.getPrimaryActions()));
@@ -187,7 +184,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
     }
     toJSON() {
         return {
-            type: Parts.AUXILIARYBAR_PART
+            type: "workbench.parts.auxiliarybar"
         };
     }
 };