@codingame/monaco-vscode-api 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.d.ts

@@ -10,6 +10,8 @@ import { INotificationsToastController } from "./notificationsCommands.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { ILifecycleService } from "../../../services/lifecycle/common/lifecycle.service.js";
 import { IHostService } from "../../../services/host/browser/host.service.js";
+import { IWorkbenchEnvironmentService } from "../../../services/environment/common/environmentService.service.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 export declare class NotificationsToasts extends Themable implements INotificationsToastController {
     private readonly container;
     private readonly model;
@@ -18,6 +20,8 @@ export declare class NotificationsToasts extends Themable implements INotificati
     private readonly editorGroupService;
     private readonly lifecycleService;
     private readonly hostService;
+    private readonly environmentService;
+    private readonly configurationService;
     private static readonly MAX_WIDTH;
     private static readonly MAX_NOTIFICATIONS;
     private static readonly PURGE_TIMEOUT;
@@ -33,10 +37,13 @@ export declare class NotificationsToasts extends Themable implements INotificati
     private readonly mapNotificationToDisposable;
     private readonly notificationsToastsVisibleContextKey;
     private readonly addedToastsIntervalCounter;
-    constructor(container: HTMLElement, model: INotificationsModel, instantiationService: IInstantiationService, layoutService: IWorkbenchLayoutService, themeService: IThemeService, editorGroupService: IEditorGroupsService, contextKeyService: IContextKeyService, lifecycleService: ILifecycleService, hostService: IHostService);
+    constructor(container: HTMLElement, model: INotificationsModel, instantiationService: IInstantiationService, layoutService: IWorkbenchLayoutService, themeService: IThemeService, editorGroupService: IEditorGroupsService, contextKeyService: IContextKeyService, lifecycleService: ILifecycleService, hostService: IHostService, environmentService: IWorkbenchEnvironmentService, configurationService: IConfigurationService);
     private registerListeners;
+    private updateNotificationPosition;
+    private updateTopOffset;
     private onDidChangeNotification;
     private addToast;
+    private isElementInNotificationQuarter;
     private doAddToast;
     private purgeNotification;
     private removeToast;

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

@@ -3,9 +3,9 @@ import { registerCss } from '../../../../../../../css.js';
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import * as notificationsToasts from './media/notificationsToasts.css';
 import { localize } from '../../../../nls.js';
-import { NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
+import { NotificationsSettings, getNotificationsPosition, NotificationsPosition, NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
 import { DisposableStore, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
-import { Dimension, getActiveElement, isHTMLElement, isEditableElement, isElementInBottomRightQuarter, scheduleAtNextAnimationFrame, getWindow, $, addDisposableListener, EventType, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
+import { Dimension, getActiveElement, isHTMLElement, isEditableElement, scheduleAtNextAnimationFrame, getWindow, getDomNodePagePosition, getClientArea, $, addDisposableListener, EventType, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { NotificationsList } from './notificationsList.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
@@ -14,17 +14,6 @@ import { IWorkbenchLayoutService } from '../../../services/layout/browser/layout
 import { NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_TOAST_BORDER } from '../../../common/theme.js';
 import { Themable } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-import '../../../../platform/theme/common/colorUtils.js';
-import '../../../../platform/theme/common/colors/baseColors.js';
-import '../../../../platform/theme/common/colors/chartsColors.js';
-import { widgetShadow } 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 { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { NotificationsFilter, NotificationPriority, withSeverityPrefix } from '../../../../platform/notification/common/notification.js';
@@ -36,6 +25,9 @@ import { IntervalCounter } from '../../../../base/common/async.js';
 import { assertReturnsDefined } from '../../../../base/common/types.js';
 import { NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
 import { mainWindow } from '../../../../base/browser/window.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from '../../../../platform/window/common/window.js';
 import Severity$1 from '../../../../base/common/severity.js';
 
 var NotificationsToasts_1;
@@ -81,7 +73,9 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         editorGroupService,
         contextKeyService,
         lifecycleService,
-        hostService
+        hostService,
+        environmentService,
+        configurationService
     ) {
         super(themeService);
         this.container = container;
@@ -91,6 +85,8 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         this.editorGroupService = editorGroupService;
         this.lifecycleService = lifecycleService;
         this.hostService = hostService;
+        this.environmentService = environmentService;
+        this.configurationService = configurationService;
         this._onDidChangeVisibility = this._register(( new Emitter()));
         this.onDidChangeVisibility = this._onDidChangeVisibility.event;
         this._isVisible = false;
@@ -104,6 +100,11 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         this._register(
             this.layoutService.onDidLayoutMainContainer(dimension => this.layout(Dimension.lift(dimension)))
         );
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(NotificationsSettings.NOTIFICATIONS_POSITION)) {
+                this.updateNotificationPosition();
+            }
+        }));
         this.lifecycleService.when(LifecyclePhase.Restored).then(() => {
             this.model.notifications.forEach(notification => this.addToast(notification));
             this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
@@ -125,6 +126,30 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             }
         }));
     }
