@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -7,20 +7,37 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.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 { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ActiveAuxiliaryContext, AuxiliaryBarFocusContext } from '../../../common/contextkeys.js';
-import { SIDE_BAR_BORDER, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER } from '../../../common/theme.js';
+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 '../../../common/theme.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { Separator, toAction } from '../../../../base/common/actions.js';
+import { Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
 import { ToggleAuxiliaryBarAction } from './auxiliaryBarActions.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { AbstractPaneCompositePart } from '../paneCompositePart.js';
-import { IMenuService } from '../../../../platform/actions/common/actions.js';
+import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
+import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { MenuId, IMenuService } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { $ } from '../../../../base/browser/dom.js';
+import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { CompositeMenuActions } from '../../actions.js';
 var AuxiliaryBarPart_1;
 let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart {
     static { AuxiliaryBarPart_1 = this; }
@@ -42,17 +59,30 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         }
         return Math.max(width, 300);
     }
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService) {
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
         super("workbench.parts.auxiliarybar" , {
             hasTitle: true,
             borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0,
         }, AuxiliaryBarPart_1.activePanelSettingsKey, ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), 'auxiliarybar', 'auxiliarybar', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.commandService = commandService;
+        this.configurationService = configurationService;
         this.minimumWidth = 170;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
         this.maximumHeight = Number.POSITIVE_INFINITY;
         this.priority = 1 ;
+        this._register(configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration("workbench.activityBar.location" )) {
+                this.onDidChangeActivityBarLocation();
+            }
+        }));
+    }
+    onDidChangeActivityBarLocation() {
+        this.updateCompositeBar();
+        const id = this.getActiveComposite()?.getId();
+        if (id) {
+            this.onTitleAreaUpdate(id);
+        }
     }
     updateStyles() {
         super.updateStyles();
@@ -69,6 +99,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         container.style.borderRightWidth = borderColor && isPositionLeft ? '1px' : '0px';
     }
     getCompositeBarOptions() {
+        const $this = this;
         return {
             partContainerClass: 'auxiliarybar',
             pinnedViewContainersKey: AuxiliaryBarPart_1.pinnedPanelsKey,
@@ -78,21 +109,21 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
             orientation: 0 ,
             recomputeSizes: true,
             activityHoverOptions: {
-                position: () => 2 ,
+                position: () => this.getCompositeBarPosition() === CompositeBarPosition.BOTTOM ? 3  : 2 ,
             },
             fillExtraContextMenuActions: actions => this.fillExtraContextMenuActions(actions),
             compositeSize: 0,
             iconSize: 16,
-            overflowActionSize: 44,
+            get overflowActionSize() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? 40 : 30; },
             colors: theme => ({
                 activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
                 inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
-                activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
-                activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
-                inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
+                get activeBorderBottomColor() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_ACTIVE_TITLE_BORDER) : theme.getColor(ACTIVITY_BAR_TOP_ACTIVE_BORDER); },
+                get activeForegroundColor() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND) : theme.getColor(ACTIVITY_BAR_TOP_FOREGROUND); },
+                get inactiveForegroundColor() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND) : theme.getColor(ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND); },
                 badgeBackground: theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND),
                 badgeForeground: theme.getColor(ACTIVITY_BAR_BADGE_FOREGROUND),
-                dragAndDropBorder: theme.getColor(PANEL_DRAG_AND_DROP_BORDER)
+                get dragAndDropBorder() { return $this.getCompositeBarPosition() === CompositeBarPosition.TITLE ? theme.getColor(PANEL_DRAG_AND_DROP_BORDER) : theme.getColor(ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER); }
             }),
             compact: true
         };
@@ -104,8 +135,17 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
             actions.push(( new Separator()));
             actions.push(viewsSubmenuAction);
         }
