@codingame/monaco-vscode-workbench-service-override 14.0.5 → 15.0.0

package/index.js

@@ -25,14 +25,14 @@ import { getWorkbenchContainer } from '@codingame/monaco-vscode-api/workbench';
 import { onLayout, onRenderWorkbench } from '@codingame/monaco-vscode-api/lifecycle';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from '@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/service-override/tools/views';
 export { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-export { ViewPaneContainer } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from '@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs';
+export { ViewPaneContainer } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+export { ConfirmResult } from '@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common/vscode/vs/platform/dialogs/common/dialogs';
 export { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
-export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/resourceEditorInput';
-export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/resourceEditorInput';
+export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-export { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
 export { SplitView } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview';
 export { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "14.0.5",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,24 +15,25 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "14.0.5",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "14.0.5",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "14.0.5",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "14.0.5",
-    "@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common": "14.0.5",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "14.0.5",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.5",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "14.0.5",
-    "@codingame/monaco-vscode-api": "14.0.5",
-    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.5",
-    "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common": "14.0.5",
-    "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "14.0.5",
-    "@codingame/monaco-vscode-keybindings-service-override": "14.0.5",
-    "@codingame/monaco-vscode-quickaccess-service-override": "14.0.5",
-    "@codingame/monaco-vscode-view-banner-service-override": "14.0.5",
-    "@codingame/monaco-vscode-view-common-service-override": "14.0.5",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "14.0.5",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "14.0.5"
+    "@codingame/monaco-vscode-09d6ed79-77bb-525d-bd17-ed2bf3adbb38-common": "15.0.0",
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "15.0.0",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "15.0.0",
+    "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "15.0.0",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.0",
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "15.0.0",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "15.0.0",
+    "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.0",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "15.0.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "15.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "15.0.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "15.0.0",
+    "@codingame/monaco-vscode-view-common-service-override": "15.0.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "15.0.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "15.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -42,12 +43,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js",
-      "types": "./vscode/src/*.d.ts"
+      "types": "./vscode/src/*.d.ts",
+      "default": "./vscode/src/*.js"
     },
     "./*": {
-      "default": "./*.js",
-      "types": "./*.d.ts"
+      "types": "./*.d.ts",
+      "default": "./*.js"
     }
   },
   "typesVersions": {

package/service-override/tools/views.d.ts

@@ -2,20 +2,20 @@ import { type IViewContainerDescriptor, type IViewContainersRegistry, type IView
 import type { BrandedService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { type IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Codicon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/codicons";
 import { type EditorInputFactoryObject, type RegisteredEditorInfo, type RegisteredEditorOptions, RegisteredEditorPriority } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
 import { EditorInput, type IEditorCloseHandler } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { EditorInputCapabilities, type IEditorOpenContext, type IEditorSerializer, Verbosity } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import type { IEditorOptions, IResourceEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
-import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { DomScrollableElement } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement";
-import { ConfirmResult } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
-import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/resourceEditorInput";
-import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
-import { Parts, Position } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
+import { ConfirmResult } from "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common/vscode/vs/platform/dialogs/common/dialogs";
+import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/resourceEditorInput";
+import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
+import { Parts, Position } from "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { type IView, SplitView } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview";
 import { type IEditorGroup } from "@codingame/monaco-vscode-api/services";

package/vscode/src/vs/workbench/browser/layout.d.ts

@@ -2,7 +2,7 @@ import { Disposable, DisposableMap, DisposableStore, IDisposable } from "@coding
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IDimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { Position, Parts, PanelAlignment, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
+import { Position, Parts, PanelAlignment, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS } from "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IPath } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";

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

@@ -1,14 +1,14 @@
 
 import { Disposable, toDisposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { getActiveDocument, getWindows, getClientArea, getWindow, addDisposableListener, EventType, isActiveDocument, getWindowId, getActiveWindow, getActiveElement, isAncestorUsingFlowTo, position, size, computeScreenAwareSize } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, addDisposableListener, EventType, isActiveDocument, getWindowId, getActiveWindow, getActiveElement, isAncestorUsingFlowTo, position, size, computeScreenAwareSize } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import { IWorkingCopyBackupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
 import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { pathsToEditors, isResourceEditorInput, EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { SidebarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/panel/panelPart';
-import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { isTemporaryWorkspace, WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -17,7 +17,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
 import { StartupKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { TitleBarSetting, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
+import { TitleBarSetting, DEFAULT_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -29,7 +29,7 @@ import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { assertIsDefined, isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { assertIsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { NotificationsFilter } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
@@ -37,7 +37,7 @@ import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from '@codingame/monaco-
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { DiffEditorInput } from '@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-09d6ed79-77bb-525d-bd17-ed2bf3adbb38-common/vscode/vs/workbench/common/editor/diffEditorInput';
 import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/performance';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -79,6 +79,7 @@ const TITLE_BAR_SETTINGS = [
     TitleBarSetting.TITLE_BAR_STYLE,
     TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY,
 ];
+const DEFAULT_WINDOW_DIMENSIONS = ( new Dimension(DEFAULT_WINDOW_SIZE.width, DEFAULT_WINDOW_SIZE.height));
 class Layout extends Disposable {
     get activeContainer() { return this.getContainerFromDocument(getActiveDocument()); }
     get containers() {
@@ -325,9 +326,7 @@ class Layout extends Disposable {
     doUpdateLayoutConfiguration(skipLayout) {
         this.updateCustomTitleBarVisibility();
         this.updateMenubarVisibility(!!skipLayout);
-        this.editorGroupService.whenRestored.then(() => {
-            this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED), skipLayout);
-        });
+        this.editorGroupService.whenRestored.then(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED), skipLayout));
     }
     setSideBarPosition(position) {
         const activityBar = this.getPart(Parts.ACTIVITYBAR_PART);
@@ -355,7 +354,8 @@ class Layout extends Disposable {
     updateWindowsBorder(skipLayout = false) {
         if (isWeb ||
             isWindows ||
-            useWindowControlsOverlay(this.configurationService) ||
+            (((isWindows || isLinux) && useWindowControlsOverlay(this.configurationService))
+            ) ||
             hasNativeTitlebar(this.configurationService)) {
             return;
         }
@@ -383,7 +383,7 @@ class Layout extends Disposable {
         }
     }
     initLayoutState(lifecycleService, fileService) {
-        this._mainContainerDimension = getClientArea(this.parent);
+        this._mainContainerDimension = getClientArea(this.parent, DEFAULT_WINDOW_DIMENSIONS);
         this.stateModel = ( new LayoutStateModel(this.storageService, this.configurationService, this.contextService));
         this.stateModel.load(this._mainContainerDimension);
         if (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) && this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN)) {
@@ -1092,7 +1092,8 @@ class Layout extends Disposable {
         if (!this.disposed) {
             this._mainContainerDimension = getClientArea(this.state.runtime.mainWindowFullscreen ?
                 mainWindow.document.body :
-                this.parent
+                this.parent,
+            DEFAULT_WINDOW_DIMENSIONS
             );
             this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`);
             position(this.mainContainer, 0, 0, 0, 0, 'relative');
@@ -1107,12 +1108,12 @@ class Layout extends Disposable {
     }
     centerMainEditorLayout(active, skipLayout) {
         this.stateModel.setRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED, active);
-        const mainVisibleEditors = ( this.editorGroupService.mainPart.groups.map(g => g.activeEditor)).filter(isDefined);
+        const mainVisibleEditors = coalesce(( this.editorGroupService.mainPart.groups.map(group => group.activeEditor)));
         const isEditorComplex = ( mainVisibleEditors.some(editor => {
             if (editor instanceof DiffEditorInput) {
                 return this.configurationService.getValue('diffEditor.renderSideBySide');
             }
-            else if (editor?.hasCapability(EditorInputCapabilities.MultipleEditors)) {
+            if (editor?.hasCapability(EditorInputCapabilities.MultipleEditors)) {
                 return true;
             }
             return false;
@@ -1123,7 +1124,7 @@ class Layout extends Disposable {
             hasMoreThanOneColumn = layout.groups.length > 1;
         }
         else {
-            hasMoreThanOneColumn = ( layout.groups.some(g => g.groups && g.groups.length > 1));
+            hasMoreThanOneColumn = ( layout.groups.some(group => group.groups && group.groups.length > 1));
         }
         const isCenteredLayoutAutoResizing = this.configurationService.getValue('workbench.editor.centeredLayoutAutoResize');
         if (isCenteredLayoutAutoResizing &&

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

@@ -54,7 +54,7 @@ class NotificationAccessibleView {
                 if (!notification) {
                     return;
                 }
-                return notification.source ? ( localize(3256, '{0} Source: {1}', message, notification.source)) : ( localize(3257, '{0}', message));
+                return notification.source ? ( localize(3263, '{0} Source: {1}', message, notification.source)) : ( localize(3264, '{0}', message));
             }
             const content = getContentForNotification();
             if (!content) {
@@ -117,7 +117,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(3258, "Clear Notification")), tooltip: ( localize(3258, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(3265, "Clear Notification")), tooltip: ( localize(3265, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)

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

@@ -8,7 +8,7 @@ import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/perform
 import { onUnexpectedError, setUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isNative, isMacintosh, isWindows, isLinux, isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { getSingletonServiceDescriptors } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { Parts, positionToString, Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts, positionToString, Position } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { WillSaveStateReason, StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
@@ -188,10 +188,6 @@ class Workbench extends Layout {
             ...(this.options?.extraClasses ? this.options.extraClasses : [])
         ]);
         this.mainContainer.classList.add(...workbenchClasses);
-        mainWindow.document.body.classList.add(platformClass);
-        if (isWeb) {
-            mainWindow.document.body.classList.add('web');
-        }
         this.updateFontAliasing(undefined, configurationService);
         this.restoreFontInfo(storageService, configurationService);
         for (const { id, role, classes, options } of [