+    updateNotificationPosition() {
+        if (!this.notificationsToastsContainer) {
+            return;
+        }
+        const position = getNotificationsPosition(this.configurationService);
+        this.notificationsToastsContainer.classList.remove("bottom-right", "bottom-left", "top-right");
+        this.notificationsToastsContainer.classList.add(position);
+        this.updateTopOffset();
+    }
+    updateTopOffset() {
+        if (!this.notificationsToastsContainer) {
+            return;
+        }
+        const position = getNotificationsPosition(this.configurationService);
+        if (position === NotificationsPosition.TOP_RIGHT) {
+            let topOffset = 3;
+            if (this.layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow)) {
+                topOffset += DEFAULT_CUSTOM_TITLEBAR_HEIGHT;
+            }
+            this.notificationsToastsContainer.style.top = `${topOffset}px`;
+        } else {
+            this.notificationsToastsContainer.style.top = "";
+        }
+    }
     onDidChangeNotification(e) {
         switch (e.kind) {
         case NotificationChangeType.ADD:
@@ -137,12 +162,15 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         if (this.isNotificationsCenterVisible) {
             return;
         }
+        if (this.environmentService.enableSmokeTestDriver) {
+            return;
+        }
         if (item.priority === NotificationPriority.SILENT) {
             return;
         }
         if (item.priority === NotificationPriority.OPTIONAL) {
             const activeElement = getActiveElement();
-            if (isHTMLElement(activeElement) && isEditableElement(activeElement) && isElementInBottomRightQuarter(activeElement, this.layoutService.mainContainer)) {
+            if (isHTMLElement(activeElement) && isEditableElement(activeElement) && this.isElementInNotificationQuarter(activeElement)) {
                 return;
             }
         }
@@ -155,12 +183,27 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             scheduleAtNextAnimationFrame(getWindow(this.container), () => this.doAddToast(item, itemDisposables))
         );
     }
+    isElementInNotificationQuarter(element) {
+        const position = getNotificationsPosition(this.configurationService);
+        const domPosition = getDomNodePagePosition(element);
+        const clientArea = getClientArea(this.layoutService.mainContainer);
+        switch (position) {
+        case NotificationsPosition.BOTTOM_LEFT:
+            return domPosition.left < clientArea.width / 2 && domPosition.top > clientArea.height / 2;
+        case NotificationsPosition.TOP_RIGHT:
+            return domPosition.left > clientArea.width / 2 && domPosition.top < clientArea.height / 2;
+        case NotificationsPosition.BOTTOM_RIGHT:
+        default:
+            return domPosition.left > clientArea.width / 2 && domPosition.top > clientArea.height / 2;
+        }
+    }
     doAddToast(item, itemDisposables) {
         let notificationsToastsContainer = this.notificationsToastsContainer;
         if (!notificationsToastsContainer) {
             notificationsToastsContainer = this.notificationsToastsContainer = $(".notifications-toasts");
             this.container.appendChild(notificationsToastsContainer);
         }
+        this.updateNotificationPosition();
         notificationsToastsContainer.classList.add("visible");
         const notificationToastContainer = $(".notification-toast-container");
         const firstToast = notificationsToastsContainer.firstChild;
@@ -175,9 +218,9 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             verticalScrollMode: ScrollbarVisibility.Hidden,
             widgetAriaLabel: (() => {
                 if (!item.source) {
-                    return withSeverityPrefix(( localize(3585, "{0}, notification", item.message.raw)), item.severity);
+                    return withSeverityPrefix(( localize(3653, "{0}, notification", item.message.raw)), item.severity);
                 }
-                return withSeverityPrefix(( localize(3586, "{0}, source: {1}, notification", item.message.raw, item.source)), item.severity);
+                return withSeverityPrefix(( localize(3654, "{0}, source: {1}, notification", item.message.raw, item.source)), item.severity);
             })()
         });
         itemDisposables.add(notificationList);
