@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.0

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

@@ -2,7 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/activitybarpart.css.js';
 import './media/activityaction.css.js';
 import { localizeWithPath, localize2WithPath } 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';
@@ -28,6 +30,8 @@ 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';
@@ -37,7 +41,7 @@ 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 } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewContainerLocationToString, ViewContainerLocation } 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';
@@ -52,7 +56,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("workbench.parts.activitybar" , { hasTitle: false }, themeService, storageService, layoutService);
+        super(Parts.ACTIVITYBAR_PART, { hasTitle: false }, themeService, storageService, layoutService);
         this.paneCompositePart = paneCompositePart;
         this.instantiationService = instantiationService;
         this.minimumWidth = 48;
@@ -67,11 +71,11 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             pinnedViewContainersKey: ActivitybarPart_1.pinnedViewContainersKey,
             placeholderViewContainersKey: ActivitybarPart_1.placeholderViewContainersKey,
             viewContainersWorkspaceStateKey: ActivitybarPart_1.viewContainersWorkspaceStateKey,
-            orientation: 1 ,
+            orientation: ActionsOrientation.VERTICAL,
             icon: true,
             iconSize: 24,
             activityHoverOptions: {
-                position: () => this.layoutService.getSideBarPosition() === 0  ? 1  : 0 ,
+                position: () => this.layoutService.getSideBarPosition() === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT,
             },
             preventLoopNavigation: true,
             recomputeSizes: false,
@@ -88,12 +92,12 @@ let ActivitybarPart = class ActivitybarPart extends Part {
                 activeBackgroundColor: undefined, inactiveBackgroundColor: undefined, activeBorderBottomColor: undefined,
             }),
             overflowActionSize: ActivitybarPart_1.ACTION_HEIGHT,
-        }, "workbench.parts.activitybar" , this.paneCompositePart, true);
+        }, Parts.ACTIVITYBAR_PART, this.paneCompositePart, true);
     }
     createContentArea(parent) {
         this.element = parent;
         this.content = append(this.element, $('.content'));
-        if (this.layoutService.isVisible("workbench.parts.activitybar" )) {
+        if (this.layoutService.isVisible(Parts.ACTIVITYBAR_PART)) {
             this.show();
         }
         return this.content;
@@ -150,7 +154,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
     }
     toJSON() {
         return {
-            type: "workbench.parts.activitybar"
+            type: Parts.ACTIVITYBAR_PART
         };
     }
 };
@@ -229,7 +233,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(18 ) || kbEvent.equals(17 )) {
+                if (kbEvent.equals(KeyCode.DownArrow) || kbEvent.equals(KeyCode.RightArrow)) {
                     this.focus();
                 }
             }));
@@ -237,10 +241,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(18 ) || kbEvent.equals(17 )) {
+                if (kbEvent.equals(KeyCode.DownArrow) || kbEvent.equals(KeyCode.RightArrow)) {
                     this.globalCompositeBar?.focus();
                 }
-                else if (kbEvent.equals(16 ) || kbEvent.equals(15 )) {
+                else if (kbEvent.equals(KeyCode.UpArrow) || kbEvent.equals(KeyCode.LeftArrow)) {
                     this.menuBar?.toggleFocus();
                 }
             }));
@@ -248,7 +252,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(16 ) || kbEvent.equals(15 )) {
+                if (kbEvent.equals(KeyCode.UpArrow) || kbEvent.equals(KeyCode.LeftArrow)) {
                     this.focus(this.getVisiblePaneCompositeIds().length - 1);
                 }
             }));
