@codingame/monaco-vscode-api 3.2.3 → 4.1.0

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { addDisposableListener, clearNode, EventHelper, $, EventType, isEventLike } from '../../../../base/browser/dom.js';
+import { clearNode, $, EventType, addDisposableListener, EventHelper, isEventLike } from '../../../../base/browser/dom.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -9,7 +9,7 @@ import { toAction, Separator, ActionRunner } from '../../../../base/common/actio
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, dispose, Disposable } from '../../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { ChoiceAction, NotificationViewItem } from '../../../common/notifications.js';
+import { NotificationViewItem, ChoiceAction } from '../../../common/notifications.js';
 import { ConfigureNotificationAction, ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction } from './notificationsActions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
@@ -23,6 +23,8 @@ import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touc
 import { Event } from '../../../../base/common/event.js';
 import { defaultProgressBarStyles, defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var NotificationRenderer_1, NotificationTemplateRenderer_1;
 class NotificationsListDelegate {
     static { this.ROW_HEIGHT = 42; }
@@ -156,7 +158,7 @@ let NotificationRenderer = class NotificationRenderer {
                 'notificationActions',
                 "Notification Actions"
             )),
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof ConfigureNotificationAction) {
                     return data.toDispose.add(( new DropdownMenuActionViewItem(action, {
                         getActions() {
@@ -189,6 +191,7 @@ let NotificationRenderer = class NotificationRenderer {
                             return actions;
                         },
                     }, this.contextMenuService, {
+                        ...options,
                         actionRunner: this.actionRunner,
                         classNames: action.class
                     })));
@@ -266,9 +269,11 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
             }
         }));
         this.renderSeverity(notification);
-        const messageOverflows = this.renderMessage(notification);
+        const messageCustomHover = this.inputDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), this.template.message, ''));
+        const messageOverflows = this.renderMessage(notification, messageCustomHover);
         this.renderSecondaryActions(notification, messageOverflows);
-        this.renderSource(notification);
+        const sourceCustomHover = this.inputDisposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), this.template.source, ''));
+        this.renderSource(notification, sourceCustomHover);
         this.renderButtons(notification);
         this.renderProgress(notification);
         this.inputDisposables.add(notification.onDidChangeContent(event => {
@@ -280,7 +285,7 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
                     this.renderProgress(notification);
                     break;
                 case 1 :
-                    this.renderMessage(notification);
+                    this.renderMessage(notification, messageCustomHover);
                     break;
             }
         }));
@@ -293,19 +298,14 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         });
         this.template.icon.classList.add(...ThemeIcon.asClassNameArray(this.toSeverityIcon(notification.severity)));
     }