@@ -379,8 +422,6 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         ) => {
             const backgroundColor = this.getColor(NOTIFICATIONS_BACKGROUND);
             toast.style.background = backgroundColor ? backgroundColor : "";
-            const widgetShadowColor = this.getColor(widgetShadow);
-            toast.style.boxShadow = widgetShadowColor ? `0 0 8px 2px ${widgetShadowColor}` : "";
             const borderColor = this.getColor(NOTIFICATIONS_TOAST_BORDER);
             toast.style.border = borderColor ? `1px solid ${borderColor}` : "";
         });
@@ -409,6 +450,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
     layout(dimension) {
         this.workbenchDimensions = dimension;
         const maxDimensions = this.computeMaxDimensions();
+        this.updateTopOffset();
         if (maxDimensions.height) {
             this.layoutContainer(maxDimensions.height);
         }
@@ -477,6 +519,6 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         return !!toast.container.parentElement;
     }
 };
-NotificationsToasts = NotificationsToasts_1 = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IWorkbenchLayoutService)), ( __param(4, IThemeService)), ( __param(5, IEditorGroupsService)), ( __param(6, IContextKeyService)), ( __param(7, ILifecycleService)), ( __param(8, IHostService))], NotificationsToasts));
+NotificationsToasts = NotificationsToasts_1 = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IWorkbenchLayoutService)), ( __param(4, IThemeService)), ( __param(5, IEditorGroupsService)), ( __param(6, IContextKeyService)), ( __param(7, ILifecycleService)), ( __param(8, IHostService)), ( __param(9, IWorkbenchEnvironmentService)), ( __param(10, IConfigurationService))], NotificationsToasts));
 
 export { NotificationsToasts };

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.d.ts