@@ -268,7 +272,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
     }
     layout(width, height) {
         if (this.menuBarContainer) {
-            if (this.options.orientation === 1 ) {
+            if (this.options.orientation === ActionsOrientation.VERTICAL) {
                 height -= this.menuBarContainer.clientHeight;
             }
             else {
@@ -276,7 +280,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
             }
         }
         if (this.globalCompositeBar) {
-            if (this.options.orientation === 1 ) {
+            if (this.options.orientation === ActionsOrientation.VERTICAL) {
                 height -= (this.globalCompositeBar.size() * ActivitybarPart.ACTION_HEIGHT);
             }
             else {
@@ -318,8 +322,8 @@ registerAction2(class extends Action2 {
             shortTitle: ( localizeWithPath(_moduleId, 5, "Default")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
-                `config.${"workbench.activityBar.location" }`,
-                "default"
+                `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
+                ActivityBarPosition.DEFAULT
             ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
@@ -327,15 +331,15 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.CommandPalette,
                     when: ( (ContextKeyExpr.notEquals(
-                        `config.${"workbench.activityBar.location" }`,
-                        "default"
+                        `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
+                        ActivityBarPosition.DEFAULT
                     ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue("workbench.activityBar.location" , "default" );
+        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.DEFAULT);
     }
 });
 registerAction2(class extends Action2 {
@@ -348,25 +352,19 @@ registerAction2(class extends Action2 {
             },
             shortTitle: ( localizeWithPath(_moduleId, 8, "Top")),
             category: Categories.View,
-            toggled: ( (ContextKeyExpr.equals(
-                `config.${"workbench.activityBar.location" }`,
-                "top"
-            ))),
+            toggled: ( (ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
                     order: 2
                 }, {
                     id: MenuId.CommandPalette,
-                    when: ( (ContextKeyExpr.notEquals(
-                        `config.${"workbench.activityBar.location" }`,
-                        "top"
-                    ))),
+                    when: ( (ContextKeyExpr.notEquals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue("workbench.activityBar.location" , "top" );
+        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.TOP);
     }
 });
 registerAction2(class extends Action2 {
@@ -380,8 +378,8 @@ registerAction2(class extends Action2 {
             shortTitle: ( localizeWithPath(_moduleId, 11, "Bottom")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
-                `config.${"workbench.activityBar.location" }`,
-                "bottom"
+                `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
+                ActivityBarPosition.BOTTOM
             ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
@@ -389,15 +387,15 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.CommandPalette,
                     when: ( (ContextKeyExpr.notEquals(
-                        `config.${"workbench.activityBar.location" }`,
-                        "bottom"
+                        `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
+                        ActivityBarPosition.BOTTOM
                     ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue("workbench.activityBar.location" , "bottom" );
+        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.BOTTOM);
     }
 });
 registerAction2(class extends Action2 {
@@ -411,8 +409,8 @@ registerAction2(class extends Action2 {
             shortTitle: ( localizeWithPath(_moduleId, 14, "Hidden")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
-                `config.${"workbench.activityBar.location" }`,
-                "hidden"
+                `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
+                ActivityBarPosition.HIDDEN
             ))),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
@@ -420,15 +418,15 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.CommandPalette,
                     when: ( (ContextKeyExpr.notEquals(
-                        `config.${"workbench.activityBar.location" }`,
-                        "hidden"
+                        `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
+                        ActivityBarPosition.HIDDEN
                     ))),
                 }]
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue("workbench.activityBar.location" , "hidden" );
+        configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, ActivityBarPosition.HIDDEN);
     }
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
@@ -442,7 +440,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
     title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewContainerLocation',
-        ViewContainerLocationToString(0 )
+        ViewContainerLocationToString(ViewContainerLocation.Sidebar)
     ))),
     group: '3_workbench_layout_move',
     order: 1
@@ -452,7 +450,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
     title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewLocation',
-        ViewContainerLocationToString(0 )
+        ViewContainerLocationToString(ViewContainerLocation.Sidebar)
     ))),
     group: '3_workbench_layout_move',
     order: 1
