@codingame/monaco-vscode-workbench-service-override 7.1.0 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,12 +26,12 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "7.1.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "7.1.0",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "7.1.0",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "7.1.0",
-    "@codingame/monaco-vscode-view-banner-service-override": "7.1.0",
-    "@codingame/monaco-vscode-view-common-service-override": "7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "7.1.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "7.1.1",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "7.1.1",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "7.1.1",
+    "@codingame/monaco-vscode-view-banner-service-override": "7.1.1",
+    "@codingame/monaco-vscode-view-common-service-override": "7.1.1"
   }
 }

package/vscode/src/vs/workbench/browser/layout.js

@@ -7,7 +7,7 @@ import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from 'vscode/vscode/vs/
 import { pathsToEditors, isResourceEditorInput, EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 import { SidebarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/panel/panelPart';
-import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, ZenModeSettings, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { isTemporaryWorkspace, WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -854,15 +854,14 @@ class Layout extends Disposable {
         const targetWindow = getWindow(container);
         const containerDimension = this.getContainerDimension(container);
         if (container === this.mainContainer) {
-            const panelPosition = this.getPanelPosition();
-            const isColumn = panelPosition === Position.RIGHT || panelPosition === Position.LEFT;
+            const isPanelHorizontal = isHorizontal(this.getPanelPosition());
             const takenWidth = (this.isVisible(Parts.ACTIVITYBAR_PART) ? this.activityBarPartView.minimumWidth : 0) +
                 (this.isVisible(Parts.SIDEBAR_PART) ? this.sideBarPartView.minimumWidth : 0) +
-                (this.isVisible(Parts.PANEL_PART) && isColumn ? this.panelPartView.minimumWidth : 0) +
+                (this.isVisible(Parts.PANEL_PART) && !isPanelHorizontal ? this.panelPartView.minimumWidth : 0) +
                 (this.isVisible(Parts.AUXILIARYBAR_PART) ? this.auxiliaryBarPartView.minimumWidth : 0);
             const takenHeight = (this.isVisible(Parts.TITLEBAR_PART, targetWindow) ? this.titleBarPartView.minimumHeight : 0) +
                 (this.isVisible(Parts.STATUSBAR_PART, targetWindow) ? this.statusBarPartView.minimumHeight : 0) +
-                (this.isVisible(Parts.PANEL_PART) && !isColumn ? this.panelPartView.minimumHeight : 0);
+                (this.isVisible(Parts.PANEL_PART) && isPanelHorizontal ? this.panelPartView.minimumHeight : 0);
             const availableWidth = containerDimension.width - takenWidth;
             const availableHeight = containerDimension.height - takenHeight;
             return { width: availableWidth, height: availableHeight };
@@ -1062,7 +1061,9 @@ class Layout extends Disposable {
             this.stateModel.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, sideBarSize);
             const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
                 ? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
-                : (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.BOTTOM ? this.workbenchGrid.getViewSize(this.panelPartView).height : this.workbenchGrid.getViewSize(this.panelPartView).width);
+                : isHorizontal(this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION))
+                    ? this.workbenchGrid.getViewSize(this.panelPartView).height
+                    : this.workbenchGrid.getViewSize(this.panelPartView).width;
             this.stateModel.setInitializationValue(LayoutStateKeys.PANEL_SIZE, panelSize);
             const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
                 ? this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView)
@@ -1126,8 +1127,8 @@ class Layout extends Disposable {
             case Parts.PANEL_PART:
                 viewSize = this.workbenchGrid.getViewSize(this.panelPartView);
                 this.workbenchGrid.resizeView(this.panelPartView, {
-                    width: viewSize.width + (this.getPanelPosition() !== Position.BOTTOM ? sizeChangePxWidth : 0),
-                    height: viewSize.height + (this.getPanelPosition() !== Position.BOTTOM ? 0 : sizeChangePxHeight)
+                    width: viewSize.width + (isHorizontal(this.getPanelPosition()) ? 0 : sizeChangePxWidth),
+                    height: viewSize.height + (isHorizontal(this.getPanelPosition()) ? sizeChangePxHeight : 0)
                 });
                 break;
             case Parts.AUXILIARYBAR_PART:
@@ -1227,8 +1228,9 @@ class Layout extends Disposable {
         return viewContainerModel.activeViewDescriptors.length >= 1;
     }
     adjustPartPositions(sideBarPosition, panelAlignment, panelPosition) {
-        const sideBarSiblingToEditor = panelPosition !== Position.BOTTOM || !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
-        const auxiliaryBarSiblingToEditor = panelPosition !== Position.BOTTOM || !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
+        const isPanelVertical = !isHorizontal(panelPosition);
+        const sideBarSiblingToEditor = isPanelVertical || !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
+        const auxiliaryBarSiblingToEditor = isPanelVertical || !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
         const preMovePanelWidth = !this.isVisible(Parts.PANEL_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView) ?? this.panelPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.panelPartView).width;
         const preMovePanelHeight = !this.isVisible(Parts.PANEL_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView) ?? this.panelPartView.minimumHeight) : this.workbenchGrid.getViewSize(this.panelPartView).height;
         const preMoveSideBarSize = !this.isVisible(Parts.SIDEBAR_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView) ?? this.sideBarPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
@@ -1253,7 +1255,7 @@ class Layout extends Disposable {
                 this.workbenchGrid.moveViewTo(this.auxiliaryBarPartView, [2, 0]);
             }
         }
-        if (panelPosition !== Position.BOTTOM) {
+        if (isPanelVertical) {
             this.workbenchGrid.moveView(this.panelPartView, preMovePanelWidth, this.editorPartView, panelPosition === Position.LEFT ? Direction.Left : Direction.Right);
             this.workbenchGrid.resizeView(this.panelPartView, {
                 height: preMovePanelHeight,
@@ -1274,7 +1276,7 @@ class Layout extends Disposable {
         }
     }
     setPanelAlignment(alignment, skipLayout) {
-        if (this.getPanelPosition() !== Position.BOTTOM) {
+        if (!isHorizontal(this.getPanelPosition())) {
             this.setPanelPosition(Position.BOTTOM);
         }
         if (alignment !== 'center' && this.isPanelMaximized()) {
@@ -1340,7 +1342,7 @@ class Layout extends Disposable {
         const isMaximized = this.isPanelMaximized();
         if (!isMaximized) {
             if (this.isVisible(Parts.PANEL_PART)) {
-                if (panelPosition === Position.BOTTOM) {
+                if (isHorizontal(panelPosition)) {
                     this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT, size.height);
                 }
                 else {
@@ -1352,14 +1354,14 @@ class Layout extends Disposable {
         else {
             this.setEditorHidden(false);
             this.workbenchGrid.resizeView(this.panelPartView, {
-                width: panelPosition === Position.BOTTOM ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH),
-                height: panelPosition === Position.BOTTOM ? this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT) : size.height
+                width: isHorizontal(panelPosition) ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH),
+                height: isHorizontal(panelPosition) ? this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT) : size.height
             });
         }
         this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_WAS_LAST_MAXIMIZED, !isMaximized);
     }
     panelOpensMaximized() {
-        if (this.getPanelAlignment() !== 'center' && this.getPanelPosition() === Position.BOTTOM) {
+        if (this.getPanelAlignment() !== 'center' && isHorizontal(this.getPanelPosition())) {
             return false;
         }
         const panelOpensMaximized = panelOpensMaximizedFromString(this.configurationService.getValue(WorkbenchLayoutSettings.PANEL_OPENS_MAXIMIZED));
@@ -1415,7 +1417,7 @@ class Layout extends Disposable {
         return this.state.runtime.mainWindowBorder && isMacintosh ? '5px' : undefined;
     }
     isPanelMaximized() {
-        return (this.getPanelAlignment() === 'center' || this.getPanelPosition() !== Position.BOTTOM) && !this.isVisible(Parts.EDITOR_PART, mainWindow);
+        return (this.getPanelAlignment() === 'center' || !isHorizontal(this.getPanelPosition())) && !this.isVisible(Parts.EDITOR_PART, mainWindow);
     }
     getSideBarPosition() {
         return this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON);
@@ -1469,14 +1471,14 @@ class Layout extends Disposable {
         const auxiliaryBarSize = this.workbenchGrid.getViewSize(this.auxiliaryBarPartView);
         let editorHidden = !this.isVisible(Parts.EDITOR_PART, mainWindow);
         if (newPositionValue !== oldPositionValue && !editorHidden) {
-            if (position === Position.BOTTOM) {
+            if (isHorizontal(position)) {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH, size.width);
             }
-            else if (positionFromString(oldPositionValue) === Position.BOTTOM) {
+            else if (isHorizontal(positionFromString(oldPositionValue))) {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT, size.height);
             }
         }
-        if (position === Position.BOTTOM && this.getPanelAlignment() !== 'center' && editorHidden) {
+        if (isHorizontal(position) && this.getPanelAlignment() !== 'center' && editorHidden) {
             this.toggleMaximizedPanel();
             editorHidden = false;
         }
@@ -1486,6 +1488,9 @@ class Layout extends Disposable {
         if (position === Position.BOTTOM) {
             this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.height : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT), this.editorPartView, Direction.Down);
         }
+        else if (position === Position.TOP) {
+            this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.height : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT), this.editorPartView, Direction.Up);
+        }
         else if (position === Position.RIGHT) {
             this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH), this.editorPartView, Direction.Right);
         }
@@ -1500,7 +1505,7 @@ class Layout extends Disposable {
         if (!auxiliaryBarVisible) {
             this.setAuxiliaryBarHidden(true);
         }
-        if (position === Position.BOTTOM) {
+        if (isHorizontal(position)) {
             this.adjustPartPositions(this.getSideBarPosition(), this.getPanelAlignment(), position);
         }
         this._onDidChangePanelPosition.fire(newPositionValue);
@@ -1587,17 +1592,19 @@ class Layout extends Disposable {
         const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN) ? 0 : nodes.sideBar.size;
         const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN) ? 0 : nodes.auxiliaryBar.size;
         const panelSize = this.stateModel.getInitializationValue(LayoutStateKeys.PANEL_SIZE) ? 0 : nodes.panel.size;
+        const panelPostion = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION);
+        const sideBarPosition = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON);
         const result = [];
-        if (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) !== Position.BOTTOM) {
+        if (!isHorizontal(panelPostion)) {
             result.push(nodes.editor);
             nodes.editor.size = availableWidth - activityBarSize - sideBarSize - panelSize - auxiliaryBarSize;
-            if (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.RIGHT) {
+            if (panelPostion === Position.RIGHT) {
                 result.push(nodes.panel);
             }
             else {
                 result.splice(0, 0, nodes.panel);
             }
-            if (this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON) === Position.LEFT) {
+            if (sideBarPosition === Position.LEFT) {
                 result.push(nodes.auxiliaryBar);
                 result.splice(0, 0, nodes.sideBar);
                 result.splice(0, 0, nodes.activityBar);
@@ -1610,17 +1617,17 @@ class Layout extends Disposable {
         }
         else {
             const panelAlignment = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT);
-            const sideBarPosition = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON);
             const sideBarNextToEditor = !(panelAlignment === 'center' || (sideBarPosition === Position.LEFT && panelAlignment === 'right') || (sideBarPosition === Position.RIGHT && panelAlignment === 'left'));
             const auxiliaryBarNextToEditor = !(panelAlignment === 'center' || (sideBarPosition === Position.RIGHT && panelAlignment === 'right') || (sideBarPosition === Position.LEFT && panelAlignment === 'left'));
             const editorSectionWidth = availableWidth - activityBarSize - (sideBarNextToEditor ? 0 : sideBarSize) - (auxiliaryBarNextToEditor ? 0 : auxiliaryBarSize);
+            const editorNodes = this.arrangeEditorNodes({
+                editor: nodes.editor,
+                sideBar: sideBarNextToEditor ? nodes.sideBar : undefined,
+                auxiliaryBar: auxiliaryBarNextToEditor ? nodes.auxiliaryBar : undefined
+            }, availableHeight - panelSize, editorSectionWidth);
             result.push({
                 type: 'branch',
-                data: [this.arrangeEditorNodes({
-                        editor: nodes.editor,
-                        sideBar: sideBarNextToEditor ? nodes.sideBar : undefined,
-                        auxiliaryBar: auxiliaryBarNextToEditor ? nodes.auxiliaryBar : undefined
-                    }, availableHeight - panelSize, editorSectionWidth), nodes.panel],
+                data: panelPostion === Position.BOTTOM ? [editorNodes, nodes.panel] : [nodes.panel, editorNodes],
                 size: editorSectionWidth
             });
             if (!sideBarNextToEditor) {
@@ -1913,7 +1920,7 @@ class LayoutStateModel extends Disposable {
         LayoutStateKeys.GRID_SIZE.defaultValue = { height: workbenchDimensions.height, width: workbenchDimensions.width };
         LayoutStateKeys.SIDEBAR_SIZE.defaultValue = Math.min(300, workbenchDimensions.width / 4);
         LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = Math.min(300, workbenchDimensions.width / 4);
-        LayoutStateKeys.PANEL_SIZE.defaultValue = (this.stateCache.get(LayoutStateKeys.PANEL_POSITION.name) ?? LayoutStateKeys.PANEL_POSITION.defaultValue) === Position.BOTTOM ? workbenchDimensions.height / 3 : workbenchDimensions.width / 4;
+        LayoutStateKeys.PANEL_SIZE.defaultValue = (this.stateCache.get(LayoutStateKeys.PANEL_POSITION.name) ?? isHorizontal(LayoutStateKeys.PANEL_POSITION.defaultValue)) ? workbenchDimensions.height / 3 : workbenchDimensions.width / 4;
         LayoutStateKeys.SIDEBAR_HIDDEN.defaultValue = this.contextService.getWorkbenchState() === WorkbenchState.EMPTY;
         for (key in LayoutStateKeys) {
             const stateKey = LayoutStateKeys[key];

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

@@ -1,9 +1,8 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { localize } from 'vscode/vscode/vs/nls';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { IAccessibleViewService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView.service';
-import { alertAccessibleViewFocusChange } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -12,7 +11,6 @@ import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService
 import { getNotificationFromContext } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationFocusedContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 
-const _moduleId = "vs/workbench/browser/parts/notifications/notificationAccessibleView";
 class NotificationAccessibleView {
     constructor() {
         this.priority = 90;
@@ -32,11 +30,9 @@ class NotificationAccessibleView {
             }
             commandService.executeCommand('notifications.showList');
             let notificationIndex;
-            let length;
             const list = listService.lastFocusedList;
             if (list instanceof WorkbenchList) {
                 notificationIndex = list.indexOf(notification);
-                length = list.length;
             }
             if (notificationIndex === undefined) {
                 return;
@@ -51,45 +47,49 @@ class NotificationAccessibleView {
                     catch { }
                 }
             }
-            const message = ( (notification.message.original.toString()));
-            if (!message) {
+            function getContentForNotification() {
+                const notification = getNotificationFromContext(listService);
+                const message = notification?.message.original.toString();
+                if (!notification) {
+                    return;
+                }
+                return notification.source ? ( localize(8671, '{0} Source: {1}', message, notification.source)) : ( localize(8672, '{0}', message));
+            }
+            const content = getContentForNotification();
+            if (!content) {
                 return;
             }
             notification.onDidClose(() => accessibleViewService.next());
-            return {
-                id: AccessibleViewProviderId.Notification,
-                provideContent: () => {
-                    return notification.source ? ( localizeWithPath(_moduleId, 0, '{0} Source: {1}', message, notification.source)) : ( localizeWithPath(_moduleId, 1, '{0}', message));
-                },
-                onClose() {
-                    focusList();
-                },
-                next() {
-                    if (!list) {
-                        return;
+            return (
+                 (new AccessibleContentProvider(
+                    AccessibleViewProviderId.Notification,
+                    { type: AccessibleViewType.View },
+                    () => content,
+                    () => focusList(),
+                    'accessibility.verbosity.notification',
+                    undefined,
+                    getActionsFromNotification(notification, accessibilitySignalService),
+                    () => {
+                        if (!list) {
+                            return;
+                        }
+                        focusList();
+                        list.focusNext();
+                        return getContentForNotification();
+                    },
+                    () => {
+                        if (!list) {
+                            return;
+                        }
+                        focusList();
+                        list.focusPrevious();
+                        return getContentForNotification();
                     }
-                    focusList();
-                    list.focusNext();
-                    alertAccessibleViewFocusChange(notificationIndex, length, 'next');
-                    getProvider();
-                },
-                previous() {
-                    if (!list) {
-                        return;
-                    }
-                    focusList();
-                    list.focusPrevious();
-                    alertAccessibleViewFocusChange(notificationIndex, length, 'previous');
-                    getProvider();
-                },
-                verbositySettingKey: 'accessibility.verbosity.notification',
-                options: { type: AccessibleViewType.View },
-                actions: getActionsFromNotification(notification, accessibilitySignalService)
-            };
+                ))
+            );
         }
         return getProvider();
     }
-    dispose() { }
 }
 function getActionsFromNotification(notification, accessibilitySignalService) {
     let actions = undefined;
@@ -118,7 +118,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localizeWithPath(_moduleId, 2, "Clear Notification")), tooltip: ( localizeWithPath(_moduleId, 2, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(8673, "Clear Notification")), tooltip: ( localize(8673, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)

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

@@ -1,5 +1,5 @@
 import '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/style';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, setGlobalLeakWarningThreshold, Event } from 'vscode/vscode/vs/base/common/event';
 import { timeout, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -38,7 +38,6 @@ import { setProgressAcccessibilitySignalScheduler } from 'vscode/vscode/vs/base/
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { NotificationAccessibleView } from './parts/notifications/notificationAccessibleView.js';
 
-const _moduleId = "vs/workbench/browser/workbench";
 class Workbench extends Layout {
     constructor(parent, options, serviceCollection, logService) {
         super(parent);
@@ -62,9 +61,8 @@ class Workbench extends Layout {
             mainWindow.require.config({
                 onError: (err) => {
                     if (err.phase === 'loading') {
-                        onUnexpectedError(( (new Error(( localizeWithPath(
-                            _moduleId,
-                            0,
+                        onUnexpectedError(( (new Error(( localize(
+                            3534,
                             "Failed to load a required file. Please restart the application to try again. Details: {0}",
                             JSON.stringify(err)
                         ))))));