@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -4,8 +4,8 @@ import { CommandsRegistry } from '../../../../platform/commands/common/commands.
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
-import { isNotificationViewItem } from '../../../common/notifications.js';
-import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { isNotificationViewItem, NotificationsSettings, NotificationsPosition } from '../../../common/notifications.js';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
@@ -19,6 +19,8 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 
 const SHOW_NOTIFICATIONS_CENTER = "notifications.showList";
 const HIDE_NOTIFICATIONS_CENTER = "notifications.hideList";
@@ -225,7 +227,7 @@ function registerNotificationCommands(center, toasts, model) {
             filter: source.filter
         })));
         picker.canSelectMany = true;
-        picker.placeholder = ( localize(3557, "Select sources to enable all notifications from"));
+        picker.placeholder = ( localize(3617, "Select sources to enable all notifications from"));
         picker.selectedItems = picker.items.filter(item => item.filter === NotificationsFilter.OFF);
         picker.show();
         disposables.add(picker.onDidAccept(async () => {
@@ -240,18 +242,18 @@ function registerNotificationCommands(center, toasts, model) {
         }));
         disposables.add(picker.onDidHide(() => disposables.dispose()));
     });
-    const category = ( localize2(3558, "Notifications"));
+    const category = ( localize2(3618, "Notifications"));
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: SHOW_NOTIFICATIONS_CENTER,
-            title: ( localize2(3559, "Show Notifications")),
+            title: ( localize2(3619, "Show Notifications")),
             category
         }
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: HIDE_NOTIFICATIONS_CENTER,
-            title: ( localize2(3560, "Hide Notifications")),
+            title: ( localize2(3620, "Hide Notifications")),
             category
         },
         when: NotificationsCenterVisibleContext
@@ -259,40 +261,119 @@ function registerNotificationCommands(center, toasts, model) {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: CLEAR_ALL_NOTIFICATIONS,
-            title: ( localize2(3561, "Clear All Notifications")),
+            title: ( localize2(3621, "Clear All Notifications")),
             category
         }
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: ACCEPT_PRIMARY_ACTION_NOTIFICATION,
-            title: ( localize2(3562, "Accept Notification Primary Action")),
+            title: ( localize2(3622, "Accept Notification Primary Action")),
             category
         }
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: TOGGLE_DO_NOT_DISTURB_MODE,
-            title: ( localize2(3563, "Toggle Do Not Disturb Mode")),
+            title: ( localize2(3623, "Toggle Do Not Disturb Mode")),
             category
         }
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE,
-            title: ( localize2(3564, "Toggle Do Not Disturb Mode By Source...")),
+            title: ( localize2(3624, "Toggle Do Not Disturb Mode By Source...")),
             category
         }
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: FOCUS_NOTIFICATION_TOAST,
-            title: ( localize2(3565, "Focus Notification Toast")),
+            title: ( localize2(3625, "Focus Notification Toast")),
             category
         },
         when: NotificationsToastsVisibleContext
     });
+    MenuRegistry.appendMenuItem(MenuId.TitleBar, {
+        command: {
+            id: TOGGLE_NOTIFICATIONS_CENTER,
+            title: ( localize(3626, "Toggle Notifications")),
+            icon: Codicon.bell
+        },
+        group: "navigation",
+        order: 10000,
+        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(
+            `config.${NotificationsSettings.NOTIFICATIONS_POSITION}`,
+            NotificationsPosition.TOP_RIGHT
+        )), ( ContextKeyExpr.equals(`config.${NotificationsSettings.NOTIFICATIONS_BUTTON}`, true))))
+    });
 }