-    renderMessage(notification) {
+    renderMessage(notification, customHover) {
         clearNode(this.template.message);
         this.template.message.appendChild(NotificationMessageRenderer.render(notification.message, {
             callback: link => this.openerService.open(( URI.parse(link)), { allowCommands: true }),
             toDispose: this.inputDisposables
         }));
         const messageOverflows = notification.canCollapse && !notification.expanded && this.template.message.scrollWidth > this.template.message.clientWidth;
-        if (messageOverflows) {
-            this.template.message.title = this.template.message.textContent + '';
-        }
-        else {
-            this.template.message.removeAttribute('title');
-        }
+        customHover.update(messageOverflows ? this.template.message.textContent + '' : '');
         return messageOverflows;
     }
     renderSecondaryActions(notification, messageOverflows) {
@@ -337,7 +337,7 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         this.template.toolbar.context = notification;
         actions.forEach(action => this.template.toolbar.push(action, { icon: true, label: false, keybinding: this.getKeybindingLabel(action) }));
     }
-    renderSource(notification) {
+    renderSource(notification, sourceCustomHover) {
         if (notification.expanded && notification.source) {
             this.template.source.textContent = ( localizeWithPath(
                 'vs/workbench/browser/parts/notifications/notificationsViewer',
@@ -345,11 +345,11 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
                 "Source: {0}",
                 notification.source
             ));
-            this.template.source.title = notification.source;
+            sourceCustomHover.update(notification.source);
         }
         else {
             this.template.source.textContent = '';
-            this.template.source.removeAttribute('title');
+            sourceCustomHover.update('');
         }
     }
     renderButtons(notification) {

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

@@ -44,6 +44,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.dndHandler = ( new CompositeDragAndDrop(
             this.viewDescriptorService,
             this.location,
+            this.options.orientation,
             async (id, focus) => { return (await this.paneCompositePart.openPaneComposite(id, focus)) ?? null; },
             (from, to, before) => this.compositeBar.move(from, to, this.options.orientation === 1  ? before?.verticallyBefore : before?.horizontallyBefore),
             () => this.compositeBar.getCompositeBarItems()

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

@@ -4,7 +4,7 @@ import { Event } from '../../../base/common/event.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { Extensions } from '../panecomposite.js';
 import { IViewDescriptorService } from '../../common/views.js';
-import { MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.js';
 import { CompositePart } from './compositePart.js';
 import { PaneCompositeBar } from './paneCompositeBar.js';
@@ -30,6 +30,12 @@ import { SubmenuAction } from '../../../base/common/actions.js';
 import { ViewsSubMenu } from './views/viewPaneContainer.js';
 import { createAndFillInActionBarActions } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
 var AbstractPaneCompositePart_1;
+var CompositeBarPosition;
+( (function(CompositeBarPosition) {
+    CompositeBarPosition[CompositeBarPosition["TOP"] = 0] = "TOP";
+    CompositeBarPosition[CompositeBarPosition["TITLE"] = 1] = "TITLE";
+    CompositeBarPosition[CompositeBarPosition["BOTTOM"] = 2] = "BOTTOM";
+})(CompositeBarPosition || (CompositeBarPosition = {})));
 let AbstractPaneCompositePart = class AbstractPaneCompositePart extends CompositePart {
     static { AbstractPaneCompositePart_1 = this; }
     static { this.MIN_COMPOSITE_BAR_WIDTH = 50; }
@@ -60,7 +66,9 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.extensionService = extensionService;
         this.menuService = menuService;
         this.onDidPaneCompositeClose = this.onDidCompositeClose.event;
+        this.headerFooterCompositeBarDispoables = this._register(( new DisposableStore()));
         this.paneCompositeBar = this._register(( new MutableDisposable()));
+        this.compositeBarPosition = undefined;
         this.blockOpening = false;
         this.location = location;
         this.globalActions = this._register(this.instantiationService.createInstance(CompositeMenuActions, globalActionsMenuId, undefined, undefined));
@@ -117,6 +125,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         if (contentArea) {
             this.createEmptyPaneMessage(contentArea);
         }
+        this.updateCompositeBar();
         const focusTracker = this._register(trackFocus(parent));
         this._register(focusTracker.onDidFocus(() => this.paneFocusContextKey.set(true)));
         this._register(focusTracker.onDidBlur(() => this.paneFocusContextKey.set(false)));
@@ -185,7 +194,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
                 'moreActions',
                 "More Actions..."
             )),
-            hoverDelegate: this.hoverDelegate
+            hoverDelegate: this.toolbarHoverDelegate
         })));
         this.updateGlobalToolbarActions();
         return titleArea;
@@ -199,29 +208,94 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             return { type: 'composite', id: activeViewlet.getId() };
         };
         this._register(CompositeDragAndDropObserver.INSTANCE.registerDraggable(this.titleLabelElement, draggedItemProvider, {}));
-        this.updateTitleArea();
         return titleLabel;
     }