@@ -464,8 +462,8 @@ class SwitchSideBarViewAction extends Action2 {
     }
     async run(accessor) {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const visibleViewletIds = paneCompositeService.getVisiblePaneCompositeIds(0 );
-        const activeViewlet = paneCompositeService.getActivePaneComposite(0 );
+        const visibleViewletIds = paneCompositeService.getVisiblePaneCompositeIds(ViewContainerLocation.Sidebar);
+        const activeViewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (!activeViewlet) {
             return;
         }
@@ -476,7 +474,7 @@ class SwitchSideBarViewAction extends Action2 {
                 break;
             }
         }
-        await paneCompositeService.openPaneComposite(targetViewletId, 0 , true);
+        await paneCompositeService.openPaneComposite(targetViewletId, ViewContainerLocation.Sidebar, true);
     }
 }
 registerAction2(class PreviousSideBarViewAction extends SwitchSideBarViewAction {
@@ -510,7 +508,7 @@ registerAction2(class FocusActivityBarAction extends Action2 {
     }
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
-        layoutService.focusPart("workbench.parts.activitybar" );
+        layoutService.focusPart(Parts.ACTIVITYBAR_PART);
     }
 });
 registerThemingParticipant((theme, collector) => {
@@ -547,49 +545,31 @@ registerThemingParticipant((theme, collector) => {
     const outline = theme.getColor(activeContrastBorder);
     if (outline) {
         collector.addRule(`
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:before {
-				content: "";
-				position: absolute;
-				top: 8px;
-				left: 8px;
-				height: 32px;
-				width: 32px;
-				z-index: 1;
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label::before{
+				padding: 6px;
 			}
 
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.profile-activity-item:before {
-				top: -6px;
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label::before,
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active:hover .action-label::before,
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .action-label::before,
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:hover .action-label::before {
+				outline: 1px solid ${outline};
 			}
 
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active:hover:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:hover:before {
-				outline: 1px solid;
-			}
-
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover:before {
-				outline: 1px dashed;
+			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label::before {
+				outline: 1px dashed ${outline};
 			}
 
 			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator:before {
 				border-left-color: ${outline};
 			}
-
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active:hover:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:hover:before,
-			.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover:before {
-				outline-color: ${outline};
-			}
 		`);
     }
     else {
         const focusBorderColor = theme.getColor(focusBorder);
         if (focusBorderColor) {
             collector.addRule(`
-				.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator:before {
+				.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator::before {
 						border-left-color: ${focusBorderColor};
 					}
 				`);

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:before{margin-top:-2px;top:1px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:after{bottom:1px;margin-bottom:-2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{margin-top:-2px;top:2px}.monaco-workbench .activitybar>.content>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{bottom:2px;margin-bottom:-2px}.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-focusBorder)}.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: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: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}";
 n(css,{});
 
 export { css, css as default };

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

@@ -23,20 +23,23 @@ 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 { prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionsOrientation, 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 } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { WorkbenchToolBar, HiddenItemStrategy } 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';
@@ -64,7 +67,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("workbench.parts.auxiliarybar" , {
+        super(Parts.AUXILIARYBAR_PART, {
             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);
@@ -74,9 +77,9 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
         this.maximumHeight = Number.POSITIVE_INFINITY;
-        this.priority = 1 ;
+        this.priority = LayoutPriority.Low;
         this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("workbench.activityBar.location" )) {
+            if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
                 this.onDidChangeActivityBarLocation();
             }
         }));
@@ -93,7 +96,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() === 1 ;
+        const isPositionLeft = this.layoutService.getSideBarPosition() === Position.RIGHT;
         container.style.color = this.getColor(SIDE_BAR_FOREGROUND) || '';
         container.style.borderLeftColor = borderColor ?? '';
         container.style.borderRightColor = borderColor ?? '';
@@ -110,10 +113,10 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
             placeholderViewContainersKey: AuxiliaryBarPart_1.placeholdeViewContainersKey,
             viewContainersWorkspaceStateKey: AuxiliaryBarPart_1.viewContainersWorkspaceStateKey,
             icon: true,
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? 3  : 2 ,
+                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? HoverPosition.ABOVE : HoverPosition.BELOW,
             },
             fillExtraContextMenuActions: actions => this.fillExtraContextMenuActions(actions),
             compositeSize: 0,
@@ -133,7 +136,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         };
     }
     fillExtraContextMenuActions(actions) {
-        const currentPositionRight = this.layoutService.getSideBarPosition() === 0 ;
+        const currentPositionRight = this.layoutService.getSideBarPosition() === Position.LEFT;
         const viewsSubmenuAction = this.getViewsSubmenuAction();
         if (viewsSubmenuAction) {
             actions.push(( (new Separator())));
@@ -151,15 +154,15 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         ]);
     }
     shouldShowCompositeBar() {
-        return this.configurationService.getValue("workbench.activityBar.location" ) !== "hidden" ;
+        return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.HIDDEN;
     }
     getCompositeBarPosition() {
-        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        const activityBarPosition = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
         switch (activityBarPosition) {
-            case "top" : return CompositeBarPosition.TOP;
-            case "bottom" : return CompositeBarPosition.BOTTOM;
-            case "hidden" : return CompositeBarPosition.TITLE;
-            case "default" : return CompositeBarPosition.TITLE;
+            case ActivityBarPosition.TOP: return CompositeBarPosition.TOP;
+            case ActivityBarPosition.BOTTOM: return CompositeBarPosition.BOTTOM;
+            case ActivityBarPosition.HIDDEN: return CompositeBarPosition.TITLE;
+            case ActivityBarPosition.DEFAULT: return CompositeBarPosition.TITLE;
             default: return CompositeBarPosition.TITLE;
         }
     }