+registerAction2(class SetNotificationsPositionBottomRight extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.setNotificationsPosition.bottomRight",
+            title: ( localize2(3627, "Bottom Right")),
+            toggled: ( ContextKeyExpr.equals(
+                `config.${NotificationsSettings.NOTIFICATIONS_POSITION}`,
+                NotificationsPosition.BOTTOM_RIGHT
+            )),
+            menu: {
+                id: MenuId.NotificationsCenterPositionMenu,
+                order: 1
+            }
+        });
+    }
+    run(accessor) {
+        accessor.get(IConfigurationService).updateValue(
+            NotificationsSettings.NOTIFICATIONS_POSITION,
+            NotificationsPosition.BOTTOM_RIGHT
+        );
+    }
+});
+registerAction2(class SetNotificationsPositionBottomLeft extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.setNotificationsPosition.bottomLeft",
+            title: ( localize2(3628, "Bottom Left")),
+            toggled: ( ContextKeyExpr.equals(
+                `config.${NotificationsSettings.NOTIFICATIONS_POSITION}`,
+                NotificationsPosition.BOTTOM_LEFT
+            )),
+            menu: {
+                id: MenuId.NotificationsCenterPositionMenu,
+                order: 2
+            }
+        });
+    }
+    run(accessor) {
+        accessor.get(IConfigurationService).updateValue(
+            NotificationsSettings.NOTIFICATIONS_POSITION,
+            NotificationsPosition.BOTTOM_LEFT
+        );
+    }
+});
+registerAction2(class SetNotificationsPositionTopRight extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.setNotificationsPosition.topRight",
+            title: ( localize2(3629, "Top Right")),
+            toggled: ( ContextKeyExpr.equals(
+                `config.${NotificationsSettings.NOTIFICATIONS_POSITION}`,
+                NotificationsPosition.TOP_RIGHT
+            )),
+            menu: {
+                id: MenuId.NotificationsCenterPositionMenu,
+                order: 3
+            }
+        });
+    }
+    run(accessor) {
+        accessor.get(IConfigurationService).updateValue(
+            NotificationsSettings.NOTIFICATIONS_POSITION,
+            NotificationsPosition.TOP_RIGHT
+        );
+    }
+});
 let NotificationActionRunner = class NotificationActionRunner extends ActionRunner {
     constructor(telemetryService, notificationService) {
         super();

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

@@ -180,29 +180,29 @@ let NotificationAccessibilityProvider = class NotificationAccessibilityProvider
         let accessibleViewHint;
         const keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibleView")?.getAriaLabel();
         if (this._configurationService.getValue("accessibility.verbosity.notification")) {
-            accessibleViewHint = keybinding ? ( localize(3566, "Inspect the response in the accessible view with {0}", keybinding)) : ( localize(
-                3567,
+            accessibleViewHint = keybinding ? ( localize(3630, "Inspect the response in the accessible view with {0}", keybinding)) : ( localize(
+                3631,
                 "Inspect the response in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding"
             ));
         }
         if (!element.source) {
-            return withSeverityPrefix(accessibleViewHint ? ( localize(3568, "{0}, notification, {1}", element.message.raw, accessibleViewHint)) : ( localize(3569, "{0}, notification", element.message.raw)), element.severity);
+            return withSeverityPrefix(accessibleViewHint ? ( localize(3632, "{0}, notification, {1}", element.message.raw, accessibleViewHint)) : ( localize(3633, "{0}, notification", element.message.raw)), element.severity);
         }
         return withSeverityPrefix(accessibleViewHint ? ( localize(
-            3570,
+            3634,
             "{0}, source: {1}, notification, {2}",
             element.message.raw,
             element.source,
             accessibleViewHint
         )) : ( localize(
-            3571,
+            3635,
             "{0}, source: {1}, notification",
             element.message.raw,
             element.source
         )), element.severity);
     }
     getWidgetAriaLabel() {
-        return this._options.widgetAriaLabel ?? ( localize(3572, "Notifications List"));
+        return this._options.widgetAriaLabel ?? ( localize(3636, "Notifications List"));
     }
     getRole() {
         return "dialog";

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

@@ -2,19 +2,23 @@ import { INotificationsModel } from "../../../common/notifications.js";
 import { IStatusbarService } from "../../../services/statusbar/browser/statusbar.service.js";
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 export declare class NotificationsStatus extends Disposable {
     private readonly model;
     private readonly statusbarService;
     private readonly notificationService;
+    private readonly configurationService;
     private notificationsCenterStatusItem;
     private newNotificationsCount;
     private currentStatusMessage;
     private isNotificationsCenterVisible;
     private isNotificationsToastsVisible;
-    constructor(model: INotificationsModel, statusbarService: IStatusbarService, notificationService: INotificationService);
+    private currentAlignment;
+    constructor(model: INotificationsModel, statusbarService: IStatusbarService, notificationService: INotificationService, configurationService: IConfigurationService);
     private registerListeners;
     private onDidChangeNotification;
     private updateNotificationsCenterStatusItem;
+    private getDesiredAlignment;
     private getTooltip;
     update(isCenterVisible: boolean, isToastsVisible: boolean): void;
     private onDidChangeStatusMessage;

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { NotificationChangeType, StatusMessageChangeType } from '../../../common/notifications.js';
+import { NotificationsSettings, NotificationChangeType, getNotificationsPosition, NotificationsPosition, StatusMessageChangeType } from '../../../common/notifications.js';
 import { StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
@@ -8,13 +8,15 @@ import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from './notifica
 import { localize } from '../../../../nls.js';
 import { NotificationsFilter } from '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 
 let NotificationsStatus = class NotificationsStatus extends Disposable {
-    constructor(model, statusbarService, notificationService) {
+    constructor(model, statusbarService, notificationService, configurationService) {
         super();
         this.model = model;
         this.statusbarService = statusbarService;
         this.notificationService = notificationService;
+        this.configurationService = configurationService;
         this.newNotificationsCount = 0;
         this.isNotificationsCenterVisible = false;
         this.isNotificationsToastsVisible = false;
@@ -30,6 +32,11 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
         this._register(
             this.notificationService.onDidChangeFilter(() => this.updateNotificationsCenterStatusItem())
         );
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(NotificationsSettings.NOTIFICATIONS_POSITION)) {
+                this.updateNotificationsCenterStatusItem();
+            }
+        }));
     }
     onDidChangeNotification(e) {
         if (!this.isNotificationsCenterVisible) {
@@ -51,9 +58,9 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
             }
         }
         let statusProperties = {
-            name: ( localize(3573, "Notifications")),
+            name: ( localize(3637, "Notifications")),
             text: `${notificationsInProgress > 0 || this.newNotificationsCount > 0 ? "$(bell-dot)" : "$(bell)"}`,
-            ariaLabel: ( localize(3573, "Notifications")),
+            ariaLabel: ( localize(3637, "Notifications")),
             command: this.isNotificationsCenterVisible ? HIDE_NOTIFICATIONS_CENTER : SHOW_NOTIFICATIONS_CENTER,
             tooltip: this.getTooltip(notificationsInProgress),
             showBeak: this.isNotificationsCenterVisible
@@ -62,45 +69,71 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
             statusProperties = {
                 ...statusProperties,
                 text: `${notificationsInProgress > 0 || this.newNotificationsCount > 0 ? "$(bell-slash-dot)" : "$(bell-slash)"}`,
-                ariaLabel: ( localize(3574, "Do Not Disturb")),
-                tooltip: ( localize(3575, "Do Not Disturb Mode is Enabled"))
+                ariaLabel: ( localize(3638, "Do Not Disturb")),
+                tooltip: ( localize(3639, "Do Not Disturb Mode is Enabled"))
             };
         }
-        if (!this.notificationsCenterStatusItem) {
-            this.notificationsCenterStatusItem = this.statusbarService.addEntry(
-                statusProperties,
-                "status.notifications",
-                StatusbarAlignment.RIGHT,
-                Number.NEGATIVE_INFINITY
-            );
-        } else {
-            this.notificationsCenterStatusItem.update(statusProperties);
+        const position = getNotificationsPosition(this.configurationService);
+        if (position === NotificationsPosition.TOP_RIGHT) {
+            this.notificationsCenterStatusItem?.dispose();
+            this.notificationsCenterStatusItem = undefined;
+            this.currentAlignment = undefined;
+        }
+        else {
+            const desiredAlignment = this.getDesiredAlignment();
+            if (this.currentAlignment !== desiredAlignment) {
+                this.notificationsCenterStatusItem?.dispose();
+                this.notificationsCenterStatusItem = undefined;
+                this.currentAlignment = desiredAlignment;
+            }
+            if (!this.notificationsCenterStatusItem) {
+                this.notificationsCenterStatusItem = this.statusbarService.addEntry(
+                    statusProperties,
+                    "status.notifications",
+                    this.currentAlignment,
+                    this.currentAlignment === StatusbarAlignment.LEFT ?
+                    Number.MAX_SAFE_INTEGER : Number.NEGATIVE_INFINITY
+                );
+            } else {
+                this.notificationsCenterStatusItem.update(statusProperties);
+            }
+        }
+    }
+    getDesiredAlignment() {
+        const position = getNotificationsPosition(this.configurationService);
+        switch (position) {
+        case NotificationsPosition.BOTTOM_LEFT:
+            return StatusbarAlignment.LEFT;
+        case NotificationsPosition.TOP_RIGHT:
+        case NotificationsPosition.BOTTOM_RIGHT:
+        default:
+            return StatusbarAlignment.RIGHT;
         }
     }
     getTooltip(notificationsInProgress) {
         if (this.isNotificationsCenterVisible) {
-            return localize(3576, "Hide Notifications");
+            return localize(3640, "Hide Notifications");
         }
         if (this.model.notifications.length === 0) {
-            return localize(3577, "No Notifications");
+            return localize(3641, "No Notifications");
         }
         if (notificationsInProgress === 0) {
             if (this.newNotificationsCount === 0) {
-                return localize(3578, "No New Notifications");
+                return localize(3642, "No New Notifications");
             }
             if (this.newNotificationsCount === 1) {
-                return localize(3579, "1 New Notification");
+                return localize(3643, "1 New Notification");
             }
-            return localize(3580, "{0} New Notifications", this.newNotificationsCount);
+            return localize(3644, "{0} New Notifications", this.newNotificationsCount);
         }
         if (this.newNotificationsCount === 0) {
-            return localize(3581, "No New Notifications ({0} in progress)", notificationsInProgress);
+            return localize(3645, "No New Notifications ({0} in progress)", notificationsInProgress);
         }
         if (this.newNotificationsCount === 1) {
-            return localize(3582, "1 New Notification ({0} in progress)", notificationsInProgress);
+            return localize(3646, "1 New Notification ({0} in progress)", notificationsInProgress);
         }
         return localize(
-            3583,
+            3647,
             "{0} New Notifications ({1} in progress)",
             this.newNotificationsCount,
             notificationsInProgress
@@ -145,7 +178,7 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
         let statusMessageEntry;
         let showHandle = setTimeout(() => {
             statusMessageEntry = this.statusbarService.addEntry({
-                name: ( localize(3584, "Status Message")),
+                name: ( localize(3648, "Status Message")),
                 text: message,
                 ariaLabel: message
             }, "status.message", StatusbarAlignment.LEFT, Number.NEGATIVE_INFINITY );
@@ -169,6 +202,6 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
         this.currentStatusMessage = [item, statusMessageDispose];
     }
 };
-NotificationsStatus = ( __decorate([( __param(1, IStatusbarService)), ( __param(2, INotificationService))], NotificationsStatus));
+NotificationsStatus = ( __decorate([( __param(1, IStatusbarService)), ( __param(2, INotificationService)), ( __param(3, IConfigurationService))], NotificationsStatus));
 
 export { NotificationsStatus };

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';
@@ -36,6 +36,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 +84,9 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         editorGroupService,
         contextKeyService,
         lifecycleService,
-        hostService
+        hostService,
+        environmentService,
+        configurationService
     ) {
         super(themeService);
         this.container = container;
@@ -91,6 +96,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 +111,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 +137,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 +173,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 +194,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 +229,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(3649, "{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(3650, "{0}, source: {1}, notification", item.message.raw, item.source)), item.severity);
             })()
         });
         itemDisposables.add(notificationList);
@@ -409,6 +463,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 +532,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;