@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -5,55 +5,54 @@ import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../plat
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { AuxiliaryBarVisibleContext, IsAuxiliaryWindowContext, AuxiliaryBarMaximizedContext } from '../../../common/contextkeys.js';
+import { SecondarySideBarVisibleContext, AuxiliaryBarVisibleContext, IsAuxiliaryWindowContext, AuxiliaryBarMaximizedContext } from '../../../common/contextkeys.js';
 import { ViewContainerLocation, ViewContainerLocationToString } from '../../../common/views.js';
-import { Parts, LayoutSettings, ActivityBarPosition } from '../../../services/layout/browser/layoutService.js';
+import { LayoutSettings, ActivityBarPosition, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
 
-const maximizeIcon = registerIcon("auxiliarybar-maximize", Codicon.screenFull, ( localize(3258, "Icon to maximize the secondary side bar.")));
-const closeIcon = registerIcon("auxiliarybar-close", Codicon.close, ( localize(3259, "Icon to close the secondary side bar.")));
+const maximizeIcon = registerIcon("auxiliarybar-maximize", Codicon.screenFull, ( localize(3481, "Icon to maximize the secondary side bar.")));
+const closeIcon = registerIcon("auxiliarybar-close", Codicon.close, ( localize(3482, "Icon to close the secondary side bar.")));
 const auxiliaryBarRightIcon = registerIcon(
     "auxiliarybar-right-layout-icon",
     Codicon.layoutSidebarRight,
-    ( localize(3260, "Icon to toggle the secondary side bar off in its right position."))
+    ( localize(3483, "Icon to toggle the secondary side bar off in its right position."))
 );
 const auxiliaryBarRightOffIcon = registerIcon(
     "auxiliarybar-right-off-layout-icon",
     Codicon.layoutSidebarRightOff,
-    ( localize(3261, "Icon to toggle the secondary side bar on in its right position."))
+    ( localize(3484, "Icon to toggle the secondary side bar on in its right position."))
 );
-const auxiliaryBarLeftIcon = registerIcon("auxiliarybar-left-layout-icon", Codicon.layoutSidebarLeft, ( localize(3262, "Icon to toggle the secondary side bar in its left position.")));
+const auxiliaryBarLeftIcon = registerIcon("auxiliarybar-left-layout-icon", Codicon.layoutSidebarLeft, ( localize(3485, "Icon to toggle the secondary side bar in its left position.")));
 const auxiliaryBarLeftOffIcon = registerIcon(
     "auxiliarybar-left-off-layout-icon",
     Codicon.layoutSidebarLeftOff,
-    ( localize(3263, "Icon to toggle the secondary side bar on in its left position."))
+    ( localize(3486, "Icon to toggle the secondary side bar on in its left position."))
 );
 class ToggleAuxiliaryBarAction extends Action2 {
     static {
         this.ID = "workbench.action.toggleAuxiliaryBar";
     }
     static {
-        this.LABEL = ( localize2(3264, "Toggle Secondary Side Bar Visibility"));
+        this.LABEL = ( localize2(3487, "Toggle Secondary Side Bar Visibility"));
     }
     constructor() {
         super({
             id: ToggleAuxiliaryBarAction.ID,
             title: ToggleAuxiliaryBarAction.LABEL,
             toggled: {
-                condition: AuxiliaryBarVisibleContext,
-                title: ( localize(3265, "Hide Secondary Side Bar")),
+                condition: SecondarySideBarVisibleContext,
+                title: ( localize(3488, "Hide Secondary Side Bar")),
                 icon: closeIcon,
-                mnemonicTitle: ( localize(3266, "&&Secondary Side Bar"))
+                mnemonicTitle: ( localize(3489, "&&Secondary Side Bar"))
             },
             icon: closeIcon,
             category: Categories.View,
             metadata: {
-                description: ( localize(3267, "Open/Show and Close/Hide Secondary Side Bar"))
+                description: ( localize(3490, "Open/Show and Close/Hide Secondary Side Bar"))
             },
             f1: true,
             keybinding: {
@@ -72,18 +71,14 @@ class ToggleAuxiliaryBarAction extends Action2 {
         });
     }
     async run(accessor) {
-        const layoutService = accessor.get(IWorkbenchLayoutService);
-        const isCurrentlyVisible = layoutService.isVisible(Parts.AUXILIARYBAR_PART);
-        layoutService.setPartHidden(isCurrentlyVisible, Parts.AUXILIARYBAR_PART);
-        const alertMessage = isCurrentlyVisible ? ( localize(3268, "Secondary Side Bar hidden")) : ( localize(3269, "Secondary Side Bar shown"));
-        alert(alertMessage);
+        accessor.get(IWorkbenchLayoutService).toggleSecondarySideBar();
     }
 }
 registerAction2(ToggleAuxiliaryBarAction);
 MenuRegistry.appendMenuItem(MenuId.AuxiliaryBarTitle, {
     command: {
         id: ToggleAuxiliaryBarAction.ID,
-        title: ( localize(3265, "Hide Secondary Side Bar")),
+        title: ( localize(3488, "Hide Secondary Side Bar")),
         icon: closeIcon
     },
     group: "navigation",
@@ -97,7 +92,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.closeAuxiliaryBar",
-            title: ( localize2(3265, "Hide Secondary Side Bar")),
+            title: ( localize2(3488, "Hide Secondary Side Bar")),
             category: Categories.View,
             precondition: AuxiliaryBarVisibleContext,
             f1: true
@@ -112,7 +107,7 @@ registerAction2(class FocusAuxiliaryBarAction extends Action2 {
         this.ID = "workbench.action.focusAuxiliaryBar";
     }
     static {
-        this.LABEL = ( localize2(3270, "Focus into Secondary Side Bar"));
+        this.LABEL = ( localize2(3491, "Focus into Secondary Side Bar"));
     }
     constructor() {
         super({
@@ -138,7 +133,7 @@ MenuRegistry.appendMenuItems([{
         group: "navigation",
         command: {
             id: ToggleAuxiliaryBarAction.ID,
-            title: ( localize(3271, "Toggle Secondary Side Bar")),
+            title: ( localize(3492, "Toggle Secondary Side Bar")),
             toggled: {
                 condition: AuxiliaryBarVisibleContext,
                 icon: auxiliaryBarLeftIcon
@@ -154,7 +149,7 @@ MenuRegistry.appendMenuItems([{
         group: "navigation",
         command: {
             id: ToggleAuxiliaryBarAction.ID,
-            title: ( localize(3271, "Toggle Secondary Side Bar")),
+            title: ( localize(3492, "Toggle Secondary Side Bar")),
             toggled: {
                 condition: AuxiliaryBarVisibleContext,
                 icon: auxiliaryBarRightIcon
@@ -170,7 +165,7 @@ MenuRegistry.appendMenuItems([{
         group: "3_workbench_layout_move",
         command: {
             id: ToggleAuxiliaryBarAction.ID,
-            title: ( localize2(3272, "Hide Secondary Side Bar"))
+            title: ( localize2(3493, "Hide Secondary Side Bar"))
         },
         when: ( ContextKeyExpr.and(AuxiliaryBarVisibleContext, ( ContextKeyExpr.equals(
             "viewContainerLocation",
@@ -183,7 +178,7 @@ registerAction2(class extends SwitchCompositeViewAction {
     constructor() {
         super({
             id: "workbench.action.previousAuxiliaryBarView",
-            title: ( localize2(3273, "Previous Secondary Side Bar View")),
+            title: ( localize2(3494, "Previous Secondary Side Bar View")),
             category: Categories.View,
             f1: true
         }, ViewContainerLocation.AuxiliaryBar, -1);
@@ -193,7 +188,7 @@ registerAction2(class extends SwitchCompositeViewAction {
     constructor() {
         super({
             id: "workbench.action.nextAuxiliaryBarView",
-            title: ( localize2(3274, "Next Secondary Side Bar View")),
+            title: ( localize2(3495, "Next Secondary Side Bar View")),
             category: Categories.View,
             f1: true
         }, ViewContainerLocation.AuxiliaryBar, 1);
@@ -206,8 +201,8 @@ class MaximizeAuxiliaryBar extends Action2 {
     constructor() {
         super({
             id: MaximizeAuxiliaryBar.ID,
-            title: ( localize2(3275, "Maximize Secondary Side Bar")),
-            tooltip: ( localize(3276, "Maximize Secondary Side Bar")),
+            title: ( localize2(3496, "Maximize Secondary Side Bar")),
+            tooltip: ( localize(3497, "Maximize Secondary Side Bar")),
             category: Categories.View,
             f1: true,
             precondition: ( AuxiliaryBarMaximizedContext.negate())
@@ -226,8 +221,8 @@ class RestoreAuxiliaryBar extends Action2 {
     constructor() {
         super({
             id: RestoreAuxiliaryBar.ID,
-            title: ( localize2(3277, "Restore Secondary Side Bar")),
-            tooltip: ( localize(3277, "Restore Secondary Side Bar")),
+            title: ( localize2(3498, "Restore Secondary Side Bar")),
+            tooltip: ( localize(3498, "Restore Secondary Side Bar")),
             category: Categories.View,
             f1: true,
             precondition: AuxiliaryBarMaximizedContext,
@@ -254,14 +249,14 @@ class ToggleMaximizedAuxiliaryBar extends Action2 {
     constructor() {
         super({
             id: ToggleMaximizedAuxiliaryBar.ID,
-            title: ( localize2(3278, "Toggle Maximized Secondary Side Bar")),
-            tooltip: ( localize(3279, "Maximize Secondary Side Bar")),
+            title: ( localize2(3499, "Toggle Maximized Secondary Side Bar")),
+            tooltip: ( localize(3500, "Maximize Secondary Side Bar")),
             f1: true,
             category: Categories.View,
             icon: maximizeIcon,
             toggled: {
                 condition: AuxiliaryBarMaximizedContext,
-                tooltip: ( localize(3277, "Restore Secondary Side Bar"))
+                tooltip: ( localize(3498, "Restore Secondary Side Bar"))
             },
             menu: {
                 id: MenuId.AuxiliaryBarTitle,

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.d.ts

@@ -15,6 +15,7 @@ import { IPaneCompositeBarOptions } from "../paneCompositeBar.js";
 import { IMenuService } from "../../../../platform/actions/common/actions.service.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
+import { IToolBarResponsiveBehaviorOptions } from "../../../../base/browser/ui/toolbar/toolbar.js";
 export declare class AuxiliaryBarPart extends AbstractPaneCompositePart {
     private commandService;
     static readonly activeViewSettingsKey = "workbench.auxiliarybar.activepanelid";
@@ -32,6 +33,7 @@ export declare class AuxiliaryBarPart extends AbstractPaneCompositePart {
     private readonly visibleViewContainersTracker;
     constructor(notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, commandService: ICommandService, menuService: IMenuService, configurationService: IConfigurationService);
     private onDidChangeAutoHideViewContainers;
+    protected getToolbarResponsiveBehavior(): IToolBarResponsiveBehaviorOptions;
     private resolveConfiguration;
     private onDidChangeActivityBarLocation;
     updateStyles(): void;

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

@@ -37,7 +37,7 @@ import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { MenuId, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { getContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -133,6 +133,16 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
             }
         }
     }
+    getToolbarResponsiveBehavior() {
+        return {
+            enabled: true,
+            kind: "all",
+            minItems: 0,
+            overflowFrom: "start",
+            actionMinWidth: 22,
+            getActionMinWidth: action => action instanceof SubmenuItemAction && action.item.isSplitButton ? 36 : undefined
+        };
+    }
     resolveConfiguration() {
         const position = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
         const canShowLabels = position !== ActivityBarPosition.TOP && position !== ActivityBarPosition.BOTTOM;
@@ -220,17 +230,17 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         const positionActions = getContextMenuActions(activityBarPositionMenu).secondary;
         const toggleShowLabelsAction = toAction({
             id: "workbench.action.auxiliarybar.toggleShowLabels",
-            label: this.configuration.showLabels ? ( localize(3280, "Show Icons")) : ( localize(3281, "Show Labels")),
+            label: this.configuration.showLabels ? ( localize(3501, "Show Icons")) : ( localize(3502, "Show Labels")),
             enabled: this.configuration.canShowLabels,
             run: () => this.configurationService.updateValue("workbench.secondarySideBar.showLabels", !this.configuration.showLabels)
         });
-        actions.push(...[( new Separator()), ( new SubmenuAction("workbench.action.panel.position", ( localize(3282, "Activity Bar Position")), positionActions)), toAction({
+        actions.push(...[( new Separator()), ( new SubmenuAction("workbench.action.panel.position", ( localize(3503, "Activity Bar Position")), positionActions)), toAction({
             id: ToggleSidebarPositionAction.ID,
-            label: currentPositionRight ? ( localize(3283, "Move Secondary Side Bar Left")) : ( localize(3284, "Move Secondary Side Bar Right")),
+            label: currentPositionRight ? ( localize(3504, "Move Secondary Side Bar Left")) : ( localize(3505, "Move Secondary Side Bar Right")),
             run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID)
         }), toggleShowLabelsAction, toAction({
             id: ToggleAuxiliaryBarAction.ID,
-            label: ( localize(3285, "Hide Secondary Side Bar")),
+            label: ( localize(3506, "Hide Secondary Side Bar")),
             run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID)
         })]);
     }

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

@@ -30,6 +30,11 @@
 	flex: 1;
 }
 
+.monaco-workbench .part.auxiliarybar.pane-composite-part > .composite.title > .title-label {
+	flex: 0 0 auto;
+	max-width: 40%;
+}
+
 .monaco-workbench .part.auxiliarybar > .title > .title-label h2 {
 	text-transform: uppercase;
 }
@@ -99,7 +104,7 @@
 }
 
 .monaco-workbench .auxiliarybar.part.pane-composite-part > .composite.title > .title-actions {
-	flex: inherit;
+	flex: 1;
 }
 
 .monaco-workbench .auxiliarybar.pane-composite-part > .title.has-composite-bar > .title-actions .monaco-action-bar .action-item {

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

@@ -225,7 +225,7 @@ let CompositeBar = class CompositeBar extends Widget {
                 }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
             },
             orientation: this.options.orientation,
-            ariaLabel: ( localize(3288, "Active View Switcher")),
+            ariaLabel: ( localize(3509, "Active View Switcher")),
             ariaRole: "tablist",
             preventLoopNavigation: this.options.preventLoopNavigation,
             triggerKeys: {

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

@@ -292,7 +292,7 @@ let CompositeBarActionViewItem = class CompositeBarActionViewItem extends BaseAc
     }
     computeTitle() {
         this.keybindingLabel = this.computeKeybindingLabel();
-        let title = this.keybindingLabel ? ( localize(3289, "{0} ({1})", this.compositeBarActionItem.name, this.keybindingLabel)) : this.compositeBarActionItem.name;
+        let title = this.keybindingLabel ? ( localize(3510, "{0} ({1})", this.compositeBarActionItem.name, this.keybindingLabel)) : this.compositeBarActionItem.name;
         const badges = this.getVisibleBadges(this.action.activities).badges;
         for (const badge of badges) {
             const description = badge.getDescription();
@@ -320,7 +320,7 @@ class CompositeOverflowActivityAction extends CompositeBarAction {
     constructor(showMenu) {
         super({
             id: "additionalComposites.action",
-            name: ( localize(3290, "Additional Views")),
+            name: ( localize(3511, "Additional Views")),
             classNames: ThemeIcon.asClassNameArray(Codicon.more)
         });
         this.showMenu = showMenu;
@@ -374,7 +374,7 @@ let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityAct
                 suffix = badge.number;
             }
             if (suffix) {
-                action.label = ( localize(3291, "{0} ({1})", composite.name, suffix));
+                action.label = ( localize(3512, "{0} ({1})", composite.name, suffix));
             } else {
                 action.label = composite.name || "";
             }
@@ -523,18 +523,18 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
         }
         const isPinned = this.compositeBar.isPinned(this.compositeBarActionItem.id);
         if (isPinned) {
-            this.toggleCompositePinnedAction.label = ( localize(3292, "Hide '{0}'", this.compositeBarActionItem.name));
+            this.toggleCompositePinnedAction.label = ( localize(3513, "Hide '{0}'", this.compositeBarActionItem.name));
             this.toggleCompositePinnedAction.checked = false;
             this.toggleCompositePinnedAction.enabled = this.compositeBar.getPinnedCompositeIds().length > 1;
         } else {
-            this.toggleCompositePinnedAction.label = ( localize(3293, "Keep '{0}'", this.compositeBarActionItem.name));
+            this.toggleCompositePinnedAction.label = ( localize(3514, "Keep '{0}'", this.compositeBarActionItem.name));
             this.toggleCompositePinnedAction.enabled = true;
         }
         const isBadgeEnabled = this.compositeBar.areBadgesEnabled(this.compositeBarActionItem.id);
         if (isBadgeEnabled) {
-            this.toggleCompositeBadgeAction.label = ( localize(3294, "Hide Badge"));
+            this.toggleCompositeBadgeAction.label = ( localize(3515, "Hide Badge"));
         } else {
-            this.toggleCompositeBadgeAction.label = ( localize(3295, "Show Badge"));
+            this.toggleCompositeBadgeAction.label = ( localize(3516, "Show Badge"));
         }
         const otherActions = this.contextMenuActionsProvider();
         if (otherActions.length) {
@@ -584,7 +584,7 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
 CompositeActionViewItem = ( __decorate([( __param(8, IContextMenuService)), ( __param(9, IKeybindingService)), ( __param(10, IInstantiationService)), ( __param(11, IThemeService)), ( __param(12, IHoverService)), ( __param(13, IConfigurationService)), ( __param(14, ICommandService))], CompositeActionViewItem));
 class ToggleCompositePinnedAction extends Action {
     constructor(activity, compositeBar) {
-        super("show.toggleCompositePinned", activity ? activity.name : ( localize(3296, "Toggle View Pinned")));
+        super("show.toggleCompositePinned", activity ? activity.name : ( localize(3517, "Toggle View Pinned")));
         this.activity = activity;
         this.compositeBar = compositeBar;
         this.checked = !!this.activity && this.compositeBar.isPinned(this.activity.id);
@@ -602,7 +602,7 @@ class ToggleCompositeBadgeAction extends Action {
     constructor(compositeBarActionItem, compositeBar) {
         super(
             "show.toggleCompositeBadge",
-            compositeBarActionItem ? compositeBarActionItem.name : ( localize(3297, "Toggle View Badge"))
+            compositeBarActionItem ? compositeBarActionItem.name : ( localize(3518, "Toggle View Badge"))
         );
         this.compositeBarActionItem = compositeBarActionItem;
         this.compositeBar = compositeBar;

package/vscode/src/vs/workbench/browser/parts/compositePart.d.ts

@@ -14,6 +14,7 @@ import { IThemeService } from "../../../platform/theme/common/themeService.servi
 import { INotificationService } from "../../../platform/notification/common/notification.service.js";
 import { AnchorAlignment } from "../../../base/browser/ui/contextview/contextview.js";
 import { WorkbenchToolBar } from "../../../platform/actions/browser/toolbar.js";
+import { IToolBarResponsiveBehaviorOptions } from "../../../base/browser/ui/toolbar/toolbar.js";
 import { IBoundarySashes } from "../../../base/browser/ui/sash/sash.js";
 import { IBaseActionViewItemOptions } from "../../../base/browser/ui/actionbar/actionViewItems.js";
 import { IHoverDelegate } from "../../../base/browser/ui/hover/hoverDelegate.js";
@@ -77,6 +78,7 @@ export declare abstract class CompositePart<T extends Composite, MementoType ext
     protected getLastActiveCompositeId(): string;
     protected hideActiveComposite(): Composite | undefined;
     protected createTitleArea(parent: HTMLElement): HTMLElement | undefined;
+    protected getToolbarResponsiveBehavior(): IToolBarResponsiveBehaviorOptions | undefined;
     protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel;
     protected createHeaderArea(): HTMLElement;
     protected createFooterArea(): HTMLElement;

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

@@ -123,10 +123,11 @@ class CompositePart extends Part {
         }
         const compositeDescriptor = this.registry.getComposite(id);
         if (compositeDescriptor) {
+            const disposable = ( new DisposableStore());
             const that = this;
-            const compositeProgressIndicator = ( new ScopedProgressIndicator(
+            const compositeProgressIndicator = disposable.add(( new ScopedProgressIndicator(
                 assertReturnsDefined(this.progressBar),
-                this._register(new (class extends AbstractProgressScope {
+                disposable.add(new (class extends AbstractProgressScope {
                     constructor() {
                         super(compositeDescriptor.id, !!isActive);
                         this._register(
@@ -135,12 +136,11 @@ class CompositePart extends Part {
                         this._register(that.onDidCompositeClose.event(e => this.onScopeClosed(e.getId())));
                     }
                 })())
-            ));
-            const compositeInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection(
+            )));
+            const compositeInstantiationService = disposable.add(this.instantiationService.createChild(( new ServiceCollection(
                 [IEditorProgressService, compositeProgressIndicator]
             ))));
             const composite = compositeDescriptor.instantiate(compositeInstantiationService);
-            const disposable = ( new DisposableStore());
             this.instantiatedCompositeItems.set(id, {
                 composite,
                 disposable,
@@ -149,7 +149,6 @@ class CompositePart extends Part {
             disposable.add(
                 composite.onTitleAreaUpdate(() => this.onTitleAreaUpdate(composite.getId()), this)
             );
-            disposable.add(compositeInstantiationService);
             return composite;
         }
         throw ( new Error(`Unable to find composite with id ${id}`));
@@ -237,7 +236,7 @@ class CompositePart extends Part {
         }
         const keybinding = this.keybindingService.lookupKeybinding(compositeId);
         this.titleLabel.updateTitle(compositeId, compositeTitle, keybinding?.getLabel() ?? undefined);
-        this.toolBar?.setAriaLabel(( localize(3298, "{0} actions", compositeTitle)));
+        this.toolBar?.setAriaLabel(( localize(3519, "{0} actions", compositeTitle)));
     }
     collectCompositeActions(composite) {
         const menuIds = composite?.getMenuIds();
@@ -290,15 +289,19 @@ class CompositePart extends Part {
                 orientation: ActionsOrientation.HORIZONTAL,
                 getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
                 anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-                toggleMenuTitle: ( localize(3299, "Views and More Actions...")),
+                toggleMenuTitle: ( localize(3520, "Views and More Actions...")),
                 telemetrySource: this.nameForTelemetry,
                 hoverDelegate: this.toolbarHoverDelegate,
-                trailingSeparator: this.trailingSeparator
+                trailingSeparator: this.trailingSeparator,
+                responsiveBehavior: this.getToolbarResponsiveBehavior()
             })
         );
         this.collectCompositeActions()();
         return titleArea;
     }
+    getToolbarResponsiveBehavior() {
+        return undefined;
+    }
     createTitleLabel(parent) {
         const titleContainer = append(parent, $(".title-label"));
         const titleLabel = append(titleContainer, $("h2"));
@@ -311,7 +314,7 @@ class CompositePart extends Part {
             updateTitle: (id, title, keybinding) => {
                 if (!this.activeComposite || this.activeComposite.getId() === id) {
                     titleLabel.textContent = title;
-                    hover.update(keybinding ? ( localize(3300, "{0} ({1})", title, keybinding)) : title);
+                    hover.update(keybinding ? ( localize(3521, "{0} ({1})", title, keybinding)) : title);
                 }
             },
             updateStyles: () => {

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.d.ts

@@ -1,9 +1,10 @@
+import { StandardKeyboardEvent } from "../../../../base/browser/keyboardEvent.js";
 import { IDialogOptions } from "../../../../base/browser/ui/dialog/dialog.js";
 import { IHostService } from "../../../services/host/browser/host.service.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 import { ILayoutService } from "../../../../platform/layout/browser/layoutService.service.js";
 import { IProductService } from "../../../../platform/product/common/productService.service.js";
-export declare function createWorkbenchDialogOptions(options: Partial<IDialogOptions>, keybindingService: IKeybindingService, layoutService: ILayoutService, hostService: IHostService, allowableCommands?: Set<string>): IDialogOptions;
+export declare function createWorkbenchDialogOptions(options: Partial<IDialogOptions>, keybindingService: IKeybindingService, layoutService: ILayoutService, hostService: IHostService, allowableCommands?: Set<string>, shouldPassThroughCommand?: (commandId: string, event: StandardKeyboardEvent) => boolean): IDialogOptions;
 export declare function createBrowserAboutDialogDetails(productService: IProductService): {
     title: string;
     details: string;

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.js

@@ -21,13 +21,14 @@ function createWorkbenchDialogOptions(
     keybindingService,
     layoutService,
     hostService,
-    allowableCommands = defaultDialogAllowableCommands
+    allowableCommands = defaultDialogAllowableCommands,
+    shouldPassThroughCommand
 ) {
     return {
         keyEventProcessor: event => {
             const resolved = keybindingService.softDispatch(event, layoutService.activeContainer);
             if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
-                if (!( allowableCommands.has(resolved.commandId))) {
+                if (!( allowableCommands.has(resolved.commandId)) && true) {
                     EventHelper.stop(event, true);
                 }
             }
@@ -43,7 +44,7 @@ function createWorkbenchDialogOptions(
 function createBrowserAboutDialogDetails(productService) {
     const detailString = useAgo => {
         return localize(
-            3301,
+            3522,
             "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
             productService.version || "Unknown",
             productService.commit || "Unknown",

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

@@ -37,7 +37,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.toggleCompactAuxiliaryWindow",
-            title: ( localize2(3304, "Toggle Window Compact Mode")),
+            title: ( localize2(3525, "Toggle Window Compact Mode")),
             category: Categories.View,
             f1: true,
             precondition: IsAuxiliaryWindowFocusedContext
@@ -54,7 +54,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.enableCompactAuxiliaryWindow",
-            title: ( localize(3305, "Turn On Compact Mode")),
+            title: ( localize(3526, "Turn On Compact Mode")),
             icon: Codicon.screenFull,
             menu: {
                 id: MenuId.LayoutControlMenu,
@@ -75,7 +75,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.disableCompactAuxiliaryWindow",
-            title: ( localize(3306, "Turn Off Compact Mode")),
+            title: ( localize(3527, "Turn Off Compact Mode")),
             icon: Codicon.screenNormal,
             menu: {
                 id: MenuId.LayoutControlMenu,
@@ -367,6 +367,7 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
             if (!this.optionsDisposable.value) {
                 this.optionsDisposable.value = this.enforcePartOptions({
                     showTabs: "none",
+                    showBreadcrumbs: false,
                     closeEmptyGroups: true
                 });
             }
@@ -418,7 +419,8 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         if (mergeConfirmingEditorsToMainPart) {
             for (const group of this.groups) {
                 group.closeAllEditors({
-                    excludeConfirming: true
+                    excludeConfirming: true,
+                    force: true
                 });
             }
             result = this.mergeGroupsToMainPart();

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

@@ -44,7 +44,7 @@ let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySide
         const primary = this.getPrimaryEditorPane();
         const secondary = this.getSecondaryEditorPane();
         if (primary instanceof BaseBinaryResourceEditor && secondary instanceof BaseBinaryResourceEditor) {
-            return localize(3307, "{0} ↔ {1}", secondary.getMetadata(), primary.getMetadata());
+            return localize(3528, "{0} ↔ {1}", secondary.getMetadata(), primary.getMetadata());
         }
         return undefined;
     }

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

@@ -17,7 +17,7 @@ let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlac
         this.onDidOpenInPlace = this._onDidOpenInPlace.event;
     }
     getTitle() {
-        return this.input ? this.input.getName() : ( localize(3308, "Binary Viewer"));
+        return this.input ? this.input.getName() : ( localize(3529, "Binary Viewer"));
     }
     async getContents(input, options) {
         const model = await input.resolve();
@@ -29,11 +29,11 @@ let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlac
         return {
             icon: "$(warning)",
             label: ( localize(
-                3309,
+                3530,
                 "The file is not displayed in the text editor because it is either binary or uses an unsupported text encoding."
             )),
             actions: [{
-                label: ( localize(3310, "Open Anyway")),
+                label: ( localize(3531, "Open Anyway")),
                 run: async () => {
                     await this.callbacks.openInternal(input, options);
                     this._onDidOpenInPlace.fire();

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.d.ts

@@ -25,13 +25,13 @@ export declare abstract class BreadcrumbsConfig<T> {
         bindTo(service: IConfigurationService): BreadcrumbsConfig<boolean>;
     };
     static readonly FilePath: {
-        bindTo(service: IConfigurationService): BreadcrumbsConfig<"on" | "off" | "last">;
+        bindTo(service: IConfigurationService): BreadcrumbsConfig<"last" | "off" | "on">;
     };
     static readonly SymbolPath: {
-        bindTo(service: IConfigurationService): BreadcrumbsConfig<"on" | "off" | "last">;
+        bindTo(service: IConfigurationService): BreadcrumbsConfig<"last" | "off" | "on">;
     };
     static readonly SymbolSortOrder: {
-        bindTo(service: IConfigurationService): BreadcrumbsConfig<"name" | "type" | "position">;
+        bindTo(service: IConfigurationService): BreadcrumbsConfig<"name" | "position" | "type">;
     };
     static readonly SymbolPathSeparator: {
         bindTo(service: IConfigurationService): BreadcrumbsConfig<string>;
@@ -39,11 +39,14 @@ export declare abstract class BreadcrumbsConfig<T> {
     static readonly Icons: {
         bindTo(service: IConfigurationService): BreadcrumbsConfig<boolean>;
     };
+    static readonly ShowEditorType: {
+        bindTo(service: IConfigurationService): BreadcrumbsConfig<boolean>;
+    };
     static readonly TitleScrollbarSizing: {
         bindTo(service: IConfigurationService): BreadcrumbsConfig<Required<NonNullable<"default" | "large" | undefined>>>;
     };
     static readonly TitleScrollbarVisibility: {
-        bindTo(service: IConfigurationService): BreadcrumbsConfig<Required<NonNullable<"hidden" | "visible" | "auto" | undefined>>>;
+        bindTo(service: IConfigurationService): BreadcrumbsConfig<Required<NonNullable<"auto" | "hidden" | "visible" | undefined>>>;
     };
     static readonly FileExcludes: {
         bindTo(service: IConfigurationService): BreadcrumbsConfig<glob.IExpression>;