@codingame/monaco-vscode-workbench-service-override 23.2.2 → 24.1.0

package/index.js

@@ -8,10 +8,10 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { EditorService } from '@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/vscode/vs/workbench/services/editor/browser/editorService';
-import { EditorParts } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/editor/editorParts';
+import { EditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/browser/editorService';
+import { EditorParts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorParts';
 import { setUnexpectedErrorHandler, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { BrowserWindow } from '@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common/vscode/vs/workbench/browser/window';
+import { BrowserWindow } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/window';
 import { detectFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { setFullscreen } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
@@ -23,13 +23,13 @@ import getServiceOverride$1 from '@codingame/monaco-vscode-view-banner-service-o
 import getServiceOverride$6 from '@codingame/monaco-vscode-view-common-service-override';
 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 { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from '@codingame/monaco-vscode-api/service-override/tools/views';
 export { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-export { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/dialogs/common/dialogs';
+export { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+export { ConfirmResult } from '@codingame/monaco-vscode-api/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-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/resourceEditorInput';
-export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/resourceEditorInput';
+export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-api/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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "23.2.2",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,24 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "23.2.2",
-    "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common": "23.2.2",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "23.2.2",
-    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.2.2",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "23.2.2",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.2.2",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "23.2.2",
-    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "23.2.2",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "23.2.2",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "23.2.2",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.2.2",
-    "@codingame/monaco-vscode-api": "23.2.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "23.2.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "23.2.2",
-    "@codingame/monaco-vscode-view-banner-service-override": "23.2.2",
-    "@codingame/monaco-vscode-view-common-service-override": "23.2.2",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "23.2.2",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "23.2.2"
+    "@codingame/monaco-vscode-api": "24.1.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "24.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "24.1.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "24.1.0",
+    "@codingame/monaco-vscode-view-common-service-override": "24.1.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "24.1.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -2,19 +2,19 @@ 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-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-api/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-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-api/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-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/dialogs/common/dialogs";
-import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/resourceEditorInput";
-import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
+import { ConfirmResult } from "@codingame/monaco-vscode-api/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-api/vscode/vs/workbench/common/editor/textResourceEditorInput";
 import { Parts, Position } from "@codingame/monaco-vscode-api/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";

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

@@ -1,5 +1,5 @@
 import { IDimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
-import { Direction, IViewSize } from "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid";
+import { Direction, IViewSize } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid";
 import { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, DisposableMap, DisposableStore, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
@@ -9,7 +9,7 @@ import { IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { EditorGroupLayout } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { MULTI_WINDOW_PARTS, PanelAlignment, Parts, Position, SINGLE_WINDOW_PARTS } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { Part } from "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common/vscode/vs/workbench/browser/part";
+import { Part } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part";
 export interface ILayoutRuntimeState {
     activeContainerId: number;
     mainWindowFullscreen: boolean;

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

@@ -2,7 +2,7 @@
 import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, createElement, addDisposableListener, EventType, isActiveDocument, getActiveElement, getActiveWindow, isAncestorUsingFlowTo, getFullscreenElement, size, computeScreenAwareSize, getWindowId } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { setContainerElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
-import { SerializableGrid, Sizing, Direction } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid';
+import { SerializableGrid, Sizing, Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { DeferredPromise, Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -36,7 +36,7 @@ import { IBannerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { GroupsOrder, GroupOrientation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, isMultiWindowPart, partOpensMaximizedFromString, PartOpensMaximizedOptions, positionToString, positionFromString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -45,12 +45,12 @@ import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
-import { Part } from '@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common/vscode/vs/workbench/browser/part';
-import { AuxiliaryBarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
-import { PanelPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/panel/panelPart';
-import { SidebarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+import { Part } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part';
+import { AuxiliaryBarPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
+import { PanelPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/panel/panelPart';
+import { SidebarPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
 import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
-import '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/gridview';
+import '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/gridview';
 
 var LayoutClasses;
 (function (LayoutClasses) {
@@ -621,7 +621,7 @@ class Layout extends Disposable {
                     }
                 })));
             }
-            const customEditorRestorePromise = instantiationService.invokeFunction(this.layoutOptions?.customEditorRestore ?? (async () => { }), this.state.initialization.layout?.editors != null);
+            const customEditorRestorePromise = instantiationService.invokeFunction(this.layoutOptions?.customEditorRestore ?? (async () => { }), !!this.state.initialization.layout?.editors);
             layoutRestoredPromises.push(Promise.all([
                 openEditorsPromise?.finally(() => mark('code/restoreEditors/editorsOpened')),
                 customEditorRestorePromise?.finally(() => mark('code/restoreEditors/customEditorsOpened')),
@@ -1078,7 +1078,7 @@ class Layout extends Disposable {
                     if (part === sideBar) {
                         this.setSideBarHidden(!visible);
                     }
-                    else if (part === panelPart) {
+                    else if (part === panelPart && this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) === visible) {
                         this.setPanelHidden(!visible, true);
                     }
                     else if (part === auxiliaryBarPart) {
@@ -1265,6 +1265,7 @@ class Layout extends Disposable {
         else {
             this.mainContainer.classList.remove(LayoutClasses.SIDEBAR_HIDDEN);
         }
+        this.workbenchGrid.setViewVisible(this.sideBarPartView, !hidden);
         if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)) {
             this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Sidebar);
             if (!this.isAuxiliaryBarMaximized()) {
@@ -1274,10 +1275,9 @@ class Layout extends Disposable {
         else if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)) {
             const viewletToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Sidebar);
             if (viewletToOpen) {
-                this.openViewContainer(ViewContainerLocation.Sidebar, viewletToOpen, true);
+                this.openViewContainer(ViewContainerLocation.Sidebar, viewletToOpen);
             }
         }
-        this.workbenchGrid.setViewVisible(this.sideBarPartView, !hidden);
     }
     hasViews(id) {
         const viewContainer = this.viewDescriptorService.getViewContainerById(id);
@@ -1361,8 +1361,8 @@ class Layout extends Disposable {
             return;
         }
         const wasHidden = !this.isVisible(Parts.PANEL_PART);
-        this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, hidden);
         const isPanelMaximized = this.isPanelMaximized();
+        this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, hidden);
         const panelOpensMaximized = this.panelOpensMaximized();
         if (hidden) {
             this.mainContainer.classList.add(LayoutClasses.PANEL_HIDDEN);
@@ -1370,6 +1370,10 @@ class Layout extends Disposable {
         else {
             this.mainContainer.classList.remove(LayoutClasses.PANEL_HIDDEN);
         }
+        if (hidden && isPanelMaximized) {
+            this.toggleMaximizedPanel();
+        }
+        this.workbenchGrid.setViewVisible(this.panelPartView, !hidden);
         let focusEditor = false;
         if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
             this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Panel);
@@ -1390,13 +1394,9 @@ class Layout extends Disposable {
                 this.openViewContainer(ViewContainerLocation.Panel, panelToOpen, !skipLayout);
             }
         }
-        if (hidden && isPanelMaximized) {
-            this.toggleMaximizedPanel();
-        }
         if (wasHidden === hidden) {
             return;
         }
-        this.workbenchGrid.setViewVisible(this.panelPartView, !hidden);
         if (!hidden) {
             if (!skipLayout && isPanelMaximized !== panelOpensMaximized) {
                 this.toggleMaximizedPanel();
@@ -1521,6 +1521,7 @@ class Layout extends Disposable {
         else {
             this.mainContainer.classList.remove(LayoutClasses.AUXILIARYBAR_HIDDEN);
         }
+        this.workbenchGrid.setViewVisible(this.auxiliaryBarPartView, !hidden);
         if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.AuxiliaryBar)) {
             this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.AuxiliaryBar);
             this.focusPanelOrEditor();
@@ -1536,7 +1537,6 @@ class Layout extends Disposable {
                 this.openViewContainer(ViewContainerLocation.AuxiliaryBar, viewletToOpen, !skipLayout);
             }
         }
-        this.workbenchGrid.setViewVisible(this.auxiliaryBarPartView, !hidden);
     }
     setPartHidden(hidden, part) {
         switch (part) {
@@ -2240,13 +2240,7 @@ class LayoutStateModel extends Disposable {
         this.storageService.store(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, typeof value === 'object' ? JSON.stringify(value) : value, key.scope, key.target);
     }
     loadKeyFromStorage(key) {
-        let value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
-        if (key.scope === StorageScope.WORKSPACE &&
-            key.name === LayoutStateKeys.AUXILIARYBAR_HIDDEN.name &&
-            this.configurationService.getValue('workbench.secondarySideBar.enableDefaultVisibilityInOldWorkspace') === true &&
-            this.storageService.get('workbench.panel.chat.numberOfVisibleViews', StorageScope.WORKSPACE) === undefined) {
-            value = undefined;
-        }
+        const value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
         if (value !== undefined) {
             this.isNew[key.scope] = false;
             switch (typeof key.defaultValue) {

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

@@ -9,7 +9,7 @@ import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
-import { getNotificationFromContext } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { getNotificationFromContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationFocusedContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { withSeverityPrefix } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 
@@ -55,7 +55,7 @@ class NotificationAccessibleView {
                 if (!notification || !message) {
                     return;
                 }
-                return withSeverityPrefix(notification.source ? ( localize(3480, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
+                return withSeverityPrefix(notification.source ? ( localize(3497, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
             }
             const content = getContentForNotification();
             if (!content) {
@@ -118,7 +118,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(3481, "Clear Notification")), tooltip: ( localize(3481, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(3498, "Clear Notification")), tooltip: ( localize(3498, "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-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common/vscode/vs/workbench/browser/style';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/style';
 import { createElement, runWhenWindowIdle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Emitter, setGlobalLeakWarningThreshold, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { timeout, RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -16,11 +16,11 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { LifecyclePhase } 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 { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
-import { NotificationsCenter } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsCenter';
-import { NotificationsAlerts } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsAlerts';
-import { NotificationsStatus } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsStatus';
-import { registerNotificationCommands } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
-import { NotificationsToasts } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
+import { NotificationsCenter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/notifications/notificationsCenter';
+import { NotificationsAlerts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/notifications/notificationsAlerts';
+import { NotificationsStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/notifications/notificationsStatus';
+import { registerNotificationCommands } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { NotificationsToasts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
 import { setARIAContainer } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { FontMeasurements } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/fontMeasurements';
 import { createBareFontInfoFromRawSettings } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/fontInfoFromSettings';
@@ -32,7 +32,7 @@ import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { PixelRatio } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/pixelRatio';
-import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
+import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
 import { setProgressAccessibilitySignalScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/progressbar/progressAccessibilitySignal';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { NotificationAccessibleView } from './parts/notifications/notificationAccessibleView.js';