@codingame/monaco-vscode-workbench-service-override 19.1.4 → 20.0.1

package/index.js

@@ -26,10 +26,10 @@ import { onLayout, onRenderWorkbench } from '@codingame/monaco-vscode-api/lifecy
 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-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/platform/dialogs/common/dialogs';
+export { ConfirmResult } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-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-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 { AbstractResourceEditorInput } from '@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/resourceEditorInput';
+export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "19.1.4",
+  "version": "20.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,26 +15,25 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "19.1.4",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "19.1.4",
-    "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common": "19.1.4",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "19.1.4",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "19.1.4",
-    "@codingame/monaco-vscode-516ccb00-d5b9-5317-baf0-fcc96e99669a-common": "19.1.4",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "19.1.4",
-    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "19.1.4",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "19.1.4",
-    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "19.1.4",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "19.1.4",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "19.1.4",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "19.1.4",
-    "@codingame/monaco-vscode-api": "19.1.4",
-    "@codingame/monaco-vscode-keybindings-service-override": "19.1.4",
-    "@codingame/monaco-vscode-quickaccess-service-override": "19.1.4",
-    "@codingame/monaco-vscode-view-banner-service-override": "19.1.4",
-    "@codingame/monaco-vscode-view-common-service-override": "19.1.4",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "19.1.4",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "19.1.4"
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "20.0.1",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "20.0.1",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "20.0.1",
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "20.0.1",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "20.0.1",
+    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "20.0.1",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "20.0.1",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "20.0.1",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.0.1",
+    "@codingame/monaco-vscode-api": "20.0.1",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "20.0.1",
+    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.0.1",
+    "@codingame/monaco-vscode-f6f55824-df83-5ffc-ac26-50fd4df4fe0e-common": "20.0.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "20.0.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "20.0.1",
+    "@codingame/monaco-vscode-view-banner-service-override": "20.0.1",
+    "@codingame/monaco-vscode-view-common-service-override": "20.0.1",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "20.0.1",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "20.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -12,9 +12,9 @@ import type { IEditorOptions, IResourceEditorInput } from "@codingame/monaco-vsc
 import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-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-2726569c-a06b-5f25-b851-14311bef12fa-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 { ConfirmResult } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/resourceEditorInput";
+import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/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

@@ -135,7 +135,6 @@ export declare abstract class Layout extends Disposable implements IWorkbenchLay
     private titleService;
     private viewDescriptorService;
     private contextService;
-    private workingCopyBackupService;
     private notificationService;
     private themeService;
     private statusBarService;
@@ -158,7 +157,7 @@ export declare abstract class Layout extends Disposable implements IWorkbenchLay
     private getActiveContainerId;
     private doUpdateLayoutConfiguration;
     private setSideBarPosition;
-    private updateWindowsBorder;
+    private updateWindowBorder;
     private initLayoutState;
     private getDefaultLayoutViews;
     private shouldRestoreEditors;
@@ -213,11 +212,10 @@ export declare abstract class Layout extends Disposable implements IWorkbenchLay
     private adjustPartPositions;
     setPanelAlignment(alignment: PanelAlignment): void;
     private setPanelHidden;
-    private maximizedAuxiliaryBarState;
     private inMaximizedAuxiliaryBarTransition;
     isAuxiliaryBarMaximized(): boolean;
     toggleMaximizedAuxiliaryBar(): void;
-    setAuxiliaryBarMaximized(maximized: boolean, fromInit?: boolean): boolean;
+    setAuxiliaryBarMaximized(maximized: boolean): boolean;
     isPanelMaximized(): boolean;
     toggleMaximizedPanel(): void;
     private panelOpensMaximized;

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

@@ -1,9 +1,8 @@
 
 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 { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, createElement, addDisposableListener, EventType, isActiveDocument, getActiveWindow, getActiveElement, isAncestorUsingFlowTo, position, size, computeScreenAwareSize, getWindowId } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, createElement, addDisposableListener, EventType, isActiveDocument, getActiveElement, getActiveWindow, isAncestorUsingFlowTo, position, size, computeScreenAwareSize, getWindowId } 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';