-    updateTitleArea() {
-        if (!this.titleContainer) {
+    updateCompositeBar() {
+        const wasCompositeBarVisible = this.compositeBarPosition !== undefined;
+        const isCompositeBarVisible = this.shouldShowCompositeBar();
+        const previousPosition = this.compositeBarPosition;
+        const newPosition = isCompositeBarVisible ? this.getCompositeBarPosition() : undefined;
+        if (previousPosition === newPosition) {
             return;
         }
-        if (this.shouldShowCompositeBar()) {
-            if (!this.paneCompositeBar.value) {
-                this.titleContainer.classList.add('has-composite-bar');
-                this.paneCompositeBarContainer = prepend(this.titleContainer, $('.composite-bar-container'));
-                this.paneCompositeBar.value = this.createCompisteBar();
-                this.paneCompositeBar.value.create(this.paneCompositeBarContainer);
+        if (wasCompositeBarVisible) {
+            const previousCompositeBarContainer = previousPosition === CompositeBarPosition.TITLE ? this.titleContainer : this.headerFooterCompositeBarContainer;
+            if (!this.paneCompositeBarContainer || !this.paneCompositeBar.value || !previousCompositeBarContainer) {
+                throw new Error('Composite bar containers should exist when removing the previous composite bar');
             }
+            this.paneCompositeBarContainer.remove();
+            this.paneCompositeBarContainer = undefined;
+            this.paneCompositeBar.value = undefined;
+            previousCompositeBarContainer.classList.remove('has-composite-bar');
+            if (previousPosition === CompositeBarPosition.TOP) {
+                this.removeFooterHeaderArea(true);
+            }
+            else if (previousPosition === CompositeBarPosition.BOTTOM) {
+                this.removeFooterHeaderArea(false);
+            }
+        }
+        let newCompositeBarContainer;
+        switch (newPosition) {
+            case CompositeBarPosition.TOP:
+                newCompositeBarContainer = this.createHeaderArea();
+                break;
+            case CompositeBarPosition.TITLE:
+                newCompositeBarContainer = this.titleContainer;
+                break;
+            case CompositeBarPosition.BOTTOM:
+                newCompositeBarContainer = this.createFooterArea();
+                break;
+        }
+        if (isCompositeBarVisible) {
+            if (this.paneCompositeBarContainer || this.paneCompositeBar.value || !newCompositeBarContainer) {
+                throw new Error('Invalid composite bar state when creating the new composite bar');
+            }
+            newCompositeBarContainer.classList.add('has-composite-bar');
+            this.paneCompositeBarContainer = prepend(newCompositeBarContainer, $('.composite-bar-container'));
+            this.paneCompositeBar.value = this.createCompositeBar();
+            this.paneCompositeBar.value.create(this.paneCompositeBarContainer);
+            if (newPosition === CompositeBarPosition.TOP) {
+                this.setHeaderArea(newCompositeBarContainer);
+            }
+            else if (newPosition === CompositeBarPosition.BOTTOM) {
+                this.setFooterArea(newCompositeBarContainer);
+            }
+        }
+        this.compositeBarPosition = newPosition;
+    }
+    createHeaderArea() {
+        const headerArea = super.createHeaderArea();
+        return this.createHeaderFooterCompositeBarArea(headerArea);
+    }
+    createFooterArea() {
+        const footerArea = super.createFooterArea();
+        return this.createHeaderFooterCompositeBarArea(footerArea);
+    }
+    createHeaderFooterCompositeBarArea(area) {
+        if (this.headerFooterCompositeBarContainer) {
+            throw new Error('Header or Footer composite bar already exists');
+        }
+        this.headerFooterCompositeBarContainer = area;
+        this.headerFooterCompositeBarDispoables.add(addDisposableListener(area, EventType.CONTEXT_MENU, e => {
+            this.onCompositeBarAreaContextMenu(( new StandardMouseEvent(getWindow(area), e)));
+        }));
+        this.headerFooterCompositeBarDispoables.add(Gesture.addTarget(area));
+        this.headerFooterCompositeBarDispoables.add(addDisposableListener(area, EventType$1.Contextmenu, e => {
+            this.onCompositeBarAreaContextMenu(( new StandardMouseEvent(getWindow(area), e)));
+        }));
+        return area;
+    }
+    removeFooterHeaderArea(header) {
+        this.headerFooterCompositeBarContainer = undefined;
+        this.headerFooterCompositeBarDispoables.clear();
+        if (header) {
+            this.removeHeaderArea();
         }
         else {
-            this.titleContainer.classList.remove('has-composite-bar');
-            this.paneCompositeBarContainer?.remove();
-            this.paneCompositeBarContainer = undefined;
-            this.paneCompositeBar.clear();
+            this.removeFooterArea();
         }
     }
-    createCompisteBar() {
+    createCompositeBar() {
         return this.instantiationService.createInstance(PaneCompositeBar, this.getCompositeBarOptions(), this.partId, this);
     }
     onTitleAreaUpdate(compositeId) {
@@ -300,15 +374,19 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     }
     layoutCompositeBar() {
         if (this.contentDimension && this.dimension && this.paneCompositeBar.value) {
-            let availableWidth = this.contentDimension.width - 16;
-            if (this.toolBar) {
-                availableWidth = Math.max(AbstractPaneCompositePart_1.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
-            }
+            const padding = this.compositeBarPosition === CompositeBarPosition.TITLE ? 16 : 8;
+            const borderWidth = this.partId === "workbench.parts.panel"  ? 0 : 1;
+            let availableWidth = this.contentDimension.width - padding - borderWidth;
+            availableWidth = Math.max(AbstractPaneCompositePart_1.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
             this.paneCompositeBar.value.layout(availableWidth, this.dimension.height);
         }
     }
     layoutEmptyMessage() {
-        this.emptyPaneMessageElement?.classList.toggle('visible', !this.getActiveComposite());
+        const visible = !this.getActiveComposite();
+        this.emptyPaneMessageElement?.classList.toggle('visible', visible);
+        if (visible) {
+            this.titleLabel?.updateTitle('', '');
+        }
     }
     updateGlobalToolbarActions() {
         const primaryActions = this.globalActions.getPrimaryActions();
@@ -316,24 +394,20 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.globalToolBar?.setActions(prepareActions(primaryActions), prepareActions(secondaryActions));
     }
     getToolbarWidth() {
+        if (!this.toolBar || this.compositeBarPosition !== CompositeBarPosition.TITLE) {
+            return 0;
+        }
         const activePane = this.getActivePaneComposite();
-        if (!activePane || !this.toolBar) {
+        if (!activePane) {
             return 0;
         }
         const toolBarWidth = this.toolBar.getItemsWidth() + this.toolBar.getItemsLength() * 4;
         const globalToolBarWidth = this.globalToolBar ? this.globalToolBar.getItemsWidth() + this.globalToolBar.getItemsLength() * 4 : 0;
-        return 5 + toolBarWidth + globalToolBarWidth;
+        return toolBarWidth + globalToolBarWidth + 5;
     }
     onTitleAreaContextMenu(event) {
-        if (this.shouldShowCompositeBar() && this.paneCompositeBar.value) {
-            const actions = [...this.paneCompositeBar.value.getContextMenuActions()];
-            if (actions.length) {
-                this.contextMenuService.showContextMenu({
-                    getAnchor: () => event,
-                    getActions: () => actions,
-                    skipTelemetry: true
-                });
-            }
+        if (this.shouldShowCompositeBar() && this.getCompositeBarPosition() === CompositeBarPosition.TITLE) {
+            return this.onCompositeBarContextMenu(event);
         }
         else {
             const activePaneComposite = this.getActivePaneComposite();
@@ -349,6 +423,21 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             }
         }
     }
+    onCompositeBarAreaContextMenu(event) {
+        return this.onCompositeBarContextMenu(event);
+    }
+    onCompositeBarContextMenu(event) {
+        if (this.paneCompositeBar.value) {
+            const actions = [...this.paneCompositeBar.value.getContextMenuActions()];
+            if (actions.length) {
+                this.contextMenuService.showContextMenu({
+                    getAnchor: () => event,
+                    getActions: () => actions,
+                    skipTelemetry: true
+                });
+            }
+        }
+    }
     getViewsSubmenuAction() {
         const viewPaneContainer = this.getActivePaneComposite()?.getViewPaneContainer();
         if (viewPaneContainer) {
@@ -377,4 +466,4 @@ AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( __decorate([
     ( __param(17, IExtensionService)),
     ( __param(18, IMenuService))
 ], AbstractPaneCompositePart));
-export { AbstractPaneCompositePart };
+export { AbstractPaneCompositePart, CompositeBarPosition };

package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js

@@ -1,6 +1,6 @@
 import './media/panelpart.css.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
-import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IWorkbenchLayoutService, positionToString } from '../../../services/layout/browser/layoutService.js';
 import { PanelVisibleContext, PanelAlignmentContext, PanelPositionContext, PanelMaximizedContext, AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
@@ -418,7 +418,18 @@ registerAction2(class extends Action2 {
                 }, {
                     id: MenuId.AuxiliaryBarTitle,
                     group: 'navigation',
-                    order: 2
+                    order: 2,
+                    when: ( ContextKeyExpr.notEquals(
+                        `config.${"workbench.activityBar.location" }`,
+                        "top"
+                    ))
+                }, {
+                    id: MenuId.AuxiliaryBarHeader,
+                    group: 'navigation',
+                    when: ( ContextKeyExpr.equals(
+                        `config.${"workbench.activityBar.location" }`,
+                        "top"
+                    ))
                 }]
         });
     }

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -11,7 +11,17 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { TogglePanelAction } from './panelActions.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER } from '../../../common/theme.js';
-import { contrastBorder, badgeBackground, badgeForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import { badgeBackground, badgeForeground } from '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { Dimension } from '../../../../base/browser/dom.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -19,7 +29,7 @@ import { assertIsDefined } from '../../../../base/common/types.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { MenuId, IMenuService } from '../../../../platform/actions/common/actions.js';
-import { AbstractPaneCompositePart } from '../paneCompositePart.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 var PanelPart_1;
@@ -121,6 +131,9 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
     shouldShowCompositeBar() {
         return true;
     }
+    getCompositeBarPosition() {
+        return CompositeBarPosition.TITLE;
+    }
     toJSON() {
         return {
             type: "workbench.parts.panel"

package/vscode/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench.nosidebar>.part.sidebar{display:none!important;visibility:hidden!important}.monaco-workbench .part.sidebar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.sidebar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.sidebar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .viewlet .collapsible.header .title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .viewlet .collapsible.header .actions{width:0}.monaco-workbench .viewlet .collapsible.header.focused .actions,.monaco-workbench .viewlet .split-view-view:hover>.header .actions{flex:1;width:auto}.monaco-workbench .viewlet .collapsible.header .actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;height:22px;margin-right:0;width:28px}.monaco-workbench .viewlet .collapsible.header .actions .action-label .label,.monaco-workbench .viewlet .collapsible.header.collapsed .actions{display:none}.monaco-workbench .viewlet .collapsible.header .action-label{background-repeat:no-repeat;height:16px;margin-right:.2em;width:16px}.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .sidebar.pane-composite-part>.title>.composite-bar-container{flex:1}.monaco-workbench .sidebar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .sidebar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
+var css = ".monaco-workbench.nosidebar>.part.sidebar{display:none!important;visibility:hidden!important}.monaco-workbench .part.sidebar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.sidebar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.sidebar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .viewlet .collapsible.header .title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .viewlet .collapsible.header .actions{width:0}.monaco-workbench .viewlet .collapsible.header.focused .actions,.monaco-workbench .viewlet .split-view-view:hover>.header .actions{flex:1;width:auto}.monaco-workbench .viewlet .collapsible.header .actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;height:22px;margin-right:0;width:28px}.monaco-workbench .viewlet .collapsible.header .actions .action-label .label,.monaco-workbench .viewlet .collapsible.header.collapsed .actions{display:none}.monaco-workbench .viewlet .collapsible.header .action-label{background-repeat:no-repeat;height:16px;margin-right:.2em;width:16px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .sidebar.pane-composite-part>.title>.composite-bar-container{flex:1}.monaco-workbench .sidebar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .sidebar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js

@@ -0,0 +1,37 @@
+import './media/sidebarpart.css.js';
+import { localize2WithPath } from '../../../../nls.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+class FocusSideBarAction extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.focusSideBar',
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/sidebar/sidebarActions',
+                'focusSideBar',
+                'Focus into Primary Side Bar'
+            )),
+            category: Categories.View,
+            f1: true,
+            keybinding: {
+                weight: 200 ,
+                when: null,
+                primary: 2048  | 21
+            }
+        });
+    }
+    async run(accessor) {
+        const layoutService = accessor.get(IWorkbenchLayoutService);
+        const paneCompositeService = accessor.get(IPaneCompositePartService);
+        if (!layoutService.isVisible("workbench.parts.sidebar" )) {
+            layoutService.setPartHidden(false, "workbench.parts.sidebar" );
+            return;
+        }
+        const viewlet = paneCompositeService.getActivePaneComposite(0 );
+        viewlet?.focus();
+    }
+}
+registerAction2(FocusSideBarAction);
+export { FocusSideBarAction };

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/sidebarpart.css.js';
+import './sidebarActions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ActiveViewletContext, SidebarFocusContext } from '../../../common/contextkeys.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
@@ -7,14 +8,24 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { SIDE_BAR_BORDER, SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from '../../../common/theme.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { IViewDescriptorService } from '../../../common/views.js';
-import { AbstractPaneCompositePart } from '../paneCompositePart.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ActivitybarPart, ActivityBarCompositeBar } from '../activitybar/activitybarPart.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { registerAction2, Action2, IMenuService } from '../../../../platform/actions/common/actions.js';
@@ -54,12 +65,15 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         this.registerActions();
     }
     onDidChangeActivityBarLocation() {
-        this.updateTitleArea();
+        this.acitivityBarPart.hide();
+        this.updateCompositeBar();
         const id = this.getActiveComposite()?.getId();
         if (id) {
             this.onTitleAreaUpdate(id);
         }
-        this.updateActivityBarVisiblity();
+        if (this.shouldShowActivityBar()) {
+            this.acitivityBarPart.show();
+        }
         this.rememberActivityBarVisiblePosition();
     }
     updateStyles() {
@@ -86,7 +100,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
     getTitleAreaDropDownAnchorAlignment() {
         return this.layoutService.getSideBarPosition() === 0  ? 0  : 1 ;
     }
-    createCompisteBar() {
+    createCompositeBar() {
         return this.instantiationService.createInstance(ActivityBarCompositeBar, this.getCompositeBarOptions(), this.partId, this, false);
     }
     getCompositeBarOptions() {
@@ -99,7 +113,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             orientation: 0 ,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => 2 ,
+                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? 3  : 2 ,
             },
             fillExtraContextMenuActions: actions => {
                 const viewsSubmenuAction = this.getViewsSubmenuAction();
@@ -110,7 +124,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             },
             compositeSize: 0,
             iconSize: 16,
-            overflowActionSize: 44,
+            overflowActionSize: 30,
             colors: theme => ({
                 activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
                 inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
@@ -125,7 +139,8 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         };
     }
     shouldShowCompositeBar() {
-        return this.configurationService.getValue("workbench.activityBar.location" ) === "top" ;
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        return activityBarPosition === "top"  || activityBarPosition === "bottom" ;
     }
     shouldShowActivityBar() {
         if (this.shouldShowCompositeBar()) {
@@ -133,6 +148,16 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         }
         return this.configurationService.getValue("workbench.activityBar.location" ) !== "hidden" ;
     }
+    getCompositeBarPosition() {
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        switch (activityBarPosition) {
+            case "top" : return CompositeBarPosition.TOP;
+            case "bottom" : return CompositeBarPosition.BOTTOM;
+            case "hidden" :
+            case "default" :
+            default: return CompositeBarPosition.TITLE;
+        }
+    }
     rememberActivityBarVisiblePosition() {
         const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
         if (activityBarPosition !== "hidden" ) {
@@ -142,16 +167,9 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
     getRememberedActivityBarVisiblePosition() {
         const activityBarPosition = this.storageService.get("workbench.activityBar.location" , 0 );
         switch (activityBarPosition) {
-            case "side" : return "side" ;
-            default: return "top" ;
-        }
-    }
-    updateActivityBarVisiblity() {
-        if (this.shouldShowActivityBar()) {
-            this.acitivityBarPart.show();
-        }
-        else {
-            this.acitivityBarPart.hide();
+            case "top" : return "top" ;
+            case "bottom" : return "bottom" ;
+            default: return "default" ;
         }
     }
     getPinnedPaneCompositeIds() {

package/vscode/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css.js

@@ -0,0 +1,4 @@
+import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{margin-right:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.left.first-visible-item,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.right.last-visible-item{padding-left:0;padding-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color>.statusbar-item-label{margin-left:0;margin-right:0;padding-left:10px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.has-background-color>.statusbar-item-label{padding-left:3px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right.has-background-color>.statusbar-item-label{padding-left:10px;padding-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{align-items:center;cursor:pointer;display:flex;height:100%;outline-width:0;overflow:hidden;padding:0 5px;text-overflow:ellipsis;white-space:pre}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{padding:0 3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a:hover:not(.disabled){color:var(--vscode-statusBarItem-hoverForeground);text-decoration:none}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a.disabled{cursor:default}.monaco-workbench .part.statusbar>.items-container>.statusbar-item span.codicon{color:inherit;font-size:14px;text-align:center}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){outline:1px solid var(--vscode-contrastActiveBorder)!important;outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){background-color:var(--vscode-statusBarItem-activeBackground)!important}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){outline:1px dashed var(--vscode-contrastActiveBorder);outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-hoverBackground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.warning-kind{background-color:var(--vscode-statusBarItem-warningBackground);color:var(--vscode-statusBarItem-warningForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.warning-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-warningHoverBackground)!important;color:var(--vscode-statusBarItem-warningHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.error-kind{background-color:var(--vscode-statusBarItem-errorBackground);color:var(--vscode-statusBarItem-errorForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.error-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-errorHoverBackground)!important;color:var(--vscode-statusBarItem-errorHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.prominent-kind{background-color:var(--vscode-statusBarItem-prominentBackground);color:var(--vscode-statusBarItem-prominentForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.prominent-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-prominentHoverBackground)!important;color:var(--vscode-statusBarItem-prominentHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.remote-kind{background-color:var(--vscode-statusBarItem-remoteBackground);color:var(--vscode-statusBarItem-remoteForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.remote-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-remoteHoverBackground)!important;color:var(--vscode-statusBarItem-remoteHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.offline-kind{background-color:var(--vscode-statusBarItem-offlineBackground);color:var(--vscode-statusBarItem-offlineForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.offline-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-offlineHoverBackground)!important;color:var(--vscode-statusBarItem-offlineHoverForeground)}";
+n(css,{});
+export { css, css as default };