@@ -169,8 +172,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: 0 ,
-            hiddenItemStrategy: -1 ,
+            orientation: ActionsOrientation.HORIZONTAL,
+            hiddenItemStrategy: HiddenItemStrategy.NoHide,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
         }));
         toolBar.setActions(prepareActions(menu.getPrimaryActions()));
@@ -192,7 +195,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
     }
     toJSON() {
         return {
-            type: "workbench.parts.auxiliarybar"
+            type: Parts.AUXILIARYBAR_PART
         };
     }
 };

package/vscode/src/vs/workbench/browser/parts/compositeBar.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionsOrientation, ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { CompositeOverflowActivityAction, CompositeActionViewItem, CompositeOverflowActivityActionViewItem } from 'vscode/vscode/vs/workbench/browser/parts/compositeBarActions';
 import { $, addDisposableListener, EventType, getWindow, isAncestor, EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
@@ -63,7 +63,7 @@ class CompositeDragAndDrop {
             return undefined;
         }
         const items = this.getItems();
-        const before = this.orientation === 0  ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
+        const before = this.orientation === ActionsOrientation.HORIZONTAL ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
         return items.filter(item => item.visible).findIndex(item => item.id === targetId) + (before ? 0 : 1);
     }
     canDrop(data, targetCompositeId) {
@@ -167,9 +167,9 @@ let CompositeBar = class CompositeBar extends Widget {
         const posX = event.clientX;
         const posY = event.clientY;
         switch (this.options.orientation) {
-            case 0 :
+            case ActionsOrientation.HORIZONTAL:
                 return posX < rect.left;
-            case 1 :
+            case ActionsOrientation.VERTICAL:
                 return posY < rect.top;
         }
     }
@@ -316,7 +316,7 @@ let CompositeBar = class CompositeBar extends Widget {
             if (compositeSwitcherBar && this.dimension && this.dimension.height !== 0 && this.dimension.width !== 0) {
                 const currentItemsLength = compositeSwitcherBar.viewItems.length;
                 compositeSwitcherBar.push(( (items.map(composite => composite.activityAction))));
-                items.forEach((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === 1
+                items.forEach((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === ActionsOrientation.VERTICAL
                     ? compositeSwitcherBar.getHeight(currentItemsLength + index)
                     : compositeSwitcherBar.getWidth(currentItemsLength + index)));
                 items.forEach(() => compositeSwitcherBar.pull(compositeSwitcherBar.viewItems.length - 1));
@@ -333,7 +333,7 @@ let CompositeBar = class CompositeBar extends Widget {
         let maxVisible = compositesToShow.length;
         const totalComposites = compositesToShow.length;
         let size = 0;
-        const limit = this.options.orientation === 1  ? this.dimension.height : this.dimension.width;
+        const limit = this.options.orientation === ActionsOrientation.VERTICAL ? this.dimension.height : this.dimension.width;
         for (let i = 0; i < compositesToShow.length; i++) {
             const compositeSize = this.compositeSizeInBar.get(compositesToShow[i]);
             if (size + compositeSize > limit) {

package/vscode/src/vs/workbench/browser/parts/compositePart.js

@@ -4,12 +4,14 @@ import { defaultGenerator } from 'vscode/vscode/vs/base/common/idGenerator';
 import { MutableDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { prepareActions, ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { ProgressBar } from 'vscode/vscode/vs/base/browser/ui/progressbar/progressbar';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { $, show, hide, append, Dimension } from 'vscode/vscode/vs/base/browser/dom';
+import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { ScopedProgressIndicator, AbstractProgressScope } from 'vscode/vscode/vs/workbench/services/progress/browser/progressIndicator';
@@ -39,7 +41,7 @@ class CompositePart extends Part {
         this.mapActionsBindingToComposite = ( (new Map()));
         this.instantiatedCompositeItems = ( (new Map()));
         this.actionsListener = this._register(( (new MutableDisposable())));
-        this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, 1 , this.defaultCompositeId);
+        this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, StorageScope.WORKSPACE, this.defaultCompositeId);
         this.toolbarHoverDelegate = this._register(createInstantHoverDelegate());
     }
     openComposite(id, focus) {
@@ -99,13 +101,14 @@ class CompositePart extends Part {
                     }
                 })()
             )));
-            const compositeInstantiationService = this.instantiationService.createChild(( (new ServiceCollection(
+            const compositeInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection(
                 [IEditorProgressService, compositeProgressIndicator]
-            ))));
+            )))));
             const composite = compositeDescriptor.instantiate(compositeInstantiationService);
             const disposable = ( (new DisposableStore()));
             this.instantiatedCompositeItems.set(id, { composite, disposable, progress: compositeProgressIndicator });
             disposable.add(composite.onTitleAreaUpdate(() => this.onTitleAreaUpdate(composite.getId()), this));