@@ -38,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-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-api/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';
@@ -49,7 +48,7 @@ import { AuxiliaryBarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IAuxiliaryWindowService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { StartupExperimentGroup } from '@codingame/monaco-vscode-516ccb00-d5b9-5317-baf0-fcc96e99669a-common/vscode/vs/workbench/services/coreExperimentation/common/coreExperimentationService';
+import { StartupExperimentGroup } from '@codingame/monaco-vscode-f6f55824-df83-5ffc-ac26-50fd4df4fe0e-common/vscode/vs/workbench/services/coreExperimentation/common/coreExperimentationService';
 import { ICoreExperimentationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/coreExperimentation/common/coreExperimentationService.service';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { setContainerElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
@@ -180,7 +179,6 @@ class Layout extends Disposable {
         this.whenRestoredPromise = ( new DeferredPromise());
         this.whenRestored = this.whenRestoredPromise.p;
         this.restored = false;
-        this.maximizedAuxiliaryBarState = undefined;
         this.inMaximizedAuxiliaryBarTransition = false;
         setContainerElement(parent);
     }
@@ -190,7 +188,6 @@ class Layout extends Disposable {
         this.hostService = accessor.get(IHostService);
         this.contextService = accessor.get(IWorkspaceContextService);
         this.storageService = accessor.get(IStorageService);
-        this.workingCopyBackupService = accessor.get(IWorkingCopyBackupService);
         this.themeService = accessor.get(IThemeService);
         this.extensionService = accessor.get(IExtensionService);
         this.logService = accessor.get(ILogService);
@@ -260,7 +257,7 @@ class Layout extends Disposable {
         if (showingCustomMenu) {
             this._register(this.titleService.onMenubarVisibilityChange(visible => this.onMenubarToggled(visible)));
         }
-        this._register(this.themeService.onDidColorThemeChange(() => this.updateWindowsBorder()));
+        this._register(this.themeService.onDidColorThemeChange(() => this.updateWindowBorder()));
         this._register(this.hostService.onDidChangeFocus(focused => this.onWindowFocusChanged(focused)));
         this._register(this.hostService.onDidChangeActiveWindow(() => this.onActiveWindowChanged()));
         if (isWeb && typeof navigator.windowControlsOverlay === 'object') {
@@ -316,21 +313,21 @@ class Layout extends Disposable {
         this.workbenchGrid.edgeSnapping = this.state.runtime.mainWindowFullscreen;
         {
             this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
-            this.updateWindowsBorder(true);
+            this.updateWindowBorder(true);
         }
     }
     onActiveWindowChanged() {
         const activeContainerId = this.getActiveContainerId();
         if (this.state.runtime.activeContainerId !== activeContainerId) {
             this.state.runtime.activeContainerId = activeContainerId;
-            this.updateWindowsBorder();
+            this.updateWindowBorder();
             this._onDidChangeActiveContainer.fire();
         }
     }
     onWindowFocusChanged(hasFocus) {
         if (this.state.runtime.hasFocus !== hasFocus) {
             this.state.runtime.hasFocus = hasFocus;
-            this.updateWindowsBorder();
+            this.updateWindowBorder();
         }
     }
     getActiveContainerId() {
@@ -365,7 +362,7 @@ class Layout extends Disposable {
         auxiliaryBar.updateStyles();
         this.adjustPartPositions(position, panelAlignment, panelPosition);
     }
-    updateWindowsBorder(skipLayout = false) {
+    updateWindowBorder(skipLayout = false) {
         if (isWeb ||
             isWindows ||
             (((isWindows || isLinux) && useWindowControlsOverlay(this.configurationService))
@@ -496,7 +493,7 @@ class Layout extends Disposable {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, true);
             }
         }
-        this.updateWindowsBorder(true);
+        this.updateWindowBorder(true);
     }
     getDefaultLayoutViews(environmentService, storageService) {
         const defaultLayout = environmentService.options?.defaultLayout;
@@ -563,10 +560,6 @@ class Layout extends Disposable {
             if (this.editorGroupService.hasRestorableState) {
                 return [];
             }
-            const hasBackups = await this.workingCopyBackupService.hasBackups();
-            if (hasBackups) {
-                return [];
-            }
             return [{
                     editor: { resource: undefined }
                 }];
@@ -728,6 +721,9 @@ class Layout extends Disposable {
             this.centerMainEditorLayout(true, true);
         }
         Promises.settled(layoutReadyPromises).finally(() => {
+            if (getActiveElement() === mainWindow.document.body && (this.isPanelMaximized() || this.isAuxiliaryBarMaximized())) {
+                this.focus();
+            }
             this.whenReadyPromise.complete();
             Promises.settled(layoutRestoredPromises).finally(() => {
                 this.restored = true;
@@ -1079,9 +1075,6 @@ class Layout extends Disposable {
         this.mainContainer.setAttribute('role', 'application');
         this.workbenchGrid = workbenchGrid;
         this.workbenchGrid.edgeSnapping = this.state.runtime.mainWindowFullscreen;
-        if (this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED)) {
-            this.setAuxiliaryBarMaximized(true, true );
-        }
         for (const part of [titleBar, editorPart, activityBar, panelPart, sideBar, statusBar, auxiliaryBarPart, bannerPart]) {
             this._register(part.onDidVisibilityChange(visible => {
                 if (!this.inMaximizedAuxiliaryBarTransition) {
@@ -1417,45 +1410,32 @@ class Layout extends Disposable {
         }
     }
     isAuxiliaryBarMaximized() {
-        return !!this.maximizedAuxiliaryBarState;
+        return this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED);
     }
     toggleMaximizedAuxiliaryBar() {
         this.setAuxiliaryBarMaximized(!this.isAuxiliaryBarMaximized());
     }
-    setAuxiliaryBarMaximized(maximized, fromInit) {
+    setAuxiliaryBarMaximized(maximized) {
         if (this.inMaximizedAuxiliaryBarTransition ||
-            (!maximized && !this.maximizedAuxiliaryBarState)
+            (maximized === this.isAuxiliaryBarMaximized())
         ) {
             return false;
         }
         if (maximized) {
-            let state;
-            if (fromInit) {
-                const stateMixin = { editorVisible: true };
-                this.setEditorHidden(false);
-                state = {
-                    ...this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY),
-                    ...stateMixin
-                };
-            }
-            else {
-                state = {
-                    sideBarVisible: this.isVisible(Parts.SIDEBAR_PART),
-                    editorVisible: this.isVisible(Parts.EDITOR_PART),
-                    panelVisible: this.isVisible(Parts.PANEL_PART),
-                    auxiliaryBarVisible: this.isVisible(Parts.AUXILIARYBAR_PART)
-                };
-            }
-            this.maximizedAuxiliaryBarState = state;
+            const state = {
+                sideBarVisible: this.isVisible(Parts.SIDEBAR_PART),
+                editorVisible: this.isVisible(Parts.EDITOR_PART),
+                panelVisible: this.isVisible(Parts.PANEL_PART),
+                auxiliaryBarVisible: this.isVisible(Parts.AUXILIARYBAR_PART)
+            };
+            this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, true);
             this.inMaximizedAuxiliaryBarTransition = true;
             try {
                 if (!state.auxiliaryBarVisible) {
                     this.setAuxiliaryBarHidden(false);
                 }
-                if (!fromInit) {
-                    const size = this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
-                    this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE, size);
-                }
+                const size = this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
+                this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE, size);
                 if (state.sideBarVisible) {
                     this.setSideBarHidden(true);
                 }
@@ -1465,17 +1445,15 @@ class Layout extends Disposable {
                 if (state.editorVisible) {
                     this.setEditorHidden(true);
                 }
-                if (!fromInit) {
-                    this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, state);
-                }
+                this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, state);
             }
             finally {
                 this.inMaximizedAuxiliaryBarTransition = false;
             }
         }
         else {
-            const state = assertReturnsDefined(this.maximizedAuxiliaryBarState);
-            this.maximizedAuxiliaryBarState = undefined;
+            const state = assertReturnsDefined(this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY));
+            this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, false);
             this.inMaximizedAuxiliaryBarTransition = true;
             try {
                 this.setEditorHidden(!state?.editorVisible);
@@ -1492,7 +1470,6 @@ class Layout extends Disposable {
             }
         }
         this.focusPart(Parts.AUXILIARYBAR_PART);
-        this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, maximized);
         this._onDidChangeAuxiliaryBarMaximized.fire();
         return true;
     }
@@ -1693,7 +1670,7 @@ class Layout extends Disposable {
         else {
             this.state.runtime.maximized.delete(targetWindowId);
         }
-        this.updateWindowsBorder();
+        this.updateWindowBorder();
         this._onDidChangeWindowMaximized.fire({ windowId: targetWindowId, maximized });
     }
     getVisibleNeighborPart(part, direction) {
@@ -1752,7 +1729,8 @@ class Layout extends Disposable {
         return {
             type: 'branch',
             data: result,
-            size: availableHeight
+            size: availableHeight,
+            visible: ( result.some(node => node.visible))
         };
     }
     arrangeMiddleSectionNodes(nodes, availableWidth, availableHeight) {
@@ -1793,10 +1771,12 @@ class Layout extends Disposable {
                 sideBar: sideBarNextToEditor ? nodes.sideBar : undefined,
                 auxiliaryBar: auxiliaryBarNextToEditor ? nodes.auxiliaryBar : undefined
             }, availableHeight - panelSize, editorSectionWidth);
+            const data = panelPostion === Position.BOTTOM ? [editorNodes, nodes.panel] : [nodes.panel, editorNodes];
             result.push({
                 type: 'branch',
-                data: panelPostion === Position.BOTTOM ? [editorNodes, nodes.panel] : [nodes.panel, editorNodes],
-                size: editorSectionWidth
+                data,
+                size: editorSectionWidth,
+                visible: ( data.some(node => node.visible))
             });
             if (!sideBarNextToEditor) {
                 if (sideBarPosition === Position.LEFT) {
@@ -2064,6 +2044,11 @@ class LayoutStateModel extends Disposable {
         this._onDidChangeState = this._register(( new Emitter()));
         this.onDidChangeState = this._onDidChangeState.event;
         this.stateCache = ( new Map());
+        this.isNew = {
+            [StorageScope.WORKSPACE]: this.storageService.isNew(StorageScope.WORKSPACE),
+            [StorageScope.PROFILE]: this.storageService.isNew(StorageScope.PROFILE),
+            [StorageScope.APPLICATION]: this.storageService.isNew(StorageScope.APPLICATION)
+        };
         this._register(this.configurationService.onDidChangeConfiguration(configurationChange => this.updateStateFromLegacySettings(configurationChange)));
     }
     updateStateFromLegacySettings(configurationChangeEvent) {
@@ -2127,9 +2112,11 @@ class LayoutStateModel extends Disposable {
                 }
             }
             switch (this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY)) {
+                case 'maximized':
                 case 'visible':
                     return false;
                 case 'visibleInWorkspace':
+                case 'maximizedInWorkspace':
                     return workbenchState === WorkbenchState.EMPTY;
                 default:
                     return true;
@@ -2175,18 +2162,7 @@ class LayoutStateModel extends Disposable {
                 experiment.value?.experimentGroup === StartupExperimentGroup.SplitEmptyEditorChat ||
                 experiment.value?.experimentGroup === StartupExperimentGroup.SplitWelcomeChat)) {
             if (experiment.value.experimentGroup === StartupExperimentGroup.MaximizedChat) {
-                this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, {
-                    sideBarVisible: !this.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN),
-                    panelVisible: !this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN),
-                    editorVisible: !this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN),
-                    auxiliaryBarVisible: !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
-                });
-                this.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
-                this.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, true);
-                this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, true);
-                this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, false);
-                this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE, this.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE));
-                this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, true);
+                this.applyAuxiliaryBarMaximizedOverride();
             }
             else if (experiment.value.experimentGroup === StartupExperimentGroup.SplitEmptyEditorChat ||
                 experiment.value.experimentGroup === StartupExperimentGroup.SplitWelcomeChat) {
@@ -2195,12 +2171,33 @@ class LayoutStateModel extends Disposable {
                 this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, Math.ceil(mainContainerDimension.width / ((1.618 * 1.618) )));
             }
         }
+        else if (this.isNew[StorageScope.WORKSPACE]) {
+            const defaultAuxiliaryBarVisibility = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
+            if (defaultAuxiliaryBarVisibility === 'maximized' ||
+                (defaultAuxiliaryBarVisibility === 'maximizedInWorkspace' && this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY)) {
+                this.applyAuxiliaryBarMaximizedOverride();
+            }
+        }
         if (this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) &&
             this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN) &&
             !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED)) {
             this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, false);
         }
     }