+        const activityBarPositionMenu = this.menuService.createMenu(MenuId.ActivityBarPositionMenu, this.contextKeyService);
+        const positionActions = [];
+        createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
+        activityBarPositionMenu.dispose();
         actions.push(...[
             ( new Separator()),
+            ( new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(
+                'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart',
+                'activity bar position',
+                "Activity Bar Position"
+            )), positionActions)),
             toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localizeWithPath(
                 'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart',
                 'move second side bar left',
@@ -123,7 +163,44 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         ]);
     }
     shouldShowCompositeBar() {
-        return true;
+        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" : return CompositeBarPosition.TITLE;
+            case "default" : return CompositeBarPosition.TITLE;
+            default: return CompositeBarPosition.TITLE;
+        }
+    }
+    createHeaderArea() {
+        const headerArea = super.createHeaderArea();
+        const globalHeaderContainer = $('.auxiliary-bar-global-header');
+        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 ,
+            getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
+        }));
+        toolBar.setActions(prepareActions(menu.getPrimaryActions()));
+        this.headerFooterCompositeBarDispoables.add(menu.onDidChange(() => toolBar.setActions(prepareActions(menu.getPrimaryActions()))));
+        headerArea.appendChild(globalHeaderContainer);
+        return headerArea;
+    }
+    getToolbarWidth() {
+        if (this.getCompositeBarPosition() === CompositeBarPosition.TOP) {
+            return 22;
+        }
+        return super.getToolbarWidth();
+    }
+    headerActionViewItemProvider(action, options) {
+        if (action.id === ToggleAuxiliaryBarAction.ID) {
+            return this.instantiationService.createInstance(ActionViewItem, undefined, action, options);
+        }
+        return undefined;
     }
     toJSON() {
         return {
@@ -143,6 +220,7 @@ AuxiliaryBarPart = AuxiliaryBarPart_1 = ( __decorate([
     ( __param(8, IContextKeyService)),
     ( __param(9, IExtensionService)),
     ( __param(10, ICommandService)),
-    ( __param(11, IMenuService))
+    ( __param(11, IMenuService)),
+    ( __param(12, IConfigurationService))
 ], AuxiliaryBarPart));
 export { AuxiliaryBarPart };

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .auxiliarybar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
+var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.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.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.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/compositeBar.js

@@ -14,9 +14,10 @@ import { IViewDescriptorService } from '../../common/views.js';
 import { CompositeDragAndDropObserver, toggleDropEffect } from '../dnd.js';
 import { Gesture, EventType as EventType$1 } from '../../../base/browser/touch.js';
 class CompositeDragAndDrop {
-    constructor(viewDescriptorService, targetContainerLocation, openComposite, moveComposite, getItems) {
+    constructor(viewDescriptorService, targetContainerLocation, orientation, openComposite, moveComposite, getItems) {
         this.viewDescriptorService = viewDescriptorService;
         this.targetContainerLocation = targetContainerLocation;
+        this.orientation = orientation;
         this.openComposite = openComposite;
         this.moveComposite = moveComposite;
         this.getItems = getItems;
@@ -60,7 +61,7 @@ class CompositeDragAndDrop {
             return undefined;
         }
         const items = this.getItems();
-        const before = this.targetContainerLocation === 1  ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
+        const before = this.orientation === 0  ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
         return items.filter(item => item.visible).findIndex(item => item.id === targetId) + (before ? 0 : 1);
     }
     canDrop(data, targetCompositeId) {
@@ -112,12 +113,12 @@ let CompositeBar = class CompositeBar extends Widget {
     create(parent) {
         const actionBarDiv = parent.appendChild($('.composite-bar'));
         this.compositeSwitcherBar = this._register(( new ActionBar(actionBarDiv, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof CompositeOverflowActivityAction) {
                     return this.compositeOverflowActionViewItem;
                 }
                 const item = this.model.findItem(action.id);
-                return item && this.instantiationService.createInstance(CompositeActionViewItem, { draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
+                return item && this.instantiationService.createInstance(CompositeActionViewItem, { ...options, draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
             },
             orientation: this.options.orientation,
             ariaLabel: ( localizeWithPath(

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

@@ -18,7 +18,17 @@ import { ThemeIcon } from '../../../base/common/themables.js';
 import { IHoverService } from '../../../platform/hover/browser/hover.js';
 import { RunOnceScheduler } from '../../../base/common/async.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { badgeForeground, badgeBackground, 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 { badgeForeground, badgeBackground } from '../../../platform/theme/common/colors/miscColors.js';
+import '../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../platform/theme/common/colors/searchColors.js';
 var CompositeBarActionViewItem_1, CompositeActionViewItem_1;
 class CompositeBarAction extends Action {
     constructor(item) {
@@ -539,13 +549,13 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
     updateChecked() {
         if (this.action.checked) {
             this.container.classList.add('checked');
-            this.container.setAttribute('aria-label', this.container.title);
+            this.container.setAttribute('aria-label', this.getTooltip() ?? this.container.title);
             this.container.setAttribute('aria-expanded', 'true');
             this.container.setAttribute('aria-selected', 'true');
         }
         else {
             this.container.classList.remove('checked');
-            this.container.setAttribute('aria-label', this.container.title);
+            this.container.setAttribute('aria-label', this.getTooltip() ?? this.container.title);
             this.container.setAttribute('aria-expanded', 'false');
             this.container.setAttribute('aria-selected', 'false');
         }

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

@@ -15,7 +15,8 @@ import { createActionViewItem } from '../../../platform/actions/browser/menuEntr
 import { ScopedProgressIndicator, AbstractProgressScope } from '../../services/progress/browser/progressIndicator.js';
 import { WorkbenchToolBar } from '../../../platform/actions/browser/toolbar.js';
 import { defaultProgressBarStyles } from '../../../platform/theme/browser/defaultStyles.js';
-import { getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { setupCustomHover } from '../../../base/browser/ui/hover/updatableHoverWidget.js';
 class CompositePart extends Part {
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
         super(id, options, themeService, storageService, layoutService);
@@ -37,7 +38,7 @@ class CompositePart extends Part {
         this.instantiatedCompositeItems = ( new Map());
         this.actionsListener = this._register(( new MutableDisposable()));
         this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, 1 , this.defaultCompositeId);
-        this.hoverDelegate = this._register(getDefaultHoverDelegate('element', true));
+        this.toolbarHoverDelegate = this._register(createInstantHoverDelegate());
     }
     openComposite(id, focus) {
         if (this.activeComposite?.getId() === id) {
@@ -241,7 +242,7 @@ class CompositePart extends Part {
                 "Views and More Actions..."
             )),
             telemetrySource: this.nameForTelemetry,
-            hoverDelegate: this.hoverDelegate
+            hoverDelegate: this.toolbarHoverDelegate
         }));
         this.collectCompositeActions()();
         return titleArea;
@@ -250,18 +251,19 @@ class CompositePart extends Part {
         const titleContainer = append(parent, $('.title-label'));
         const titleLabel = append(titleContainer, $('h2'));
         this.titleLabelElement = titleLabel;
+        const hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
         const $this = this;
         return {
             updateTitle: (id, title, keybinding) => {
                 if (!this.activeComposite || this.activeComposite.getId() === id) {
                     titleLabel.innerText = title;
-                    titleLabel.title = keybinding ? ( localizeWithPath(
+                    hover.update(keybinding ? ( localizeWithPath(
                         'vs/workbench/browser/parts/compositePart',
                         'titleTooltip',
                         "{0} ({1})",
                         title,
                         keybinding
-                    )) : title;
+                    )) : title);
                 }
             },
             updateStyles: () => {
@@ -269,6 +271,12 @@ class CompositePart extends Part {
             }
         };
     }
+    createHeaderArea() {
+        return $('.composite');
+    }
+    createFooterArea() {
+        return $('.composite');
+    }
     updateStyles() {
         super.updateStyles();
         const titleLabel = assertIsDefined(this.titleLabel);

package/vscode/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.js

@@ -126,6 +126,18 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
             disposables.dispose();
         }));
         disposables.add(Event.once(this.lifecycleService.onDidShutdown)(() => disposables.dispose()));
+        disposables.add(auxiliaryWindow.onBeforeUnload(event => {
+            for (const group of editorPart.groups) {
+                for (const editor of group.editors) {
+                    const canMoveVeto = editor.canMove(group.id, this.editorPartsView.mainPart.activeGroup.id);
+                    if (typeof canMoveVeto === 'string') {
+                        group.openEditor(editor);
+                        event.veto(canMoveVeto);
+                        break;
+                    }
+                }
+            }
+        }));
         disposables.add(auxiliaryWindow.onWillLayout(dimension => {
             const titlebarPartHeight = titlebarPart?.height ?? 0;
             titlebarPart?.layout(dimension.width, titlebarPartHeight, 0, 0);

package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js

@@ -13,8 +13,8 @@ import { IEditorGroupsService } from '../../../services/editor/common/editorGrou
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySideEditor {
     static { this.ID = BINARY_DIFF_EDITOR_ID; }
-    constructor(telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService) {
-        super(telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService);
+    constructor(group, telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService) {
+        super(group, telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService);
     }
     getMetadata() {
         const primary = this.getPrimaryEditorPane();
@@ -32,13 +32,13 @@ let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySide
     }
 };
 BinaryResourceDiffEditor = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, ITextResourceConfigurationService)),
-    ( __param(6, IEditorService)),
-    ( __param(7, IEditorGroupsService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IStorageService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, ITextResourceConfigurationService)),
+    ( __param(7, IEditorService)),
+    ( __param(8, IEditorGroupsService))
 ], BinaryResourceDiffEditor));
 export { BinaryResourceDiffEditor };

package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js

@@ -6,8 +6,8 @@ import { IStorageService } from '../../../../platform/storage/common/storage.js'
 import { ByteSize } from '../../../../platform/files/common/files.js';
 import { EditorPlaceholder } from './editorPlaceholder.js';
 let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlaceholder {
-    constructor(id, callbacks, telemetryService, themeService, storageService) {
-        super(id, telemetryService, themeService, storageService);
+    constructor(id, group, callbacks, telemetryService, themeService, storageService) {
+        super(id, group, telemetryService, themeService, storageService);
         this.callbacks = callbacks;
         this._onDidChangeMetadata = this._register(( new Emitter()));
         this.onDidChangeMetadata = this._onDidChangeMetadata.event;
@@ -59,6 +59,6 @@ let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlac
     }
 };
 BaseBinaryResourceEditor = ( __decorate([
-    ( __param(4, IStorageService))
+    ( __param(5, IStorageService))
 ], BaseBinaryResourceEditor));
 export { BaseBinaryResourceEditor };

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js

@@ -32,7 +32,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var BreadcrumbsControl_1;
 class OutlineItem extends BreadcrumbsItem {
     constructor(model, element, options) {
@@ -181,7 +181,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._ckBreadcrumbsPossible = BreadcrumbsControl_1.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsVisible = BreadcrumbsControl_1.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsActive = BreadcrumbsControl_1.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
-        this._hoverDelegate = nativeHoverDelegate;
+        this._hoverDelegate = getDefaultHoverDelegate('mouse');
         this._disposables.add(breadcrumbsService.register(this._editorGroup.id, this._widget));
         this.hide();
     }
@@ -418,7 +418,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
             }
         }
         else {
-            element.outline.reveal(element, { pinned }, group === SIDE_GROUP);
+            element.outline.reveal(element, { pinned }, group === SIDE_GROUP, false);
         }
     }
     _getEditorGroup(data) {
@@ -520,19 +520,20 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
                 title: ( localizeWithPath(
                     'vs/workbench/browser/parts/editor/breadcrumbsControl',
                     'cmd.toggle2',
-                    "Breadcrumbs"
+                    "Toggle Breadcrumbs"
                 )),
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/browser/parts/editor/breadcrumbsControl',
                     { key: 'miBreadcrumbs2', comment: ['&& denotes a mnemonic'] },
-                    "&&Breadcrumbs"
+                    "Toggle &&Breadcrumbs"
                 ))
             },
             menu: [
                 { id: MenuId.CommandPalette },
                 { id: MenuId.MenubarAppearanceMenu, group: '4_editor', order: 2 },
                 { id: MenuId.NotebookToolbar, group: 'notebookLayout', order: 2 },
-                { id: MenuId.StickyScrollContext }
+                { id: MenuId.StickyScrollContext },
+                { id: MenuId.NotebookStickyScrollContext, group: 'notebookView', order: 2 }
             ]
         });
     }
@@ -790,7 +791,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             return input.reveal(element, {
                 pinned: true,
                 preserveFocus: false
-            }, true);
+            }, true, false);
         }
     }
 });

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js

@@ -13,7 +13,17 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { WorkbenchAsyncDataTree, WorkbenchDataTree } from '../../../../platform/list/browser/listService.js';
-import { breadcrumbsPickerBackground, widgetShadow, widgetBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { breadcrumbsPickerBackground, widgetShadow, widgetBorder } from '../../../../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 { isWorkspaceFolder, isWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
 import { BreadcrumbsConfig } from './breadcrumbs.js';
@@ -21,7 +31,6 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { localizeWithPath } from '../../../../nls.js';
 import { SIDE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 let BreadcrumbsPicker = class BreadcrumbsPicker {
     constructor(parent, resource, _instantiationService, _themeService, _configurationService) {
         this.resource = resource;
@@ -158,14 +167,13 @@ FileDataSource = ( __decorate([
     ( __param(0, IFileService))
 ], FileDataSource));
 let FileRenderer = class FileRenderer {
-    constructor(_labels, _hoverDelegate, _configService) {
+    constructor(_labels, _configService) {
         this._labels = _labels;
-        this._hoverDelegate = _hoverDelegate;
         this._configService = _configService;
         this.templateId = 'FileStat';
     }
     renderTemplate(container) {
-        return this._labels.create(container, { supportHighlights: true, hoverDelegate: this._hoverDelegate });
+        return this._labels.create(container, { supportHighlights: true });
     }
     renderElement(node, index, templateData) {
         const fileDecorations = this._configService.getValue('explorer.decorations');
@@ -193,7 +201,7 @@ let FileRenderer = class FileRenderer {
     }
 };
 FileRenderer = ( __decorate([
-    ( __param(2, IConfigurationService))
+    ( __param(1, IConfigurationService))
 ], FileRenderer));
 class FileNavigationLabelProvider {
     getKeyboardNavigationLabel(element) {
@@ -294,7 +302,7 @@ let BreadcrumbsFilePicker = class BreadcrumbsFilePicker extends BreadcrumbsPicke
         onFileIconThemeChange(this._themeService.getFileIconTheme());
         const labels = this._instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER );
         this._disposables.add(labels);
-        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels, nativeHoverDelegate)], this._instantiationService.createInstance(FileDataSource), {
+        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels)], this._instantiationService.createInstance(FileDataSource), {
             multipleSelectionSupport: false,
             sorter: ( new FileSorter()),
             filter: this._instantiationService.createInstance(FileFilter),
@@ -405,7 +413,7 @@ class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
     async _revealElement(element, options, sideBySide) {
         this._onWillPickElement.fire();
         const outline = this._tree.getInput();
-        await outline.reveal(element, options, sideBySide);
+        await outline.reveal(element, options, sideBySide, false);
         return true;
     }
 }