@@ -10,6 +10,7 @@ import { IKeybindingService } from "../../../../platform/keybinding/common/keybi
 import { ProgressBar } from "../../../../base/browser/ui/progressbar/progressbar.js";
 import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 export declare class NotificationsListDelegate implements IListVirtualDelegate<INotificationViewItem> {
     private static readonly ROW_HEIGHT;
     private static readonly LINE_HEIGHT;
@@ -56,9 +57,10 @@ export declare class NotificationTemplateRenderer extends Disposable {
     private static closeNotificationAction;
     private static expandNotificationAction;
     private static collapseNotificationAction;
+    private static updateExpandCollapseIcons;
     private static readonly SEVERITIES;
     private readonly inputDisposables;
-    constructor(template: INotificationTemplateData, actionRunner: IActionRunner, openerService: IOpenerService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, hoverService: IHoverService);
+    constructor(template: INotificationTemplateData, actionRunner: IActionRunner, openerService: IOpenerService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, hoverService: IHoverService, configurationService: IConfigurationService);
     setInput(notification: INotificationViewItem): void;
     private render;
     private renderSeverity;

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

@@ -10,8 +10,8 @@ import { toAction, Separator, ActionRunner } from '../../../../base/common/actio
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, dispose, Disposable } from '../../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
-import { NotificationViewItem, NotificationViewItemContentChangeKind, ChoiceAction } from '../../../common/notifications.js';
-import { ConfigureNotificationAction, ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction } from './notificationsActions.js';
+import { NotificationViewItem, getNotificationsPosition, NotificationsSettings, NotificationViewItemContentChangeKind, ChoiceAction } from '../../../common/notifications.js';
+import { ConfigureNotificationAction, getNotificationExpandIcon, getNotificationCollapseIcon, ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction } from './notificationsActions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { isNotificationSource, NotificationsFilter } from '../../../../platform/notification/common/notification.js';
@@ -28,6 +28,7 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 
 var NotificationRenderer_1, NotificationTemplateRenderer_1;
@@ -98,7 +99,7 @@ class NotificationMessageRenderer {
                 let title = node.title;
                 if (!title && node.href.startsWith("command:")) {
                     title = ( localize(
-                        3587,
+                        3655,
                         "Click to execute command '{0}'",
                         node.href.substr("command:".length)
                     ));
@@ -164,7 +165,7 @@ let NotificationRenderer = class NotificationRenderer {
         const that = this;
         const toolbarContainer = $(".notification-list-item-toolbar-container");
         data.toolbar = ( new ActionBar(toolbarContainer, {
-            ariaLabel: ( localize(3588, "Notification Actions")),
+            ariaLabel: ( localize(3656, "Notification Actions")),
             actionViewItemProvider: (action, options) => {
                 if (action instanceof ConfigureNotificationAction) {
                     return data.toDispose.add(( new DropdownMenuActionViewItem(action, {
@@ -178,7 +179,7 @@ let NotificationRenderer = class NotificationRenderer {
                                 const isSourceFiltered = that.notificationService.getFilter(source) === NotificationsFilter.ERROR;
                                 actions.push(toAction({
                                     id: source.id,
-                                    label: isSourceFiltered ? ( localize(3589, "Turn On All Notifications from '{0}'", source.label)) : ( localize(3590, "Turn Off Info and Warning Notifications from '{0}'", source.label)),
+                                    label: isSourceFiltered ? ( localize(3657, "Turn On All Notifications from '{0}'", source.label)) : ( localize(3658, "Turn Off Info and Warning Notifications from '{0}'", source.label)),
                                     run: () => that.notificationService.setFilter({
                                         ...source,
                                         filter: isSourceFiltered ? NotificationsFilter.OFF : NotificationsFilter.ERROR
@@ -233,6 +234,14 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
     static {
         NotificationTemplateRenderer_1 = this;
     }
+    static updateExpandCollapseIcons(configurationService) {
+        if (!NotificationTemplateRenderer_1.expandNotificationAction) {
+            return;
+        }
+        const position = getNotificationsPosition(configurationService);
+        NotificationTemplateRenderer_1.expandNotificationAction.class = ThemeIcon.asClassName(getNotificationExpandIcon(position));
+        NotificationTemplateRenderer_1.collapseNotificationAction.class = ThemeIcon.asClassName(getNotificationCollapseIcon(position));
+    }
     static {
         this.SEVERITIES = [Severity$1.Info, Severity$1.Warning, Severity$1.Error];
     }
@@ -243,7 +252,8 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         instantiationService,
         keybindingService,
         contextMenuService,
-        hoverService
+        hoverService,
+        configurationService
     ) {
         super();
         this.template = template;
@@ -270,7 +280,13 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
                 CollapseNotificationAction.ID,
                 CollapseNotificationAction.LABEL
             );
+            NotificationTemplateRenderer_1.updateExpandCollapseIcons(configurationService);
         }
+        this._register(configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(NotificationsSettings.NOTIFICATIONS_POSITION)) {
+                NotificationTemplateRenderer_1.updateExpandCollapseIcons(configurationService);
+            }
+        }));
     }
     setInput(notification) {
         this.inputDisposables.clear();
@@ -375,7 +391,7 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
     }
     renderSource(notification, sourceCustomHover) {
         if (notification.expanded && notification.source) {
-            this.template.source.textContent = ( localize(3591, "Source: {0}", notification.source));
+            this.template.source.textContent = ( localize(3659, "Source: {0}", notification.source));
             sourceCustomHover.update(notification.source);
         } else {
             this.template.source.textContent = "";
@@ -455,6 +471,6 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         return keybinding ? keybinding.getLabel() : null;
     }
 };
-NotificationTemplateRenderer = NotificationTemplateRenderer_1 = ( __decorate([( __param(2, IOpenerService)), ( __param(3, IInstantiationService)), ( __param(4, IKeybindingService)), ( __param(5, IContextMenuService)), ( __param(6, IHoverService))], NotificationTemplateRenderer));
+NotificationTemplateRenderer = NotificationTemplateRenderer_1 = ( __decorate([( __param(2, IOpenerService)), ( __param(3, IInstantiationService)), ( __param(4, IKeybindingService)), ( __param(5, IContextMenuService)), ( __param(6, IHoverService)), ( __param(7, IConfigurationService))], NotificationTemplateRenderer));
 
 export { NotificationRenderer, NotificationTemplateRenderer, NotificationsListDelegate };

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

@@ -7,6 +7,7 @@ import { IColorTheme } from "../../../platform/theme/common/themeService.js";
 import { IStorageService } from "../../../platform/storage/common/storage.service.js";
 import { IExtensionService } from "../../services/extensions/common/extensions.service.js";
 import { ICompositeBarColors, IActivityHoverOptions } from "./compositeBarActions.js";
+import { ViewContainerLocation } from "../../common/views.js";
 import { IViewDescriptorService } from "../../common/views.service.js";
 import { IContextKeyService } from "../../../platform/contextkey/common/contextkey.service.js";
 import { IWorkbenchEnvironmentService } from "../../services/environment/common/environmentService.service.js";
@@ -33,6 +34,7 @@ export interface IPaneCompositeBarOptions {
     readonly colors: (theme: IColorTheme) => ICompositeBarColors;
 }
 export declare class PaneCompositeBar extends Disposable {
+    private readonly location;
     protected readonly options: IPaneCompositeBarOptions;
     protected readonly part: Parts;
     private readonly paneCompositePart;
@@ -45,12 +47,11 @@ export declare class PaneCompositeBar extends Disposable {
     private readonly environmentService;
     protected readonly layoutService: IWorkbenchLayoutService;
     private readonly viewContainerDisposables;
-    private readonly location;
     private readonly compositeBar;
     readonly dndHandler: ICompositeDragAndDrop;
     private readonly compositeActions;
     private hasExtensionsRegistered;
-    constructor(options: IPaneCompositeBarOptions, part: Parts, paneCompositePart: IPaneCompositePart, instantiationService: IInstantiationService, storageService: IStorageService, extensionService: IExtensionService, viewDescriptorService: IViewDescriptorService, viewService: IViewsService, contextKeyService: IContextKeyService, environmentService: IWorkbenchEnvironmentService, layoutService: IWorkbenchLayoutService);
+    constructor(location: ViewContainerLocation, options: IPaneCompositeBarOptions, part: Parts, paneCompositePart: IPaneCompositePart, instantiationService: IInstantiationService, storageService: IStorageService, extensionService: IExtensionService, viewDescriptorService: IViewDescriptorService, viewService: IViewsService, contextKeyService: IContextKeyService, environmentService: IWorkbenchEnvironmentService, layoutService: IWorkbenchLayoutService);
     private createCompositeBar;
     private getContextMenuActionsForComposite;
     private createMoveAction;

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

@@ -32,6 +32,7 @@ import { IViewsService } from '../../services/views/common/viewsService.service.
 var ViewContainerActivityAction_1;
 let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     constructor(
+        location,
         options,
         part,
         paneCompositePart,
@@ -45,6 +46,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         layoutService
     ) {
         super();
+        this.location = location;
         this.options = options;
         this.part = part;
         this.paneCompositePart = paneCompositePart;
@@ -60,7 +62,6 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.compositeActions = ( new Map());
         this.hasExtensionsRegistered = false;
         this._cachedViewContainers = undefined;
-        this.location = paneCompositePart.partId === Parts.PANEL_PART ? ViewContainerLocation.Panel : paneCompositePart.partId === Parts.AUXILIARYBAR_PART ? ViewContainerLocation.AuxiliaryBar : ViewContainerLocation.Sidebar;
         this.dndHandler = ( new CompositeDragAndDrop(
             this.viewDescriptorService,
             this.location,
@@ -124,11 +125,11 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 moveActions.push(this.createMoveAction(viewContainer, location, defaultLocation));
             }
         }
-        actions.push(( new SubmenuAction("moveToMenu", ( localize(3592, "Move To")), moveActions)));
+        actions.push(( new SubmenuAction("moveToMenu", ( localize(3660, "Move To")), moveActions)));
         if (defaultLocation !== currentLocation) {
             actions.push(toAction({
                 id: "resetLocationAction",
-                label: ( localize(3593, "Reset Location")),
+                label: ( localize(3661, "Reset Location")),
                 run: () => {
                     this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, "resetLocationAction");
                     this.viewService.openViewContainer(viewContainer.id, true);
@@ -142,7 +143,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 if (defaultContainer !== viewContainer) {
                     actions.push(toAction({
                         id: "resetLocationAction",
-                        label: ( localize(3593, "Reset Location")),
+                        label: ( localize(3661, "Reset Location")),
                         run: () => {
                             this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, "resetLocationAction");
                             this.viewService.openViewContainer(viewContainer.id, true);
@@ -156,7 +157,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     createMoveAction(viewContainer, newLocation, defaultLocation) {
         return toAction({
             id: `moveViewContainerTo${newLocation}`,
-            label: newLocation === ViewContainerLocation.Panel ? ( localize(3594, "Panel")) : newLocation === ViewContainerLocation.Sidebar ? ( localize(3595, "Primary Side Bar")) : ( localize(3596, "Secondary Side Bar")),
+            label: newLocation === ViewContainerLocation.Panel ? ( localize(3662, "Panel")) : newLocation === ViewContainerLocation.Sidebar ? ( localize(3663, "Primary Side Bar")) : ( localize(3664, "Secondary Side Bar")),
             run: () => {
                 let index;
                 if (newLocation !== defaultLocation) {
@@ -379,9 +380,9 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 classNames = [iconId, "uri-icon"];
                 createCSSRule(iconClass, `
                 mask: ${cssUrl} no-repeat 50% 50%;
-                mask-size: ${this.options.iconSize}px;
+                mask-size: var(--activity-bar-icon-size, ${this.options.iconSize}px);
                 -webkit-mask: ${cssUrl} no-repeat 50% 50%;
-                -webkit-mask-size: ${this.options.iconSize}px;
+                -webkit-mask-size: var(--activity-bar-icon-size, ${this.options.iconSize}px);
                 mask-origin: padding;
                 -webkit-mask-origin: padding;
             `);
@@ -749,7 +750,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         );
     }
 };
-PaneCompositeBar = ( __decorate([( __param(3, IInstantiationService)), ( __param(4, IStorageService)), ( __param(5, IExtensionService)), ( __param(6, IViewDescriptorService)), ( __param(7, IViewsService)), ( __param(8, IContextKeyService)), ( __param(9, IWorkbenchEnvironmentService)), ( __param(10, IWorkbenchLayoutService))], PaneCompositeBar));
+PaneCompositeBar = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IStorageService)), ( __param(6, IExtensionService)), ( __param(7, IViewDescriptorService)), ( __param(8, IViewsService)), ( __param(9, IContextKeyService)), ( __param(10, IWorkbenchEnvironmentService)), ( __param(11, IWorkbenchLayoutService))], PaneCompositeBar));
 let ViewContainerActivityAction = class ViewContainerActivityAction extends CompositeBarAction {
     static {
         ViewContainerActivityAction_1 = this;

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

@@ -3,10 +3,11 @@ import { IInstantiationService } from "../../../platform/instantiation/common/in
 import { IProgressIndicator } from "../../../platform/progress/common/progress.js";
 import { PaneComposite, PaneCompositeDescriptor } from "../panecomposite.js";
 import { IPaneComposite } from "../../common/panecomposite.js";
+import { ViewContainerLocation } from "../../common/views.js";
 import { IViewDescriptorService } from "../../common/views.service.js";
 import { DisposableStore } from "../../../base/common/lifecycle.js";
 import { IView } from "../../../base/browser/ui/grid/grid.js";
-import { Parts } from "../../services/layout/browser/layoutService.js";
+import { SINGLE_WINDOW_PARTS } from "../../services/layout/browser/layoutService.js";
 import { IWorkbenchLayoutService } from "../../services/layout/browser/layoutService.service.js";
 import { CompositePart, ICompositePartOptions, ICompositeTitleLabel } from "./compositePart.js";
 import { IPaneCompositeBarOptions, PaneCompositeBar } from "./paneCompositeBar.js";
@@ -19,6 +20,7 @@ import { IThemeService } from "../../../platform/theme/common/themeService.servi
 import { IContextKey } from "../../../platform/contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../../platform/contextkey/common/contextkey.service.js";
 import { IExtensionService } from "../../services/extensions/common/extensions.service.js";
+import { MenuId } from "../../../platform/actions/common/actions.js";
 import { IMenuService } from "../../../platform/actions/common/actions.service.js";
 import { SubmenuAction } from "../../../base/common/actions.js";
 import { Composite } from "../composite.js";
@@ -29,7 +31,8 @@ export declare enum CompositeBarPosition {
     BOTTOM = 2
 }
 export interface IPaneCompositePart extends IView {
-    readonly partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART;
+    readonly partId: SINGLE_WINDOW_PARTS;
+    readonly registryId: string;
     readonly onDidPaneCompositeOpen: Event<IPaneComposite>;
     readonly onDidPaneCompositeClose: Event<IPaneComposite>;
     /**
@@ -74,9 +77,13 @@ export interface IPaneCompositePart extends IView {
     getPaneCompositeIds(): string[];
 }
 export declare abstract class AbstractPaneCompositePart extends CompositePart<PaneComposite> implements IPaneCompositePart {
-    readonly partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART;
+    readonly partId: SINGLE_WINDOW_PARTS;
     private readonly activePaneContextKey;
     private paneFocusContextKey;
+    protected readonly location: ViewContainerLocation;
+    readonly registryId: string;
+    private readonly globalActionsMenuId;
+    private readonly globalLeftActionsMenuId;
     private readonly viewDescriptorService;
     protected readonly contextKeyService: IContextKeyService;
     private readonly extensionService;
@@ -85,7 +92,6 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     get snap(): boolean;
     get onDidPaneCompositeOpen(): Event<IPaneComposite>;
     readonly onDidPaneCompositeClose: Event<IPaneComposite>;
-    private readonly location;
     private titleContainer;
     private headerFooterCompositeBarContainer;
     protected readonly headerFooterCompositeBarDispoables: DisposableStore;
@@ -93,11 +99,11 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     private readonly paneCompositeBar;
     private compositeBarPosition;
     private emptyPaneMessageElement;
-    private readonly globalActionsMenuId;
     private globalToolBar;
+    private globalLeftToolBar;
     private blockOpening;
     protected contentDimension: Dimension | undefined;
-    constructor(partId: Parts.PANEL_PART | Parts.AUXILIARYBAR_PART | Parts.SIDEBAR_PART, partOptions: ICompositePartOptions, activePaneCompositeSettingsKey: string, activePaneContextKey: IContextKey<string>, paneFocusContextKey: IContextKey<boolean>, nameForTelemetry: string, compositeCSSClass: string, titleForegroundColor: string | undefined, titleBorderColor: string | undefined, notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, menuService: IMenuService);
+    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, globalLeftActionsMenuId: MenuId | undefined, 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 registerListeners;
     private onDidOpen;
     private onDidClose;
@@ -105,7 +111,7 @@ export declare abstract class AbstractPaneCompositePart extends CompositePart<Pa
     protected hideActiveComposite(): Composite | undefined;
     create(parent: HTMLElement): void;
     private createEmptyPaneMessage;
-    protected createTitleArea(parent: HTMLElement): HTMLElement;
+    protected createTitleArea(parent: HTMLElement): HTMLElement | undefined;
     protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel;
     protected updateCompositeBar(updateCompositeBarOption?: boolean): void;
     protected createHeaderArea(): HTMLElement;