+    applyAuxiliaryBarMaximizedOverride() {
+        this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, {
+            sideBarVisible: !this.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN),
+            panelVisible: !this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN),
+            editorVisible: !this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN),
+            auxiliaryBarVisible: !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
+        });
+        this.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
+        this.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, true);
+        this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, true);
+        this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, false);
+        this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE, this.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE));
+        this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, true);
+    }
     save(workspace, global) {
         let key;
         const isZenMode = this.getRuntimeValue(LayoutStateKeys.ZEN_MODE_ACTIVE);
@@ -2267,18 +2264,13 @@ 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);
+        const value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
         if (value !== undefined) {
+            this.isNew[key.scope] = false;
             switch (typeof key.defaultValue) {
-                case 'boolean':
-                    value = value === 'true';
-                    break;
-                case 'number':
-                    value = parseInt(value);
-                    break;
-                case 'object':
-                    value = JSON.parse(value);
-                    break;
+                case 'boolean': return (value === 'true');
+                case 'number': return parseInt(value);
+                case 'object': return JSON.parse(value);
             }
         }
         return value;

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

@@ -55,7 +55,7 @@ class NotificationAccessibleView {
                 if (!notification || !message) {
                     return;
                 }
-                return withSeverityPrefix(notification.source ? ( localize(3386, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
+                return withSeverityPrefix(notification.source ? ( localize(3424, '{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(3387, "Clear Notification")), tooltip: ( localize(3387, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(3425, "Clear Notification")), tooltip: ( localize(3425, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)