@codingame/monaco-vscode-api 34.1.3 → 35.0.1

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

@@ -125,11 +125,11 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 moveActions.push(this.createMoveAction(viewContainer, location, defaultLocation));
             }
         }
-        actions.push(( new SubmenuAction("moveToMenu", ( localize(3793, "Move To")), moveActions)));
+        actions.push(( new SubmenuAction("moveToMenu", ( localize(3870, "Move To")), moveActions)));
         if (defaultLocation !== currentLocation) {
             actions.push(toAction({
                 id: "resetLocationAction",
-                label: ( localize(3794, "Reset Location")),
+                label: ( localize(3871, "Reset Location")),
                 run: () => {
                     this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, "resetLocationAction");
                     this.viewService.openViewContainer(viewContainer.id, true);
@@ -143,7 +143,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 if (defaultContainer !== viewContainer) {
                     actions.push(toAction({
                         id: "resetLocationAction",
-                        label: ( localize(3794, "Reset Location")),
+                        label: ( localize(3871, "Reset Location")),
                         run: () => {
                             this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, "resetLocationAction");
                             this.viewService.openViewContainer(viewContainer.id, true);
@@ -157,7 +157,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     createMoveAction(viewContainer, newLocation, defaultLocation) {
         return toAction({
             id: `moveViewContainerTo${newLocation}`,
-            label: newLocation === ViewContainerLocation.Panel ? ( localize(3795, "Panel")) : newLocation === ViewContainerLocation.Sidebar ? ( localize(3796, "Primary Side Bar")) : ( localize(3797, "Secondary Side Bar")),
+            label: newLocation === ViewContainerLocation.Panel ? ( localize(3872, "Panel")) : newLocation === ViewContainerLocation.Sidebar ? ( localize(3873, "Primary Side Bar")) : ( localize(3874, "Secondary Side Bar")),
             run: () => {
                 let index;
                 if (newLocation !== defaultLocation) {

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

@@ -25,6 +25,7 @@ import { IMenuService } from "../../../platform/actions/common/actions.service.j
 import { SubmenuAction } from "../../../base/common/actions.js";
 import { Composite } from "../composite.js";
 import { IHoverService } from "../../../platform/hover/browser/hover.service.js";
+import { IConfigurationService } from "../../../platform/configuration/common/configuration.service.js";
 export declare enum CompositeBarPosition {
     TOP = 0,
     TITLE = 1,
@@ -87,6 +88,7 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     protected readonly contextKeyService: IContextKeyService;
     private readonly extensionService;
     protected readonly menuService: IMenuService;
+    protected readonly configurationService: IConfigurationService;
     private static readonly MIN_COMPOSITE_BAR_WIDTH;
     get snap(): boolean;
     get onDidPaneCompositeOpen(): Event<IPaneComposite>;
@@ -101,7 +103,8 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     private globalToolBar;
     private blockOpening;
     protected contentDimension: Dimension | undefined;
-    constructor(partId: SINGLE_WINDOW_PARTS, partOptions: ICompositePartOptions, activePaneCompositeSettingsKey: string, activePaneContextKey: IContextKey<string>, paneFocusContextKey: IContextKey<boolean>, nameForTelemetry: string, compositeCSSClass: string, titleForegroundColor: string | undefined, titleBorderColor: string | undefined, location: ViewContainerLocation, registryId: string, globalActionsMenuId: MenuId, notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, menuService: IMenuService);
+    private floatingLayoutDimension;
+    constructor(partId: SINGLE_WINDOW_PARTS, partOptions: ICompositePartOptions, activePaneCompositeSettingsKey: string, activePaneContextKey: IContextKey<string>, paneFocusContextKey: IContextKey<boolean>, nameForTelemetry: string, compositeCSSClass: string, titleForegroundColor: string | undefined, titleBorderColor: string | undefined, location: ViewContainerLocation, registryId: string, globalActionsMenuId: MenuId, notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, menuService: IMenuService, configurationService: IConfigurationService);
     private registerListeners;
     private onDidOpen;
     private onDidClose;
@@ -130,6 +133,42 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     hideActivePaneComposite(): void;
     protected focusCompositeBar(): void;
     layout(width: number, height: number, top: number, left: number): void;
+    /**
+     * The window edges on which this part is the outermost floating card and therefore
+     * adopts a doubled outer gutter, so its contents do not hug the window edge. Applies
+     * to the primary side bar, the secondary side bar and the panel; a horizontal panel
+     * can own both edges at once.
+     */
+    private getFloatingOuterGutterEdges;
+    protected getRelayoutDimension(): Dimension | undefined;
+    /**
+     * Returns true when this sidebar/aux bar is in the same grid row as the editor
+     * (a sibling), meaning it abuts the panel above or below rather than the window edge.
+     * Delegates to the shared formula exported from layoutService.ts.
+     */
+    private isSidebarSiblingToEditor;
+    /**
+     * Returns the top margin (in pixels) this part should receive when floating panels
+     * are enabled. Only the bottom-panel and sibling side bars (when the panel is at the
+     * top) need a top margin; all other parts sit flush with the title bar.
+     */
+    private getFloatingPartTopMargin;
+    /**
+     * Returns whether this part's bottom edge faces the window edge rather than another
+     * floating card. When the status bar is hidden and this returns `true`, a doubled
+     * bottom margin is applied so the outer gap matches the doubled side gutters.
+     */
+    private isFloatingPartAtWindowBottomEdge;
+    /**
+     * Amount (in pixels) to subtract from each axis when the floating panels
+     * experiment is enabled: a margin on each side plus a 1px border on each side
+     * (the border is drawn inside the box, as `.monaco-workbench .part` is
+     * `box-sizing: border-box` in `part.css`). The side bars sit directly under the
+     * title bar, so they have no top margin. On each window edge this part is the outermost
+     * floating card on (see {@link getFloatingOuterGutterEdges}) it gets a doubled outer
+     * margin, so its width inset is larger on that side.
+     */
+    private getFloatingInset;
     private layoutCompositeBar;
     private layoutEmptyMessage;
     protected getToolbarWidth(): number;

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

@@ -6,7 +6,7 @@ import { Event } from '../../../base/common/event.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { IViewDescriptorService } from '../../common/views.service.js';
 import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { Parts } from '../../services/layout/browser/layoutService.js';
+import { getFloatingOuterGutterEdges, getFloatingSidebarSiblingToEditorStatus, Parts, Position, FLOATING_PANEL_MARGIN } from '../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.service.js';
 import { CompositePart } from './compositePart.js';
 import { PaneCompositeBar } from './paneCompositeBar.js';
@@ -30,6 +30,7 @@ import { SubmenuAction } from '../../../base/common/actions.js';
 import { ViewsSubMenu } from './views/viewPaneContainer.js';
 import { getActionBarActions } from '../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IHoverService } from '../../../platform/hover/browser/hover.service.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../platform/actions/browser/toolbar.js';
 import { DeferredPromise } from '../../../base/common/async.js';
 
@@ -78,7 +79,8 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         viewDescriptorService,
         contextKeyService,
         extensionService,
-        menuService
+        menuService,
+        configurationService
     ) {
         super(
             notificationService,
@@ -109,6 +111,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.contextKeyService = contextKeyService;
         this.extensionService = extensionService;
         this.menuService = menuService;
+        this.configurationService = configurationService;
         this.onDidPaneCompositeClose = this.onDidCompositeClose.event;
         this.headerFooterCompositeBarDispoables = this._register(( new DisposableStore()));
         this.paneCompositeBar = this._register(( new MutableDisposable()));
@@ -173,7 +176,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     createEmptyPaneMessage(parent) {
         this.emptyPaneMessageElement = $(".empty-pane-message-area");
         const messageElement = $(".empty-pane-message");
-        messageElement.textContent = ( localize(3798, "Drag a view here to display."));
+        messageElement.textContent = ( localize(3875, "Drag a view here to display."));
         this.emptyPaneMessageElement.appendChild(messageElement);
         parent.appendChild(this.emptyPaneMessageElement);
         const setDropBackgroundFeedback = visible => {
@@ -259,7 +262,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
                 orientation: ActionsOrientation.HORIZONTAL,
                 getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
                 anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-                toggleMenuTitle: ( localize(3799, "More Actions...")),
+                toggleMenuTitle: ( localize(3876, "More Actions...")),
                 hoverDelegate: this.toolbarHoverDelegate,
                 hiddenItemStrategy: HiddenItemStrategy.NoHide,
                 highlightToggledItems: true,
@@ -458,11 +461,73 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         if (!this.layoutService.isVisible(this.partId)) {
             return;
         }
+        this.floatingLayoutDimension = ( new Dimension(width, height));
+        const floatingInset = this.getFloatingInset();
+        if (floatingInset.width > 0 || floatingInset.height > 0) {
+            width = Math.max(0, width - floatingInset.width);
+            height = Math.max(0, height - floatingInset.height);
+        }
         this.contentDimension = ( new Dimension(width, height));
+        const outerGutter = this.getFloatingOuterGutterEdges();
+        this.element.classList.toggle("floating-part-outer-left", outerGutter.left);
+        this.element.classList.toggle("floating-part-outer-right", outerGutter.right);
         super.layout(this.contentDimension.width, this.contentDimension.height, top, left);
         this.layoutCompositeBar();
         this.layoutEmptyMessage();
     }
+    getFloatingOuterGutterEdges() {
+        return getFloatingOuterGutterEdges(this.layoutService, this.partId);
+    }
+    getRelayoutDimension() {
+        return this.floatingLayoutDimension ?? super.getRelayoutDimension();
+    }
+    isSidebarSiblingToEditor() {
+        const {
+            sideBar,
+            auxBar
+        } = getFloatingSidebarSiblingToEditorStatus(this.layoutService);
+        return this.partId === Parts.SIDEBAR_PART ? sideBar : auxBar;
+    }
+    getFloatingPartTopMargin(panelVisible, margin) {
+        if (this.partId === Parts.PANEL_PART && this.layoutService.getPanelPosition() === Position.BOTTOM) {
+            return margin;
+        }
+        if (panelVisible && this.layoutService.getPanelPosition() === Position.TOP && (this.partId === Parts.SIDEBAR_PART || this.partId === Parts.AUXILIARYBAR_PART) && this.isSidebarSiblingToEditor()) {
+            return margin;
+        }
+        return 0;
+    }
+    isFloatingPartAtWindowBottomEdge(panelVisible) {
+        if (this.partId === Parts.PANEL_PART && this.layoutService.getPanelPosition() === Position.TOP) {
+            return false;
+        }
+        const panelAtBottom = panelVisible && this.layoutService.getPanelPosition() === Position.BOTTOM;
+        if (panelAtBottom && (this.partId === Parts.SIDEBAR_PART || this.partId === Parts.AUXILIARYBAR_PART) && this.isSidebarSiblingToEditor()) {
+            return false;
+        }
+        return true;
+    }
+    getFloatingInset() {
+        if (!this.layoutService.isFloatingPanelsEnabled()) {
+            return {
+                width: 0,
+                height: 0
+            };
+        }
+        const borderTotal = 2;
+        const margin = FLOATING_PANEL_MARGIN;
+        const panelVisible = this.layoutService.isVisible(Parts.PANEL_PART);
+        const topMargin = this.getFloatingPartTopMargin(panelVisible, margin);
+        const isAtWindowBottom = this.isFloatingPartAtWindowBottomEdge(panelVisible);
+        const bottomMargin = !this.layoutService.isVisible(Parts.STATUSBAR_PART, getWindow(this.element)) && isAtWindowBottom ? margin * 2 : margin;
+        const outerGutter = this.getFloatingOuterGutterEdges();
+        const leftMargin = outerGutter.left ? margin * 2 : margin;
+        const rightMargin = outerGutter.right ? margin * 2 : margin;
+        return {
+            width: leftMargin + rightMargin + borderTotal,
+            height: topMargin + bottomMargin + borderTotal
+        };
+    }
     layoutCompositeBar() {
         if (this.contentDimension && this.dimension && this.paneCompositeBar.value) {
             const padding = this.compositeBarPosition === CompositeBarPosition.TITLE ? 16 : 8;
@@ -537,11 +602,11 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             });
             const viewsActions = getActionBarActions(menu, () => true).primary;
             disposables.dispose();
-            return viewsActions.length > 1 && ( viewsActions.some(a => a.enabled)) ? ( new SubmenuAction("views", ( localize(3800, "Views")), viewsActions)) : undefined;
+            return viewsActions.length > 1 && ( viewsActions.some(a => a.enabled)) ? ( new SubmenuAction("views", ( localize(3877, "Views")), viewsActions)) : undefined;
         }
         return undefined;
     }
 };
-AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( __decorate([( __param(12, INotificationService)), ( __param(13, IStorageService)), ( __param(14, IContextMenuService)), ( __param(15, IWorkbenchLayoutService)), ( __param(16, IKeybindingService)), ( __param(17, IHoverService)), ( __param(18, IInstantiationService)), ( __param(19, IThemeService)), ( __param(20, IViewDescriptorService)), ( __param(21, IContextKeyService)), ( __param(22, IExtensionService)), ( __param(23, IMenuService))], AbstractPaneCompositePart));
+AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( __decorate([( __param(12, INotificationService)), ( __param(13, IStorageService)), ( __param(14, IContextMenuService)), ( __param(15, IWorkbenchLayoutService)), ( __param(16, IKeybindingService)), ( __param(17, IHoverService)), ( __param(18, IInstantiationService)), ( __param(19, IThemeService)), ( __param(20, IViewDescriptorService)), ( __param(21, IContextKeyService)), ( __param(22, IExtensionService)), ( __param(23, IMenuService)), ( __param(24, IConfigurationService))], AbstractPaneCompositePart));
 
 export { AbstractPaneCompositePart, CompositeBarPosition };

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

@@ -20,16 +20,16 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
 
 registerCss(panelpart);
-const maximizeIcon = registerIcon("panel-maximize", Codicon.screenFull, ( localize(3801, "Icon to maximize a panel.")));
-const closeIcon = registerIcon("panel-close", Codicon.close, ( localize(3802, "Icon to close a panel.")));
-const panelIcon = registerIcon("panel-layout-icon", Codicon.layoutPanel, ( localize(3803, "Icon to toggle the panel off when it is on.")));
-const panelOffIcon = registerIcon("panel-layout-icon-off", Codicon.layoutPanelOff, ( localize(3804, "Icon to toggle the panel on when it is off.")));
+const maximizeIcon = registerIcon("panel-maximize", Codicon.screenFull, ( localize(3878, "Icon to maximize a panel.")));
+const closeIcon = registerIcon("panel-close", Codicon.close, ( localize(3879, "Icon to close a panel.")));
+const panelIcon = registerIcon("panel-layout-icon", Codicon.layoutPanel, ( localize(3880, "Icon to toggle the panel off when it is on.")));
+const panelOffIcon = registerIcon("panel-layout-icon-off", Codicon.layoutPanelOff, ( localize(3881, "Icon to toggle the panel on when it is off.")));
 class TogglePanelAction extends Action2 {
     static {
         this.ID = "workbench.action.togglePanel";
     }
     static {
-        this.LABEL = ( localize2(3805, "Toggle Panel Visibility"));
+        this.LABEL = ( localize2(3882, "Toggle Panel Visibility"));
     }
     constructor() {
         super({
@@ -37,15 +37,15 @@ class TogglePanelAction extends Action2 {
             title: TogglePanelAction.LABEL,
             toggled: {
                 condition: PanelVisibleContext,
-                title: ( localize(3806, "Hide Panel")),
+                title: ( localize(3883, "Hide Panel")),
                 icon: closeIcon,
-                mnemonicTitle: ( localize(3807, "&&Panel"))
+                mnemonicTitle: ( localize(3884, "&&Panel"))
             },
             icon: closeIcon,
             f1: true,
             category: Categories.View,
             metadata: {
-                description: ( localize(3808, "Open/Show and Close/Hide Panel"))
+                description: ( localize(3885, "Open/Show and Close/Hide Panel"))
             },
             keybinding: {
                 primary: KeyMod$1.CtrlCmd | KeyCode.KeyJ,
@@ -71,7 +71,7 @@ registerAction2(TogglePanelAction);
 MenuRegistry.appendMenuItem(MenuId.PanelTitle, {
     command: {
         id: TogglePanelAction.ID,
-        title: ( localize(3806, "Hide Panel")),
+        title: ( localize(3883, "Hide Panel")),
         icon: closeIcon
     },
     group: "navigation",
@@ -81,7 +81,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.closePanel",
-            title: ( localize2(3806, "Hide Panel")),
+            title: ( localize2(3883, "Hide Panel")),
             category: Categories.View,
             precondition: PanelVisibleContext,
             f1: true
@@ -96,12 +96,12 @@ registerAction2(class extends Action2 {
         this.ID = "workbench.action.focusPanel";
     }
     static {
-        this.LABEL = ( localize(3809, "Focus into Panel"));
+        this.LABEL = ( localize(3886, "Focus into Panel"));
     }
     constructor() {
         super({
             id: "workbench.action.focusPanel",
-            title: ( localize2(3809, "Focus into Panel")),
+            title: ( localize2(3886, "Focus into Panel")),
             category: Categories.View,
             f1: true
         });
@@ -143,11 +143,11 @@ function createPositionPanelActionConfig(id, title, shortLabel, position) {
 function createAlignmentPanelActionConfig(id, title, shortLabel, alignment) {
     return createPanelActionConfig(id, title, shortLabel, alignment, ( PanelAlignmentContext.notEqualsTo(alignment)));
 }
-const PositionPanelActionConfigs = [createPositionPanelActionConfig(PositionPanelActionId.TOP, ( localize2(3810, "Move Panel To Top")), ( localize(3811, "Top")), Position.TOP), createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2(3812, "Move Panel Left")), ( localize(3813, "Left")), Position.LEFT), createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2(3814, "Move Panel Right")), ( localize(3815, "Right")), Position.RIGHT), createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2(3816, "Move Panel To Bottom")), ( localize(3817, "Bottom")), Position.BOTTOM)];
-const AlignPanelActionConfigs = [createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, ( localize2(3818, "Set Panel Alignment to Left")), ( localize(3819, "Left")), "left"), createAlignmentPanelActionConfig(AlignPanelActionId.RIGHT, ( localize2(3820, "Set Panel Alignment to Right")), ( localize(3821, "Right")), "right"), createAlignmentPanelActionConfig(AlignPanelActionId.CENTER, ( localize2(3822, "Set Panel Alignment to Center")), ( localize(3823, "Center")), "center"), createAlignmentPanelActionConfig(AlignPanelActionId.JUSTIFY, ( localize2(3824, "Set Panel Alignment to Justify")), ( localize(3825, "Justify")), "justify")];
+const PositionPanelActionConfigs = [createPositionPanelActionConfig(PositionPanelActionId.TOP, ( localize2(3887, "Move Panel To Top")), ( localize(3888, "Top")), Position.TOP), createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2(3889, "Move Panel Left")), ( localize(3890, "Left")), Position.LEFT), createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2(3891, "Move Panel Right")), ( localize(3892, "Right")), Position.RIGHT), createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2(3893, "Move Panel To Bottom")), ( localize(3894, "Bottom")), Position.BOTTOM)];
+const AlignPanelActionConfigs = [createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, ( localize2(3895, "Set Panel Alignment to Left")), ( localize(3896, "Left")), "left"), createAlignmentPanelActionConfig(AlignPanelActionId.RIGHT, ( localize2(3897, "Set Panel Alignment to Right")), ( localize(3898, "Right")), "right"), createAlignmentPanelActionConfig(AlignPanelActionId.CENTER, ( localize2(3899, "Set Panel Alignment to Center")), ( localize(3900, "Center")), "center"), createAlignmentPanelActionConfig(AlignPanelActionId.JUSTIFY, ( localize2(3901, "Set Panel Alignment to Justify")), ( localize(3902, "Justify")), "justify")];
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.PanelPositionMenu,
-    title: ( localize(3826, "Panel Position")),
+    title: ( localize(3903, "Panel Position")),
     group: "3_workbench_layout_move",
     order: 4
 });
@@ -184,7 +184,7 @@ PositionPanelActionConfigs.forEach((positionPanelAction, index) => {
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.PanelAlignmentMenu,
-    title: ( localize(3827, "Align Panel")),
+    title: ( localize(3904, "Align Panel")),
     group: "3_workbench_layout_move",
     order: 5
 });
@@ -224,7 +224,7 @@ registerAction2(class extends SwitchCompositeViewAction {
     constructor() {
         super({
             id: "workbench.action.previousPanelView",
-            title: ( localize2(3828, "Previous Panel View")),
+            title: ( localize2(3905, "Previous Panel View")),
             category: Categories.View,
             f1: true
         }, ViewContainerLocation.Panel, -1);
@@ -234,7 +234,7 @@ registerAction2(class extends SwitchCompositeViewAction {
     constructor() {
         super({
             id: "workbench.action.nextPanelView",
-            title: ( localize2(3829, "Next Panel View")),
+            title: ( localize2(3906, "Next Panel View")),
             category: Categories.View,
             f1: true
         }, ViewContainerLocation.Panel, 1);
@@ -245,15 +245,15 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.toggleMaximizedPanel",
-            title: ( localize2(3830, "Toggle Maximized Panel")),
-            tooltip: ( localize(3831, "Maximize Panel")),
+            title: ( localize2(3907, "Toggle Maximized Panel")),
+            tooltip: ( localize(3908, "Maximize Panel")),
             category: Categories.View,
             f1: true,
             icon: maximizeIcon,
             precondition: panelMaximizationSupportedWhen,
             toggled: {
                 condition: PanelMaximizedContext,
-                tooltip: ( localize(3832, "Restore Panel"))
+                tooltip: ( localize(3909, "Restore Panel"))
             },
             menu: [{
                 id: MenuId.PanelTitle,
@@ -267,7 +267,7 @@ registerAction2(class extends Action2 {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const notificationService = accessor.get(INotificationService);
         if (layoutService.getPanelAlignment() !== "center" && isHorizontal(layoutService.getPanelPosition())) {
-            notificationService.warn(( localize(3833, "Maximizing the panel is only supported when it is center aligned.")));
+            notificationService.warn(( localize(3910, "Maximizing the panel is only supported when it is center aligned.")));
             return;
         }
         if (!layoutService.isVisible(Parts.PANEL_PART)) {
@@ -286,7 +286,7 @@ MenuRegistry.appendMenuItems([{
         group: "navigation",
         command: {
             id: TogglePanelAction.ID,
-            title: ( localize(3834, "Toggle Panel")),
+            title: ( localize(3911, "Toggle Panel")),
             icon: panelOffIcon,
             toggled: {
                 condition: PanelVisibleContext,
@@ -331,7 +331,7 @@ class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
             id: MovePanelToSidePanelAction.ID,
-            title: ( localize2(3835, "Move Panel Views To Secondary Side Bar")),
+            title: ( localize2(3912, "Move Panel Views To Secondary Side Bar")),
             category: Categories.View,
             f1: false
         });
@@ -344,7 +344,7 @@ class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
             id: MovePanelToSecondarySideBarAction.ID,
-            title: ( localize2(3835, "Move Panel Views To Secondary Side Bar")),
+            title: ( localize2(3912, "Move Panel Views To Secondary Side Bar")),
             category: Categories.View,
             f1: true
         });
@@ -359,7 +359,7 @@ class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
             id: MoveSidePanelToPanelAction.ID,
-            title: ( localize2(3836, "Move Secondary Side Bar Views To Panel")),
+            title: ( localize2(3913, "Move Secondary Side Bar Views To Panel")),
             category: Categories.View,
             f1: false
         });
@@ -372,7 +372,7 @@ class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
             id: MoveSecondarySideBarToPanelAction.ID,
-            title: ( localize2(3836, "Move Secondary Side Bar Views To Panel")),
+            title: ( localize2(3913, "Move Secondary Side Bar Views To Panel")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.d.ts

@@ -16,7 +16,6 @@ import { IHoverService } from "../../../../platform/hover/browser/hover.service.
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 export declare class PanelPart extends AbstractPaneCompositePart {
     private commandService;
-    private configurationService;
     readonly minimumWidth: number;
     readonly maximumWidth: number;
     readonly minimumHeight: number;

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

@@ -85,9 +85,8 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         super(Parts.PANEL_PART, {
             hasTitle: true,
             trailingSeparator: true
-        }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), "panel", "panel", undefined, PANEL_TITLE_BORDER, ViewContainerLocation.Panel, Extensions.Panels, MenuId.PanelTitle, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), "panel", "panel", undefined, PANEL_TITLE_BORDER, ViewContainerLocation.Panel, Extensions.Panels, MenuId.PanelTitle, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService, configurationService);
         this.commandService = commandService;
-        this.configurationService = configurationService;
         this.minimumWidth = 300;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 77;
@@ -158,12 +157,12 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         const panelShowLabels = this.configurationService.getValue("workbench.panel.showLabels");
         const toggleShowLabelsAction = toAction({
             id: "workbench.action.panel.toggleShowLabels",
-            label: panelShowLabels ? ( localize(3837, "Show Icons")) : ( localize(3838, "Show Labels")),
+            label: panelShowLabels ? ( localize(3914, "Show Icons")) : ( localize(3915, "Show Labels")),
             run: () => this.configurationService.updateValue("workbench.panel.showLabels", !panelShowLabels)
         });
-        actions.push(...[( new Separator()), ( new SubmenuAction("workbench.action.panel.position", ( localize(3839, "Panel Position")), positionActions)), ( new SubmenuAction("workbench.action.panel.align", ( localize(3840, "Align Panel")), alignActions)), toggleShowLabelsAction, toAction({
+        actions.push(...[( new Separator()), ( new SubmenuAction("workbench.action.panel.position", ( localize(3916, "Panel Position")), positionActions)), ( new SubmenuAction("workbench.action.panel.align", ( localize(3917, "Align Panel")), alignActions)), toggleShowLabelsAction, toAction({
             id: TogglePanelAction.ID,
-            label: ( localize(3841, "Hide Panel")),
+            label: ( localize(3918, "Hide Panel")),
             run: () => this.commandService.executeCommand(TogglePanelAction.ID)
         })]);
     }

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

@@ -17,7 +17,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.closeSidebar",
-            title: ( localize2(3842, "Close Primary Side Bar")),
+            title: ( localize2(3919, "Close Primary Side Bar")),
             category: Categories.View,
             f1: true,
             precondition: SideBarVisibleContext
@@ -31,7 +31,7 @@ class FocusSideBarAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.focusSideBar",
-            title: ( localize2(3843, "Focus into Primary Side Bar")),
+            title: ( localize2(3920, "Focus into Primary Side Bar")),
             category: Categories.View,
             f1: true,
             keybinding: {

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts

@@ -17,7 +17,6 @@ import { IConfigurationService } from "../../../../platform/configuration/common
 import { IMenuService } from "../../../../platform/actions/common/actions.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
 export declare class SidebarPart extends AbstractPaneCompositePart {
-    private readonly configurationService;
     static readonly activeViewletSettingsKey = "workbench.sidebar.activeviewletid";
     readonly minimumWidth: number;
     readonly maximumWidth: number;

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

@@ -91,8 +91,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             hasTitle: true,
             trailingSeparator: false,
             borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0
-        }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), "sideBar", "viewlet", SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, ViewContainerLocation.Sidebar, Extensions.Viewlets, MenuId.SidebarTitle, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
-        this.configurationService = configurationService;
+        }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), "sideBar", "viewlet", SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_TITLE_BORDER, ViewContainerLocation.Sidebar, Extensions.Viewlets, MenuId.SidebarTitle, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService, configurationService);
         this.minimumWidth = 170;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 0;
@@ -299,7 +298,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             constructor() {
                 super({
                     id: ToggleActivityBarVisibilityActionId,
-                    title: ( localize2(3844, "Toggle Activity Bar Visibility"))
+                    title: ( localize2(3921, "Toggle Activity Bar Visibility"))
                 });
             }
             run() {

package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js

@@ -261,11 +261,11 @@ class MenubarControl extends Disposable {
             return;
         }
         const message = ( localize(
-            3863,
+            3940,
             "Accessibility support is enabled for you. For the most accessible experience, we recommend the custom menu style."
         ));
         this.notificationService.prompt(Severity$1.Info, message, [{
-            label: ( localize(3864, "Open Settings")),
+            label: ( localize(3941, "Open Settings")),
             run: () => {
                 return this.preferencesService.openUserSettings({
                     query: MenuSettings.MenuStyle
@@ -288,7 +288,7 @@ function enableFocusMenuBarAction() {
             constructor() {
                 super({
                     id: `workbench.actions.menubar.focus`,
-                    title: ( localize2(3865, "Focus Application Menu")),
+                    title: ( localize2(3942, "Focus Application Menu")),
                     keybinding: {
                         primary: KeyMod$1.Alt | KeyCode.F10,
                         weight: KeybindingWeight.WorkbenchContrib,
@@ -376,21 +376,21 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         case StateType.Idle:
             return toAction({
                 id: "update.check",
-                label: ( localize(3866, "Check for &&Updates...")),
+                label: ( localize(3943, "Check for &&Updates...")),
                 enabled: true,
                 run: () => this.updateService.checkForUpdates(true)
             });
         case StateType.CheckingForUpdates:
             return toAction({
                 id: "update.checking",
-                label: ( localize(3867, "Checking for Updates...")),
+                label: ( localize(3944, "Checking for Updates...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.AvailableForDownload:
             return toAction({
                 id: "update.downloadNow",
-                label: ( localize(3868, "D&&ownload Update")),
+                label: ( localize(3945, "D&&ownload Update")),
                 enabled: true,
                 run: () => this.updateService.downloadUpdate(true)
             });
@@ -398,28 +398,35 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         case StateType.Overwriting:
             return toAction({
                 id: "update.downloading",
-                label: ( localize(3869, "Downloading Update...")),
+                label: ( localize(3946, "Downloading Update...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.Downloaded:
             return isMacintosh ? null : toAction({
                 id: "update.install",
-                label: ( localize(3870, "Install &&Update...")),
+                label: ( localize(3947, "Install &&Update...")),
                 enabled: true,
                 run: () => this.updateService.applyUpdate()
             });
         case StateType.Updating:
             return toAction({
                 id: "update.updating",
-                label: ( localize(3871, "Installing Update...")),
+                label: ( localize(3948, "Installing Update...")),
+                enabled: false,
+                run: () => {}
+            });
+        case StateType.Cancelling:
+            return toAction({
+                id: "update.cancelling",
+                label: ( localize(3949, "Cancelling Update...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.Ready:
             return toAction({
                 id: "update.restart",
-                label: ( localize(3872, "Restart to &&Update")),
+                label: ( localize(3950, "Restart to &&Update")),
                 enabled: true,
                 run: () => this.updateService.quitAndInstall()
             });