+            disposable.add(compositeInstantiationService);
             return composite;
         }
         throw ( (new Error(`Unable to find composite with id ${id}`)));
@@ -114,10 +117,10 @@ class CompositePart extends Part {
         this.activeComposite = composite;
         const id = this.activeComposite.getId();
         if (id !== this.defaultCompositeId) {
-            this.storageService.store(this.activeCompositeSettingsKey, id, 1 , 1 );
+            this.storageService.store(this.activeCompositeSettingsKey, id, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(this.activeCompositeSettingsKey, 1 );
+            this.storageService.remove(this.activeCompositeSettingsKey, StorageScope.WORKSPACE);
         }
         this.lastActiveCompositeId = this.activeComposite.getId();
         let compositeContainer = this.mapCompositeToCompositeContainer.get(composite.getId());
@@ -230,7 +233,7 @@ class CompositePart extends Part {
         const titleActionsContainer = append(titleArea, $('.title-actions'));
         this.toolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, titleActionsContainer, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
             toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "Views and More Actions...")),
@@ -292,7 +295,7 @@ class CompositePart extends Part {
         return compositeItem ? compositeItem.progress : undefined;
     }
     getTitleAreaDropDownAnchorAlignment() {
-        return 1 ;
+        return AnchorAlignment.RIGHT;
     }
     layout(width, height, top, left) {
         super.layout(width, height, top, left);