@codingame/monaco-vscode-workbench-service-override 25.1.1 → 26.0.0

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

@@ -8,52 +8,52 @@ import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arr
 import { DeferredPromise, Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, toDisposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/performance';
 import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { assertReturnsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { pathsToEditors, isResourceEditorInput, EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { SidebarPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+import { PanelPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/panel/panelPart';
+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';
+import { WorkbenchState, isTemporaryWorkspace } 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';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { isConfigured } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+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 { MenuSettings, TitleBarSetting, DEFAULT_EMPTY_WINDOW_SIZE, DEFAULT_WORKSPACE_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay, hasNativeMenu } 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-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+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 { Part } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/part';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { assertReturnsDefined } 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 { 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';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { MenuSettings, TitleBarSetting, DEFAULT_EMPTY_WINDOW_SIZE, DEFAULT_WORKSPACE_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay, hasNativeMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
-import { WorkbenchState, isTemporaryWorkspace } 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 { pathsToEditors, isResourceEditorInput, EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
 import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
+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-api/vscode/vs/workbench/common/editor/diffEditorInput';
+import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/performance';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+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 { IBannerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/banner/browser/bannerService.service';
-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-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';
-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 { 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-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-api/vscode/vs/base/browser/ui/grid/gridview';
 
 var LayoutClasses;
-(function (LayoutClasses) {
+(function(LayoutClasses) {
     LayoutClasses["SIDEBAR_HIDDEN"] = "nosidebar";
     LayoutClasses["MAIN_EDITOR_AREA_HIDDEN"] = "nomaineditorarea";
     LayoutClasses["PANEL_HIDDEN"] = "nopanel";
@@ -64,9 +64,10 @@ var LayoutClasses;
     LayoutClasses["WINDOW_BORDER"] = "border";
 })(LayoutClasses || (LayoutClasses = {}));
 const COMMAND_CENTER_SETTINGS = [
-    'chat.commandCenter.enabled',
-    'workbench.navigationControl.enabled',
-    'workbench.experimental.share.enabled',
+    "chat.agentsControl.enabled",
+    "chat.unifiedAgentsBar.enabled",
+    "workbench.navigationControl.enabled",
+    "workbench.experimental.share.enabled"
 ];
 const TITLE_BAR_SETTINGS = [
     LayoutSettings.ACTIVITY_BAR_LOCATION,
@@ -76,15 +77,19 @@ const TITLE_BAR_SETTINGS = [
     LayoutSettings.LAYOUT_ACTIONS,
     MenuSettings.MenuBarVisibility,
     TitleBarSetting.TITLE_BAR_STYLE,
-    TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY,
+    TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY
 ];
 const DEFAULT_EMPTY_WINDOW_DIMENSIONS = ( new Dimension(DEFAULT_EMPTY_WINDOW_SIZE.width, DEFAULT_EMPTY_WINDOW_SIZE.height));
 const DEFAULT_WORKSPACE_WINDOW_DIMENSIONS = ( new Dimension(DEFAULT_WORKSPACE_WINDOW_SIZE.width, DEFAULT_WORKSPACE_WINDOW_SIZE.height));
 class Layout extends Disposable {
-    get activeContainer() { return this.getContainerFromDocument(getActiveDocument()); }
+    get activeContainer() {
+        return this.getContainerFromDocument(getActiveDocument());
+    }
     get containers() {
         const containers = [];
-        for (const { window } of getWindows()) {
+        for (const {
+            window
+        } of getWindows()) {
             containers.push(this.getContainerFromDocument(window.document));
         }
         return containers;
@@ -92,23 +97,23 @@ class Layout extends Disposable {
     getContainerFromDocument(targetDocument) {
         if (targetDocument === this.mainContainer.ownerDocument) {
             return this.mainContainer;
-        }
-        else {
-            return targetDocument.body.getElementsByClassName('monaco-workbench')[0];
+        } else {
+            return targetDocument.body.getElementsByClassName("monaco-workbench")[0];
         }
     }
     whenContainerStylesLoaded(window) {
         return this.containerStylesLoaded.get(window.vscodeWindowId);
     }
-    get mainContainerDimension() { return this._mainContainerDimension; }
+    get mainContainerDimension() {
+        return this._mainContainerDimension;
+    }
     get activeContainerDimension() {
         return this.getContainerDimension(this.activeContainer);
     }
     getContainerDimension(container) {
         if (container === this.mainContainer) {
             return this.mainContainerDimension;
-        }
-        else {
+        } else {
             return getClientArea(container);
         }
     }
@@ -134,7 +139,10 @@ class Layout extends Disposable {
         if (isCommandCenterVisible) {
             quickPickTop = 6;
         }
-        return { top, quickPickTop };
+        return {
+            top,
+            quickPickTop
+        };
     }
     constructor(parent, layoutOptions) {
         super();
@@ -166,7 +174,7 @@ class Layout extends Disposable {
         this.onDidAddContainer = this._onDidAddContainer.event;
         this._onDidChangeActiveContainer = this._register(( new Emitter()));
         this.onDidChangeActiveContainer = this._onDidChangeActiveContainer.event;
-        this.mainContainer = createElement('div');
+        this.mainContainer = createElement("div");
         this.containerStylesLoaded = ( new Map());
         this.parts = ( new Map());
         this.initialized = false;
@@ -205,29 +213,45 @@ class Layout extends Disposable {
     }
     registerLayoutListeners() {
         const showEditorIfHidden = () => {
-            if (!this.isVisible(Parts.EDITOR_PART, mainWindow)) {
-                if (this.isAuxiliaryBarMaximized()) {
-                    this.toggleMaximizedAuxiliaryBar();
-                }
-                else {
-                    this.toggleMaximizedPanel();
-                }
+            if (
+            this.isVisible(Parts.EDITOR_PART, mainWindow) || this.mainPartEditorService.visibleEditors.length === 0) {
+                return;
             }
+            if (this.isAuxiliaryBarMaximized()) {
+                this.toggleMaximizedAuxiliaryBar();
+            } else {
+                this.toggleMaximizedPanel();
+            }
+        };
+        const maybeMaximizeAuxiliaryBar = () => {
+            if (this.mainPartEditorService.visibleEditors.length === 0 && this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED) === true) {
+                this.setAuxiliaryBarMaximized(true);
+                return true;
+            }
+            return false;
         };
         this.editorGroupService.whenRestored.then(() => {
-            this._register(this.mainPartEditorService.onDidVisibleEditorsChange(showEditorIfHidden));
+            this._register(this.mainPartEditorService.onDidVisibleEditorsChange(() => {
+                const handled = maybeMaximizeAuxiliaryBar();
+                if (!handled) {
+                    showEditorIfHidden();
+                }
+            }));
             this._register(this.editorGroupService.mainPart.onDidActivateGroup(showEditorIfHidden));
-            this._register(this.mainPartEditorService.onDidActiveEditorChange(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
+            this._register(this.mainPartEditorService.onDidActiveEditorChange(
+                () => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))
+            ));
         });
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (( [
                 ...TITLE_BAR_SETTINGS,
                 LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION,
-                LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE,
+                LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE
             ].some(setting => e.affectsConfiguration(setting)))) {
-                const shareEnabled = e.affectsConfiguration('workbench.experimental.share.enabled') && this.configurationService.getValue('workbench.experimental.share.enabled');
-                const navigationControlEnabled = e.affectsConfiguration('workbench.navigationControl.enabled') && this.configurationService.getValue('workbench.navigationControl.enabled');
-                if (shareEnabled || navigationControlEnabled) {
+                const enabledCommandCenterAction = ( COMMAND_CENTER_SETTINGS.some(
+                    setting => e.affectsConfiguration(setting) && this.configurationService.getValue(setting) === true
+                ));
+                if (enabledCommandCenterAction) {
                     if (this.configurationService.getValue(LayoutSettings.COMMAND_CENTER) === false) {
                         this.configurationService.updateValue(LayoutSettings.COMMAND_CENTER, true);
                         return;
@@ -245,41 +269,85 @@ class Layout extends Disposable {
                 }
                 this.doUpdateLayoutConfiguration();
             }
+            if (e.affectsConfiguration(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED)) {
+                const forceMaximized = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED);
+                if (forceMaximized === true && this.mainPartEditorService.visibleEditors.length === 0) {
+                    this.setAuxiliaryBarMaximized(true);
+                } else if (forceMaximized === false && this.isAuxiliaryBarMaximized()) {
+                    this.setAuxiliaryBarMaximized(false);
+                }
+            }
         }));
         this._register(onDidChangeFullscreen(windowId => this.onFullscreenChanged(windowId)));
-        this._register(this.editorGroupService.mainPart.onDidAddGroup(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
-        this._register(this.editorGroupService.mainPart.onDidRemoveGroup(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
-        this._register(this.editorGroupService.mainPart.onDidChangeGroupMaximized(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
-        this._register(addDisposableListener(this.mainContainer, EventType.SCROLL, () => this.mainContainer.scrollTop = 0));
+        this._register(this.editorGroupService.mainPart.onDidAddGroup(
+            () => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))
+        ));
+        this._register(this.editorGroupService.mainPart.onDidRemoveGroup(
+            () => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))
+        ));
+        this._register(this.editorGroupService.mainPart.onDidChangeGroupMaximized(
+            () => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))
+        ));
+        this._register(addDisposableListener(
+            this.mainContainer,
+            EventType.SCROLL,
+            () => this.mainContainer.scrollTop = 0
+        ));
         const showingCustomMenu = (isWindows || isLinux || isWeb) && !hasNativeTitlebar(this.configurationService);
         if (showingCustomMenu) {
-            this._register(this.titleService.onMenubarVisibilityChange(visible => this.onMenubarToggled(visible)));
+            this._register(
+                this.titleService.onMenubarVisibilityChange(visible => this.onMenubarToggled(visible))
+            );
         }
         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') {
-            this._register(addDisposableListener(navigator.windowControlsOverlay, 'geometrychange', () => this.onDidChangeWCO()));
-        }
-        this._register(this.auxiliaryWindowService.onDidOpenAuxiliaryWindow(({ window, disposables }) => {
+        this._register(
+            this.hostService.onDidChangeFocus(focused => this.onWindowFocusChanged(focused))
+        );
+        this._register(
+            this.hostService.onDidChangeActiveWindow(() => this.onActiveWindowChanged())
+        );
+        if (isWeb && typeof navigator.windowControlsOverlay === "object") {
+            this._register(addDisposableListener(
+                navigator.windowControlsOverlay,
+                "geometrychange",
+                () => this.onDidChangeWCO()
+            ));
+        }
+        this._register(this.auxiliaryWindowService.onDidOpenAuxiliaryWindow((
+            {
+                window,
+                disposables
+            }
+        ) => {
             const windowId = window.window.vscodeWindowId;
             this.containerStylesLoaded.set(windowId, window.whenStylesHaveLoaded);
             window.whenStylesHaveLoaded.then(() => this.containerStylesLoaded.delete(windowId));
             disposables.add(toDisposable(() => this.containerStylesLoaded.delete(windowId)));
             const eventDisposables = disposables.add(( new DisposableStore()));
-            this._onDidAddContainer.fire({ container: window.container, disposables: eventDisposables });
-            disposables.add(window.onDidLayout(dimension => this.handleContainerDidLayout(window.container, dimension)));
+            this._onDidAddContainer.fire({
+                container: window.container,
+                disposables: eventDisposables
+            });
+            disposables.add(
+                window.onDidLayout(dimension => this.handleContainerDidLayout(window.container, dimension))
+            );
         }));
     }
     onMenubarToggled(visible) {
         if (visible !== this.state.runtime.menuBar.toggled) {
             this.state.runtime.menuBar.toggled = visible;
             const menuBarVisibility = getMenuBarVisibility(this.configurationService);
-            if (isWeb && menuBarVisibility === 'toggle') {
-                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
-            }
-            else if (this.state.runtime.mainWindowFullscreen && (menuBarVisibility === 'toggle' || menuBarVisibility === 'classic')) {
-                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
+            if (isWeb && menuBarVisibility === "toggle") {
+                this.workbenchGrid.setViewVisible(
+                    this.titleBarPartView,
+                    shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled)
+                );
+            }
+            else if (this.state.runtime.mainWindowFullscreen && (menuBarVisibility === "toggle" || menuBarVisibility === "classic")) {
+                this.workbenchGrid.setViewVisible(
+                    this.titleBarPartView,
+                    shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled)
+                );
             }
             this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
         }
@@ -291,7 +359,10 @@ class Layout extends Disposable {
         if (isActiveDocument(container)) {
             this._onDidLayoutActiveContainer.fire(dimension);
         }
-        this._onDidLayoutContainer.fire({ container, dimension });
+        this._onDidLayoutContainer.fire({
+            container,
+            dimension
+        });
     }
     onFullscreenChanged(windowId) {
         if (windowId !== mainWindow.vscodeWindowId) {
@@ -300,8 +371,7 @@ class Layout extends Disposable {
         this.state.runtime.mainWindowFullscreen = isFullscreen(mainWindow);
         if (this.state.runtime.mainWindowFullscreen) {
             this.mainContainer.classList.add(LayoutClasses.FULLSCREEN);
-        }
-        else {
+        } else {
             this.mainContainer.classList.remove(LayoutClasses.FULLSCREEN);
             const zenModeExitInfo = this.stateModel.getRuntimeValue(LayoutStateKeys.ZEN_MODE_EXIT_INFO);
             if (zenModeExitInfo.transitionedToFullScreen && this.isZenModeActive()) {
@@ -310,7 +380,10 @@ 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.workbenchGrid.setViewVisible(
+                this.titleBarPartView,
+                shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled)
+            );
             this.updateWindowBorder(true);
         }
     }
@@ -335,14 +408,17 @@ 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);
         const sideBar = this.getPart(Parts.SIDEBAR_PART);
         const auxiliaryBar = this.getPart(Parts.AUXILIARYBAR_PART);
-        const newPositionValue = (position === Position.LEFT) ? 'left' : 'right';
-        const oldPositionValue = (position === Position.RIGHT) ? 'left' : 'right';
+        const newPositionValue = (position === Position.LEFT) ? "left" : "right";
+        const oldPositionValue = (position === Position.RIGHT) ? "left" : "right";
         const panelAlignment = this.getPanelAlignment();
         const panelPosition = this.getPanelPosition();
         this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON, position);
@@ -361,11 +437,9 @@ class Layout extends Disposable {
         this.adjustPartPositions(position, panelAlignment, panelPosition);
     }
     updateWindowBorder(skipLayout = false) {
-        if (isWeb ||
-            isWindows ||
-            (((isWindows || isLinux) && useWindowControlsOverlay(this.configurationService))
-            ) ||
-            hasNativeTitlebar(this.configurationService)) {
+        if (
+        isWeb || isWindows ||
+        ((isWindows || isLinux) && useWindowControlsOverlay(this.configurationService)) || hasNativeTitlebar(this.configurationService)) {
             return;
         }
         const theme = this.themeService.getColorTheme();
@@ -379,7 +453,7 @@ class Layout extends Disposable {
             if (!this.state.runtime.mainWindowFullscreen && (activeBorder || inactiveBorder)) {
                 windowBorder = true;
                 const borderColor = isActiveContainer && this.state.runtime.hasFocus ? activeBorder : inactiveBorder ?? activeBorder;
-                container.style.setProperty('--window-border-color', borderColor?.toString() ?? 'transparent');
+                container.style.setProperty("--window-border-color", borderColor?.toString() ?? "transparent");
             }
             if (isMainContainer) {
                 this.state.runtime.mainWindowBorder = windowBorder;
@@ -391,7 +465,10 @@ class Layout extends Disposable {
         }
     }
     initLayoutState(lifecycleService, fileService) {
-        this._mainContainerDimension = getClientArea(this.parent, this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS);
+        this._mainContainerDimension = getClientArea(
+            this.parent,
+            this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS
+        );
         this.stateModel = ( new LayoutStateModel(
             this.storageService,
             this.configurationService,
@@ -422,7 +499,7 @@ class Layout extends Disposable {
         }));
         const initialEditorsState = this.getInitialEditorsState();
         if (initialEditorsState) {
-            this.logService.trace('Initial editor state', initialEditorsState);
+            this.logService.trace("Initial editor state", initialEditorsState);
         }
         const initialLayoutState = {
             layout: {
@@ -430,7 +507,7 @@ class Layout extends Disposable {
             },
             editor: {
                 restoreEditors: this.shouldRestoreEditors(this.contextService, initialEditorsState),
-                editorsToOpen: this.resolveEditorsToOpen(fileService, initialEditorsState),
+                editorsToOpen: this.resolveEditorsToOpen(fileService, initialEditorsState)
             },
             views: {
                 defaults: this.getDefaultLayoutViews(this.environmentService, this.storageService),
@@ -444,47 +521,53 @@ class Layout extends Disposable {
             maximized: ( new Set()),
             mainWindowBorder: false,
             menuBar: {
-                toggled: false,
+                toggled: false
             },
             zenMode: {
-                transitionDisposables: ( new DisposableMap()),
+                transitionDisposables: ( new DisposableMap())
             }
         };
         this.state = {
             initialization: initialLayoutState,
-            runtime: layoutRuntimeState,
+            runtime: layoutRuntimeState
         };
         if (this.isVisible(Parts.SIDEBAR_PART)) {
-            let viewContainerToRestore = this.storageService.get(SidebarPart.activeViewletSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id);
-            if (!this.environmentService.isBuilt ||
-                lifecycleService.startupKind === StartupKind.ReloadedWindow ||
-                this.environmentService.isExtensionDevelopment && !this.environmentService.extensionTestsLocationURI) ;
-            else if (viewContainerToRestore !== this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id &&
-                viewContainerToRestore !== this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.AuxiliaryBar)?.id) {
+            let viewContainerToRestore = this.storageService.get(
+                SidebarPart.activeViewletSettingsKey,
+                StorageScope.WORKSPACE,
+                this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id
+            );
+            if (!this.environmentService.isBuilt || lifecycleService.startupKind === StartupKind.ReloadedWindow || this.environmentService.isExtensionDevelopment && !this.environmentService.extensionTestsLocationURI)
+                ; else if (viewContainerToRestore !== this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id && viewContainerToRestore !== this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.AuxiliaryBar)?.id) {
                 viewContainerToRestore = this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id;
             }
             if (viewContainerToRestore) {
                 this.state.initialization.views.containerToRestore.sideBar = viewContainerToRestore;
-            }
-            else {
+            } else {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
             }
         }
         if (this.isVisible(Parts.PANEL_PART)) {
-            const viewContainerToRestore = this.storageService.get(PanelPart.activePanelSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Panel)?.id);
+            const viewContainerToRestore = this.storageService.get(
+                PanelPart.activePanelSettingsKey,
+                StorageScope.WORKSPACE,
+                this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Panel)?.id
+            );
             if (viewContainerToRestore) {
                 this.state.initialization.views.containerToRestore.panel = viewContainerToRestore;
-            }
-            else {
+            } else {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, true);
             }
         }
         if (this.isVisible(Parts.AUXILIARYBAR_PART)) {
-            const viewContainerToRestore = this.storageService.get(AuxiliaryBarPart.activeViewSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.AuxiliaryBar)?.id);
+            const viewContainerToRestore = this.storageService.get(
+                AuxiliaryBarPart.activeViewSettingsKey,
+                StorageScope.WORKSPACE,
+                this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.AuxiliaryBar)?.id
+            );
             if (viewContainerToRestore) {
                 this.state.initialization.views.containerToRestore.auxiliaryBar = viewContainerToRestore;
-            }
-            else {
+            } else {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, true);
             }
         }
@@ -498,7 +581,9 @@ class Layout extends Disposable {
         if (!defaultLayout.force && !storageService.isNew(StorageScope.WORKSPACE)) {
             return undefined;
         }
-        const { views } = defaultLayout;
+        const {
+            views
+        } = defaultLayout;
         if (views?.length) {
             return ( views.map(view => view.id));
         }
@@ -508,7 +593,10 @@ class Layout extends Disposable {
         if (isTemporaryWorkspace(contextService.getWorkspace())) {
             return false;
         }
-        const forceRestoreEditors = this.configurationService.getValue('window.restoreWindows') === 'preserve';
+        if (this.configurationService.getValue(WorkbenchLayoutSettings.EDITOR_RESTORE_EDITORS) === false) {
+            return false;
+        }
+        const forceRestoreEditors = this.configurationService.getValue("window.restoreWindows") === "preserve";
         return !!forceRestoreEditors || initialEditorsState === undefined;
     }
     willRestoreEditors() {
@@ -516,27 +604,47 @@ class Layout extends Disposable {
     }
     async resolveEditorsToOpen(fileService, initialEditorsState) {
         if (initialEditorsState) {
-            const filesToMerge = coalesce(await pathsToEditors(initialEditorsState.filesToMerge, fileService, this.logService));
+            const filesToMerge = coalesce(
+                await pathsToEditors(initialEditorsState.filesToMerge, fileService, this.logService)
+            );
             if (filesToMerge.length === 4 && isResourceEditorInput(filesToMerge[0]) && isResourceEditorInput(filesToMerge[1]) && isResourceEditorInput(filesToMerge[2]) && isResourceEditorInput(filesToMerge[3])) {
                 return [{
-                        editor: {
-                            input1: { resource: filesToMerge[0].resource },
-                            input2: { resource: filesToMerge[1].resource },
-                            base: { resource: filesToMerge[2].resource },
-                            result: { resource: filesToMerge[3].resource },
-                            options: { pinned: true }
+                    editor: {
+                        input1: {
+                            resource: filesToMerge[0].resource
+                        },
+                        input2: {
+                            resource: filesToMerge[1].resource
+                        },
+                        base: {
+                            resource: filesToMerge[2].resource
+                        },
+                        result: {
+                            resource: filesToMerge[3].resource
+                        },
+                        options: {
+                            pinned: true
                         }
-                    }];
+                    }
+                }];
             }
-            const filesToDiff = coalesce(await pathsToEditors(initialEditorsState.filesToDiff, fileService, this.logService));
+            const filesToDiff = coalesce(
+                await pathsToEditors(initialEditorsState.filesToDiff, fileService, this.logService)
+            );
             if (filesToDiff.length === 2) {
                 return [{
-                        editor: {
-                            original: { resource: filesToDiff[0].resource },
-                            modified: { resource: filesToDiff[1].resource },
-                            options: { pinned: true }
+                    editor: {
+                        original: {
+                            resource: filesToDiff[0].resource
+                        },
+                        modified: {
+                            resource: filesToDiff[1].resource
+                        },
+                        options: {
+                            pinned: true
                         }
-                    }];
+                    }
+                }];
             }
             const filesToOpenOrCreate = [];
             const resolvedFilesToOpenOrCreate = await pathsToEditors(initialEditorsState.filesToOpenOrCreate, fileService, this.logService);
@@ -551,17 +659,21 @@ class Layout extends Disposable {
             }
             return filesToOpenOrCreate;
         }
-        else if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY && this.configurationService.getValue('workbench.startupEditor') === 'newUntitledFile') {
+        else if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY && this.configurationService.getValue("workbench.startupEditor") === "newUntitledFile") {
             if (this.editorGroupService.hasRestorableState) {
                 return [];
             }
             return [{
-                    editor: { resource: undefined }
-                }];
+                editor: {
+                    resource: undefined
+                }
+            }];
         }
         return [];
     }
-    get openedDefaultEditors() { return this._openedDefaultEditors; }
+    get openedDefaultEditors() {
+        return this._openedDefaultEditors;
+    }
     getInitialEditorsState() {
         const defaultLayout = this.environmentService.options?.defaultLayout;
         if ((defaultLayout?.editors?.length || defaultLayout?.layout?.editors) && (defaultLayout.force || this.storageService.isNew(StorageScope.WORKSPACE))) {
@@ -578,9 +690,17 @@ class Layout extends Disposable {
                 })
             };
         }
-        const { filesToOpenOrCreate, filesToDiff, filesToMerge } = this.environmentService;
+        const {
+            filesToOpenOrCreate,
+            filesToDiff,
+            filesToMerge
+        } = this.environmentService;
         if (filesToOpenOrCreate || filesToDiff || filesToMerge) {
-            return { filesToOpenOrCreate, filesToDiff, filesToMerge };
+            return {
+                filesToOpenOrCreate,
+                filesToDiff,
+                filesToMerge
+            };
         }
         return undefined;
     }
@@ -591,14 +711,14 @@ class Layout extends Disposable {
         const layoutReadyPromises = [];
         const layoutRestoredPromises = [];
         layoutReadyPromises.push((async () => {
-            mark('code/willRestoreEditors');
+            mark("code/willRestoreEditors");
             await this.editorGroupService.whenReady;
-            mark('code/restoreEditors/editorGroupsReady');
+            mark("code/restoreEditors/editorGroupsReady");
             if (this.state.initialization.layout?.editors) {
                 this.editorGroupService.mainPart.applyLayout(this.state.initialization.layout.editors);
             }
             const editors = await this.state.initialization.editor.editorsToOpen;
-            mark('code/restoreEditors/editorsToOpenResolved');
+            mark("code/restoreEditors/editorsToOpenResolved");
             let openEditorsPromise = undefined;
             if (editors.length) {
                 const editorGroupsInVisualOrder = this.editorGroupService.mainPart.getGroups(GroupsOrder.GRID_APPEARANCE);
@@ -614,33 +734,40 @@ class Layout extends Disposable {
                 }
                 openEditorsPromise = Promise.all(( Array.from(mapEditorsToGroup).map(async ([groupId, editors]) => {
                     try {
-                        await this.editorService.openEditors(Array.from(editors), groupId, { validateTrust: true });
-                    }
-                    catch (error) {
+                        await this.editorService.openEditors(Array.from(editors), groupId, {
+                            validateTrust: true
+                        });
+                    } catch (error) {
                         this.logService.error(error);
                     }
                 })));
             }
-            const customEditorRestorePromise = instantiationService.invokeFunction(this.layoutOptions?.customEditorRestore ?? (async () => { }), !!this.state.initialization.layout?.editors);
+            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')),
-                this.editorGroupService.whenRestored.finally(() => mark('code/restoreEditors/editorGroupsRestored'))
+                openEditorsPromise?.finally(() => mark("code/restoreEditors/editorsOpened")),
+                customEditorRestorePromise?.finally(() => mark("code/restoreEditors/customEditorsOpened")),
+                this.editorGroupService.whenRestored.finally(() => mark("code/restoreEditors/editorGroupsRestored"))
             ]).finally(() => {
-                mark('code/didRestoreEditors');
+                mark("code/didRestoreEditors");
             }));
         })());
         const restoreDefaultViewsPromise = (async () => {
             if (this.state.initialization.views.defaults?.length) {
-                mark('code/willOpenDefaultViews');
+                mark("code/willOpenDefaultViews");
                 const locationsRestored = [];
-                const tryOpenView = (view) => {
+                const tryOpenView = view => {
                     const location = this.viewDescriptorService.getViewLocationById(view.id);
                     if (location !== null) {
                         const container = this.viewDescriptorService.getViewContainerByViewId(view.id);
                         if (container) {
                             if (view.order >= (locationsRestored?.[location]?.order ?? 0)) {
-                                locationsRestored[location] = { id: container.id, order: view.order };
+                                locationsRestored[location] = {
+                                    id: container.id,
+                                    order: view.order
+                                };
                             }
                             const containerModel = this.viewDescriptorService.getViewContainerModel(container);
                             containerModel.setCollapsed(view.id, false);
@@ -650,7 +777,10 @@ class Layout extends Disposable {
                     }
                     return false;
                 };
-                const defaultViews = ( [...this.state.initialization.views.defaults].reverse().map((v, index) => ({ id: v, order: index })));
+                const defaultViews = ( [...this.state.initialization.views.defaults].reverse().map((v, index) => ({
+                    id: v,
+                    order: index
+                })));
                 let i = defaultViews.length;
                 while (i) {
                     i--;
@@ -677,7 +807,7 @@ class Layout extends Disposable {
                 if (locationsRestored[ViewContainerLocation.AuxiliaryBar]) {
                     this.state.initialization.views.containerToRestore.auxiliaryBar = locationsRestored[ViewContainerLocation.AuxiliaryBar].id;
                 }
-                mark('code/didOpenDefaultViews');
+                mark("code/didOpenDefaultViews");
             }
         })();
         layoutReadyPromises.push(restoreDefaultViewsPromise);
@@ -686,27 +816,36 @@ class Layout extends Disposable {
             if (!this.state.initialization.views.containerToRestore.sideBar) {
                 return;
             }
-            mark('code/willRestoreViewlet');
-            await this.openViewContainer(ViewContainerLocation.Sidebar, this.state.initialization.views.containerToRestore.sideBar);
-            mark('code/didRestoreViewlet');
+            mark("code/willRestoreViewlet");
+            await this.openViewContainer(
+                ViewContainerLocation.Sidebar,
+                this.state.initialization.views.containerToRestore.sideBar
+            );
+            mark("code/didRestoreViewlet");
         })());
         layoutReadyPromises.push((async () => {
             await restoreDefaultViewsPromise;
             if (!this.state.initialization.views.containerToRestore.panel) {
                 return;
             }
-            mark('code/willRestorePanel');
-            await this.openViewContainer(ViewContainerLocation.Panel, this.state.initialization.views.containerToRestore.panel);
-            mark('code/didRestorePanel');
+            mark("code/willRestorePanel");
+            await this.openViewContainer(
+                ViewContainerLocation.Panel,
+                this.state.initialization.views.containerToRestore.panel
+            );
+            mark("code/didRestorePanel");
         })());
         layoutReadyPromises.push((async () => {
             await restoreDefaultViewsPromise;
             if (!this.state.initialization.views.containerToRestore.auxiliaryBar) {
                 return;
             }
-            mark('code/willRestoreAuxiliaryBar');
-            await this.openViewContainer(ViewContainerLocation.AuxiliaryBar, this.state.initialization.views.containerToRestore.auxiliaryBar);
-            mark('code/didRestoreAuxiliaryBar');
+            mark("code/willRestoreAuxiliaryBar");
+            await this.openViewContainer(
+                ViewContainerLocation.AuxiliaryBar,
+                this.state.initialization.views.containerToRestore.auxiliaryBar
+            );
+            mark("code/didRestoreAuxiliaryBar");
         })());
         const zenModeWasActive = this.isZenModeActive();
         const restoreZenMode = getZenModeConfiguration(this.configurationService).restore;
@@ -723,6 +862,10 @@ class Layout extends Disposable {
             }
             this.whenReadyPromise.complete();
             Promises.settled(layoutRestoredPromises).finally(() => {
+                if (
+                this.editorService.editors.length === 0 && this.isVisible(Parts.AUXILIARYBAR_PART) && !this.hasFocus(Parts.AUXILIARYBAR_PART) && !this.environmentService.enableSmokeTestDriver) {
+                    this.focusPart(Parts.AUXILIARYBAR_PART);
+                }
                 this.restored = true;
                 this.whenRestoredPromise.complete();
             });
@@ -733,11 +876,19 @@ class Layout extends Disposable {
         if (viewContainer) {
             return;
         }
-        viewContainer = await this.paneCompositeService.openPaneComposite(this.viewDescriptorService.getDefaultViewContainer(location)?.id, location, focus);
+        viewContainer = await this.paneCompositeService.openPaneComposite(
+            this.viewDescriptorService.getDefaultViewContainer(location)?.id,
+            location,
+            focus
+        );
         if (viewContainer) {
             return;
         }
-        await this.paneCompositeService.openPaneComposite(this.paneCompositeService.getVisiblePaneCompositeIds(location).at(0), location, focus);
+        await this.paneCompositeService.openPaneComposite(
+            this.paneCompositeService.getVisiblePaneCompositeIds(location).at(0),
+            location,
+            focus
+        );
     }
     registerPart(part) {
         const id = part.getId();
@@ -752,7 +903,9 @@ class Layout extends Disposable {
         return part;
     }
     registerNotifications(delegate) {
-        this._register(delegate.onDidChangeNotificationsVisibility(visible => this._onDidChangeNotificationsVisibility.fire(visible)));
+        this._register(
+            delegate.onDidChangeNotificationsVisibility(visible => this._onDidChangeNotificationsVisibility.fire(visible))
+        );
     }
     hasFocus(part) {
         const container = this.getContainer(getActiveWindow(), part);
@@ -776,34 +929,38 @@ class Layout extends Disposable {
     focusPart(part, targetWindow = mainWindow) {
         const container = this.getContainer(targetWindow, part) ?? this.mainContainer;
         switch (part) {
-            case Parts.EDITOR_PART:
-                this.editorGroupService.getPart(container).activeGroup.focus();
-                break;
-            case Parts.PANEL_PART: {
+        case Parts.EDITOR_PART:
+            this.editorGroupService.getPart(container).activeGroup.focus();
+            break;
+        case Parts.PANEL_PART:
+            {
                 this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)?.focus();
                 break;
             }
-            case Parts.SIDEBAR_PART: {
+        case Parts.SIDEBAR_PART:
+            {
                 this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)?.focus();
                 break;
             }
-            case Parts.AUXILIARYBAR_PART: {
+        case Parts.AUXILIARYBAR_PART:
+            {
                 this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.AuxiliaryBar)?.focus();
                 break;
             }
-            case Parts.ACTIVITYBAR_PART:
-                this.getPart(Parts.SIDEBAR_PART).focusActivityBar();
-                break;
-            case Parts.STATUSBAR_PART:
-                this.statusBarService.getPart(container).focus();
-                break;
-            default: {
+        case Parts.ACTIVITYBAR_PART:
+            this.getPart(Parts.SIDEBAR_PART).focusActivityBar();
+            break;
+        case Parts.STATUSBAR_PART:
+            this.statusBarService.getPart(container).focus();
+            break;
+        default:
+            {
                 container?.focus();
             }
         }
     }
     getContainer(targetWindow, part) {
-        if (typeof part === 'undefined') {
+        if (typeof part === "undefined") {
             return this.getContainerFromDocument(targetWindow.document);
         }
         if (targetWindow === mainWindow) {
@@ -812,11 +969,9 @@ class Layout extends Disposable {
         let partCandidate;
         if (part === Parts.EDITOR_PART) {
             partCandidate = this.editorGroupService.getPart(this.getContainerFromDocument(targetWindow.document));
-        }
-        else if (part === Parts.STATUSBAR_PART) {
+        } else if (part === Parts.STATUSBAR_PART) {
             partCandidate = this.statusBarService.getPart(this.getContainerFromDocument(targetWindow.document));
-        }
-        else if (part === Parts.TITLEBAR_PART) {
+        } else if (part === Parts.TITLEBAR_PART) {
             partCandidate = this.titleService.getPart(this.getContainerFromDocument(targetWindow.document));
         }
         if (partCandidate instanceof Part) {
@@ -829,26 +984,24 @@ class Layout extends Disposable {
             return true;
         }
         switch (part) {
-            case Parts.TITLEBAR_PART:
-                return this.initialized ?
-                    this.workbenchGrid.isViewVisible(this.titleBarPartView) :
-                    shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
-            case Parts.SIDEBAR_PART:
-                return !this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN);
-            case Parts.PANEL_PART:
-                return !this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN);
-            case Parts.AUXILIARYBAR_PART:
-                return !this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN);
-            case Parts.STATUSBAR_PART:
-                return !this.stateModel.getRuntimeValue(LayoutStateKeys.STATUSBAR_HIDDEN);
-            case Parts.ACTIVITYBAR_PART:
-                return !this.stateModel.getRuntimeValue(LayoutStateKeys.ACTIVITYBAR_HIDDEN);
-            case Parts.EDITOR_PART:
-                return !this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN);
-            case Parts.BANNER_PART:
-                return this.initialized ? this.workbenchGrid.isViewVisible(this.bannerPartView) : false;
-            default:
-                return false;
+        case Parts.TITLEBAR_PART:
+            return this.initialized ? this.workbenchGrid.isViewVisible(this.titleBarPartView) : shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
+        case Parts.SIDEBAR_PART:
+            return !this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN);
+        case Parts.PANEL_PART:
+            return !this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN);
+        case Parts.AUXILIARYBAR_PART:
+            return !this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN);
+        case Parts.STATUSBAR_PART:
+            return !this.stateModel.getRuntimeValue(LayoutStateKeys.STATUSBAR_HIDDEN);
+        case Parts.ACTIVITYBAR_PART:
+            return !this.stateModel.getRuntimeValue(LayoutStateKeys.ACTIVITYBAR_HIDDEN);
+        case Parts.EDITOR_PART:
+            return !this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN);
+        case Parts.BANNER_PART:
+            return this.initialized ? this.workbenchGrid.isViewVisible(this.bannerPartView) : false;
+        default:
+            return false;
         }
     }
     shouldShowBannerFirst() {
@@ -857,11 +1010,9 @@ class Layout extends Disposable {
     focus() {
         if (this.isPanelMaximized() && this.mainContainer === this.activeContainer) {
             this.focusPart(Parts.PANEL_PART);
-        }
-        else if (this.isAuxiliaryBarMaximized() && this.mainContainer === this.activeContainer) {
+        } else if (this.isAuxiliaryBarMaximized() && this.mainContainer === this.activeContainer) {
             this.focusPart(Parts.AUXILIARYBAR_PART);
-        }
-        else {
+        } else {
             this.focusPart(Parts.EDITOR_PART, getWindow(this.activeContainer));
         }
     }
@@ -869,8 +1020,7 @@ class Layout extends Disposable {
         const activePanel = this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
         if ((this.hasFocus(Parts.PANEL_PART) || !this.isVisible(Parts.EDITOR_PART)) && activePanel) {
             activePanel.focus();
-        }
-        else {
+        } else {
             this.focus();
         }
     }
@@ -879,21 +1029,20 @@ class Layout extends Disposable {
         const containerDimension = this.getContainerDimension(container);
         if (container === this.mainContainer) {
             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) && !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) && isPanelHorizontal ? this.panelPartView.minimumHeight : 0);
+            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) && !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) && isPanelHorizontal ? this.panelPartView.minimumHeight : 0);
             const availableWidth = containerDimension.width - takenWidth;
             const availableHeight = containerDimension.height - takenHeight;
-            return { width: availableWidth, height: availableHeight };
-        }
-        else {
-            const takenHeight = (this.isVisible(Parts.TITLEBAR_PART, targetWindow) ? this.titleBarPartView.minimumHeight : 0) +
-                (this.isVisible(Parts.STATUSBAR_PART, targetWindow) ? this.statusBarPartView.minimumHeight : 0);
-            return { width: containerDimension.width, height: containerDimension.height - takenHeight };
+            return {
+                width: availableWidth,
+                height: availableHeight
+            };
+        } else {
+            const takenHeight = (this.isVisible(Parts.TITLEBAR_PART, targetWindow) ? this.titleBarPartView.minimumHeight : 0) + (this.isVisible(Parts.STATUSBAR_PART, targetWindow) ? this.statusBarPartView.minimumHeight : 0);
+            return {
+                width: containerDimension.width,
+                height: containerDimension.height - takenHeight
+            };
         }
     }
     isZenModeActive() {
@@ -906,16 +1055,21 @@ class Layout extends Disposable {
         const focusedPartPreTransition = this._getFocusedPart();
         this.setZenModeActive(!this.isZenModeActive());
         this.state.runtime.zenMode.transitionDisposables.clearAndDisposeAll();
-        const setLineNumbers = (lineNumbers) => {
+        const setLineNumbers = lineNumbers => {
             for (const editor of this.mainPartEditorService.visibleTextEditorControls) {
                 if (!lineNumbers && isCodeEditor(editor) && editor.hasModel()) {
                     const model = editor.getModel();
-                    lineNumbers = this.configurationService.getValue('editor.lineNumbers', { resource: model.uri, overrideIdentifier: model.getLanguageId() });
+                    lineNumbers = this.configurationService.getValue("editor.lineNumbers", {
+                        resource: model.uri,
+                        overrideIdentifier: model.getLanguageId()
+                    });
                 }
                 if (!lineNumbers) {
-                    lineNumbers = this.configurationService.getValue('editor.lineNumbers');
+                    lineNumbers = this.configurationService.getValue("editor.lineNumbers");
                 }
-                editor.updateOptions({ lineNumbers });
+                editor.updateOptions({
+                    lineNumbers
+                });
             }
         };
         let toggleMainWindowFullScreen = false;
@@ -942,11 +1096,19 @@ class Layout extends Disposable {
                 this.setStatusBarHidden(true);
             }
             if (config.hideLineNumbers) {
-                setLineNumbers('off');
-                this.state.runtime.zenMode.transitionDisposables.set(ZenModeSettings.HIDE_LINENUMBERS, this.mainPartEditorService.onDidVisibleEditorsChange(() => setLineNumbers('off')));
+                setLineNumbers("off");
+                this.state.runtime.zenMode.transitionDisposables.set(
+                    ZenModeSettings.HIDE_LINENUMBERS,
+                    this.mainPartEditorService.onDidVisibleEditorsChange(() => setLineNumbers("off"))
+                );
             }
             if (config.showTabs !== this.editorGroupService.partOptions.showTabs) {
-                this.state.runtime.zenMode.transitionDisposables.set(ZenModeSettings.SHOW_TABS, this.editorGroupService.mainPart.enforcePartOptions({ showTabs: config.showTabs }));
+                this.state.runtime.zenMode.transitionDisposables.set(
+                    ZenModeSettings.SHOW_TABS,
+                    this.editorGroupService.mainPart.enforcePartOptions({
+                        showTabs: config.showTabs
+                    })
+                );
             }
             if (config.silentNotifications && zenModeExitInfo.handleNotificationsDoNotDisturbMode) {
                 this.notificationService.setFilter(NotificationsFilter.ERROR);
@@ -954,36 +1116,51 @@ class Layout extends Disposable {
             if (config.centerLayout) {
                 this.centerMainEditorLayout(true, true);
             }
-            this.state.runtime.zenMode.transitionDisposables.set('configurationChange', this.configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration(ZenModeSettings.HIDE_ACTIVITYBAR) || e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
-                    const zenModeHideActivityBar = this.configurationService.getValue(ZenModeSettings.HIDE_ACTIVITYBAR);
-                    const activityBarLocation = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
-                    this.setActivityBarHidden(zenModeHideActivityBar ? true : (activityBarLocation === ActivityBarPosition.TOP || activityBarLocation === ActivityBarPosition.BOTTOM));
-                }
-                if (e.affectsConfiguration(ZenModeSettings.HIDE_STATUSBAR)) {
-                    const zenModeHideStatusBar = this.configurationService.getValue(ZenModeSettings.HIDE_STATUSBAR);
-                    this.setStatusBarHidden(zenModeHideStatusBar);
-                }
-                if (e.affectsConfiguration(ZenModeSettings.CENTER_LAYOUT)) {
-                    const zenModeCenterLayout = this.configurationService.getValue(ZenModeSettings.CENTER_LAYOUT);
-                    this.centerMainEditorLayout(zenModeCenterLayout, true);
-                }
-                if (e.affectsConfiguration(ZenModeSettings.SHOW_TABS)) {
-                    const zenModeShowTabs = this.configurationService.getValue(ZenModeSettings.SHOW_TABS) ?? 'multiple';
-                    this.state.runtime.zenMode.transitionDisposables.set(ZenModeSettings.SHOW_TABS, this.editorGroupService.mainPart.enforcePartOptions({ showTabs: zenModeShowTabs }));
-                }
-                if (e.affectsConfiguration(ZenModeSettings.SILENT_NOTIFICATIONS)) {
-                    const zenModeSilentNotifications = !!this.configurationService.getValue(ZenModeSettings.SILENT_NOTIFICATIONS);
-                    if (zenModeExitInfo.handleNotificationsDoNotDisturbMode) {
-                        this.notificationService.setFilter(zenModeSilentNotifications ? NotificationsFilter.ERROR : NotificationsFilter.OFF);
+            this.state.runtime.zenMode.transitionDisposables.set(
+                "configurationChange",
+                this.configurationService.onDidChangeConfiguration(e => {
+                    if (e.affectsConfiguration(ZenModeSettings.HIDE_ACTIVITYBAR) || e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
+                        const zenModeHideActivityBar = this.configurationService.getValue(ZenModeSettings.HIDE_ACTIVITYBAR);
+                        const activityBarLocation = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+                        this.setActivityBarHidden(
+                            zenModeHideActivityBar ? true : (activityBarLocation === ActivityBarPosition.TOP || activityBarLocation === ActivityBarPosition.BOTTOM)
+                        );
                     }
-                }
-                if (e.affectsConfiguration(ZenModeSettings.HIDE_LINENUMBERS)) {
-                    const lineNumbersType = this.configurationService.getValue(ZenModeSettings.HIDE_LINENUMBERS) ? 'off' : undefined;
-                    setLineNumbers(lineNumbersType);
-                    this.state.runtime.zenMode.transitionDisposables.set(ZenModeSettings.HIDE_LINENUMBERS, this.mainPartEditorService.onDidVisibleEditorsChange(() => setLineNumbers(lineNumbersType)));
-                }
-            }));
+                    if (e.affectsConfiguration(ZenModeSettings.HIDE_STATUSBAR)) {
+                        const zenModeHideStatusBar = this.configurationService.getValue(ZenModeSettings.HIDE_STATUSBAR);
+                        this.setStatusBarHidden(zenModeHideStatusBar);
+                    }
+                    if (e.affectsConfiguration(ZenModeSettings.CENTER_LAYOUT)) {
+                        const zenModeCenterLayout = this.configurationService.getValue(ZenModeSettings.CENTER_LAYOUT);
+                        this.centerMainEditorLayout(zenModeCenterLayout, true);
+                    }
+                    if (e.affectsConfiguration(ZenModeSettings.SHOW_TABS)) {
+                        const zenModeShowTabs = this.configurationService.getValue(ZenModeSettings.SHOW_TABS) ?? "multiple";
+                        this.state.runtime.zenMode.transitionDisposables.set(
+                            ZenModeSettings.SHOW_TABS,
+                            this.editorGroupService.mainPart.enforcePartOptions({
+                                showTabs: zenModeShowTabs
+                            })
+                        );
+                    }
+                    if (e.affectsConfiguration(ZenModeSettings.SILENT_NOTIFICATIONS)) {
+                        const zenModeSilentNotifications = !!this.configurationService.getValue(ZenModeSettings.SILENT_NOTIFICATIONS);
+                        if (zenModeExitInfo.handleNotificationsDoNotDisturbMode) {
+                            this.notificationService.setFilter(
+                                zenModeSilentNotifications ? NotificationsFilter.ERROR : NotificationsFilter.OFF
+                            );
+                        }
+                    }
+                    if (e.affectsConfiguration(ZenModeSettings.HIDE_LINENUMBERS)) {
+                        const lineNumbersType = this.configurationService.getValue(ZenModeSettings.HIDE_LINENUMBERS) ? "off" : undefined;
+                        setLineNumbers(lineNumbersType);
+                        this.state.runtime.zenMode.transitionDisposables.set(
+                            ZenModeSettings.HIDE_LINENUMBERS,
+                            this.mainPartEditorService.onDidVisibleEditorsChange(() => setLineNumbers(lineNumbersType))
+                        );
+                    }
+                })
+            );
         }
         else {
             if (zenModeExitInfo.wasVisible.panel) {
@@ -1019,12 +1196,10 @@ class Layout extends Disposable {
         if (focusedPartPreTransition && this.isVisible(focusedPartPreTransition, getWindow(this.activeContainer))) {
             if (isMultiWindowPart(focusedPartPreTransition)) {
                 this.focusPart(focusedPartPreTransition, getWindow(this.activeContainer));
-            }
-            else {
+            } else {
                 this.focusPart(focusedPartPreTransition);
             }
-        }
-        else {
+        } else {
             this.focus();
         }
         this._onDidChangeZenMode.fire(this.isZenModeActive());
@@ -1033,8 +1208,7 @@ class Layout extends Disposable {
         this.stateModel.setRuntimeValue(LayoutStateKeys.STATUSBAR_HIDDEN, hidden);
         if (hidden) {
             this.mainContainer.classList.add(LayoutClasses.STATUSBAR_HIDDEN);
-        }
-        else {
+        } else {
             this.mainContainer.classList.remove(LayoutClasses.STATUSBAR_HIDDEN);
         }
         this.workbenchGrid.setViewVisible(this.statusBarPartView, !hidden);
@@ -1066,63 +1240,84 @@ class Layout extends Disposable {
             [Parts.STATUSBAR_PART]: this.statusBarPartView,
             [Parts.AUXILIARYBAR_PART]: this.auxiliaryBarPartView
         };
-        const fromJSON = ({ type }) => viewMap[type];
-        const workbenchGrid = SerializableGrid.deserialize(this.createGridDescriptor(), { fromJSON }, { proportionalLayout: false });
+        const fromJSON = (
+            {
+                type
+            }
+        ) => viewMap[type];
+        const workbenchGrid = SerializableGrid.deserialize(this.createGridDescriptor(), {
+            fromJSON
+        }, {
+            proportionalLayout: false
+        });
         this.mainContainer.prepend(workbenchGrid.element);
-        this.mainContainer.setAttribute('role', 'application');
+        this.mainContainer.setAttribute("role", "application");
         this.workbenchGrid = workbenchGrid;
         this.workbenchGrid.edgeSnapping = this.state.runtime.mainWindowFullscreen;
-        for (const part of [titleBar, editorPart, activityBar, panelPart, sideBar, statusBar, auxiliaryBarPart, bannerPart]) {
+        for (const part of [
+            titleBar,
+            editorPart,
+            activityBar,
+            panelPart,
+            sideBar,
+            statusBar,
+            auxiliaryBarPart,
+            bannerPart
+        ]) {
             this._register(part.onDidVisibilityChange(visible => {
                 if (!this.inMaximizedAuxiliaryBarTransition) {
                     if (part === sideBar) {
                         this.setSideBarHidden(!visible);
-                    }
-                    else if (part === panelPart && this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) === visible) {
+                    } else if (part === panelPart && this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) === visible) {
                         this.setPanelHidden(!visible, true);
-                    }
-                    else if (part === auxiliaryBarPart) {
+                    } else if (part === auxiliaryBarPart) {
                         this.setAuxiliaryBarHidden(!visible, true);
-                    }
-                    else if (part === editorPart) {
+                    } else if (part === editorPart) {
                         this.setEditorHidden(!visible);
                     }
                 }
-                this._onDidChangePartVisibility.fire();
+                this._onDidChangePartVisibility.fire({
+                    partId: part.getId(),
+                    visible
+                });
                 this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
             }));
         }
         this._register(this.storageService.onWillSaveState(() => {
-            const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
-                ? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView)
-                : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
+            const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN) ? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView) : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
             this.stateModel.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, sideBarSize);
-            const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
-                ? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
-                : isHorizontal(this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION))
-                    ? this.workbenchGrid.getViewSize(this.panelPartView).height
-                    : this.workbenchGrid.getViewSize(this.panelPartView).width;
+            const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) ? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView) : 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)
-                : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
+            const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN) ? this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView) : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
             this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, auxiliaryBarSize);
             this.stateModel.save(true, true);
         }));
-        this._register(Event.any(this.paneCompositeService.onDidPaneCompositeOpen, this.paneCompositeService.onDidPaneCompositeClose)(() => {
-            this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_EMPTY, this.paneCompositeService.getPaneCompositeIds(ViewContainerLocation.AuxiliaryBar).length === 0);
+        this._register(Event.any(
+            this.paneCompositeService.onDidPaneCompositeOpen,
+            this.paneCompositeService.onDidPaneCompositeClose
+        )(() => {
+            this.stateModel.setInitializationValue(
+                LayoutStateKeys.AUXILIARYBAR_EMPTY,
+                this.paneCompositeService.getPaneCompositeIds(ViewContainerLocation.AuxiliaryBar).length === 0
+            );
         }));
     }
     layout() {
         if (!this.disposed) {
             const fullscreenElement = getFullscreenElement(mainWindow.document);
-            this._mainContainerDimension = getClientArea(this.state.runtime.mainWindowFullscreen && this.mainContainer === fullscreenElement ?
-                mainWindow.document.body :
-                this.parent,
-            this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS
+            this._mainContainerDimension = getClientArea(
+                this.state.runtime.mainWindowFullscreen && this.mainContainer === fullscreenElement ?
+                mainWindow.document.body : this.parent,
+                this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS
+            );
+            this.logService.trace(
+                `Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`
+            );
+            size(
+                this.mainContainer,
+                this._mainContainerDimension.width,
+                this._mainContainerDimension.height
             );
-            this.logService.trace(`Layout#layout, height: ${this._mainContainerDimension.height}, width: ${this._mainContainerDimension.width}`);
-            size(this.mainContainer, this._mainContainerDimension.width, this._mainContainerDimension.height);
             this.workbenchGrid.layout(this._mainContainerDimension.width, this._mainContainerDimension.height);
             this.initialized = true;
             this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
@@ -1136,7 +1331,7 @@ class Layout extends Disposable {
         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');
+                return this.configurationService.getValue("diffEditor.renderSideBySide");
             }
             if (editor?.hasCapability(EditorInputCapabilities.MultipleEditors)) {
                 return true;
@@ -1147,13 +1342,11 @@ class Layout extends Disposable {
         let hasMoreThanOneColumn = false;
         if (layout.orientation === GroupOrientation.HORIZONTAL) {
             hasMoreThanOneColumn = layout.groups.length > 1;
-        }
-        else {
+        } else {
             hasMoreThanOneColumn = ( layout.groups.some(group => group.groups && group.groups.length > 1));
         }
-        const isCenteredLayoutAutoResizing = this.configurationService.getValue('workbench.editor.centeredLayoutAutoResize');
-        if (isCenteredLayoutAutoResizing &&
-            ((hasMoreThanOneColumn && !this.editorGroupService.mainPart.hasMaximizedGroup()) || isEditorComplex)) {
+        const isCenteredLayoutAutoResizing = this.configurationService.getValue("workbench.editor.centeredLayoutAutoResize");
+        if (isCenteredLayoutAutoResizing && ((hasMoreThanOneColumn && !this.editorGroupService.mainPart.hasMaximizedGroup()) || isEditorComplex)) {
             active = false;
         }
         if (this.editorGroupService.mainPart.isLayoutCentered() !== active) {
@@ -1175,50 +1368,58 @@ class Layout extends Disposable {
         const sizeChangePxHeight = Math.sign(sizeChangeHeight) * computeScreenAwareSize(getActiveWindow(), Math.abs(sizeChangeHeight));
         let viewSize;
         switch (part) {
-            case Parts.SIDEBAR_PART:
-                viewSize = this.workbenchGrid.getViewSize(this.sideBarPartView);
-                this.workbenchGrid.resizeView(this.sideBarPartView, {
+        case Parts.SIDEBAR_PART:
+            viewSize = this.workbenchGrid.getViewSize(this.sideBarPartView);
+            this.workbenchGrid.resizeView(this.sideBarPartView, {
+                width: viewSize.width + sizeChangePxWidth,
+                height: viewSize.height
+            });
+            break;
+        case Parts.PANEL_PART:
+            viewSize = this.workbenchGrid.getViewSize(this.panelPartView);
+            this.workbenchGrid.resizeView(this.panelPartView, {
+                width: viewSize.width + (isHorizontal(this.getPanelPosition()) ? 0 : sizeChangePxWidth),
+                height: viewSize.height + (isHorizontal(this.getPanelPosition()) ? sizeChangePxHeight : 0)
+            });
+            break;
+        case Parts.AUXILIARYBAR_PART:
+            viewSize = this.workbenchGrid.getViewSize(this.auxiliaryBarPartView);
+            this.workbenchGrid.resizeView(this.auxiliaryBarPartView, {
+                width: viewSize.width + sizeChangePxWidth,
+                height: viewSize.height
+            });
+            break;
+        case Parts.EDITOR_PART:
+            viewSize = this.workbenchGrid.getViewSize(this.editorPartView);
+            if (this.editorGroupService.mainPart.count === 1) {
+                this.workbenchGrid.resizeView(this.editorPartView, {
                     width: viewSize.width + sizeChangePxWidth,
-                    height: viewSize.height
+                    height: viewSize.height + sizeChangePxHeight
                 });
-                break;
-            case Parts.PANEL_PART:
-                viewSize = this.workbenchGrid.getViewSize(this.panelPartView);
-                this.workbenchGrid.resizeView(this.panelPartView, {
-                    width: viewSize.width + (isHorizontal(this.getPanelPosition()) ? 0 : sizeChangePxWidth),
-                    height: viewSize.height + (isHorizontal(this.getPanelPosition()) ? sizeChangePxHeight : 0)
-                });
-                break;
-            case Parts.AUXILIARYBAR_PART:
-                viewSize = this.workbenchGrid.getViewSize(this.auxiliaryBarPartView);
-                this.workbenchGrid.resizeView(this.auxiliaryBarPartView, {
-                    width: viewSize.width + sizeChangePxWidth,
-                    height: viewSize.height
+            } else {
+                const activeGroup = this.editorGroupService.mainPart.activeGroup;
+                const {
+                    width,
+                    height
+                } = this.editorGroupService.mainPart.getSize(activeGroup);
+                this.editorGroupService.mainPart.setSize(activeGroup, {
+                    width: width + sizeChangePxWidth,
+                    height: height + sizeChangePxHeight
                 });
-                break;
-            case Parts.EDITOR_PART:
-                viewSize = this.workbenchGrid.getViewSize(this.editorPartView);
-                if (this.editorGroupService.mainPart.count === 1) {
+                const {
+                    width: newWidth,
+                    height: newHeight
+                } = this.editorGroupService.mainPart.getSize(activeGroup);
+                if ((sizeChangePxHeight && height === newHeight) || (sizeChangePxWidth && width === newWidth)) {
                     this.workbenchGrid.resizeView(this.editorPartView, {
-                        width: viewSize.width + sizeChangePxWidth,
-                        height: viewSize.height + sizeChangePxHeight
+                        width: viewSize.width + (sizeChangePxWidth && width === newWidth ? sizeChangePxWidth : 0),
+                        height: viewSize.height + (sizeChangePxHeight && height === newHeight ? sizeChangePxHeight : 0)
                     });
                 }
-                else {
-                    const activeGroup = this.editorGroupService.mainPart.activeGroup;
-                    const { width, height } = this.editorGroupService.mainPart.getSize(activeGroup);
-                    this.editorGroupService.mainPart.setSize(activeGroup, { width: width + sizeChangePxWidth, height: height + sizeChangePxHeight });
-                    const { width: newWidth, height: newHeight } = this.editorGroupService.mainPart.getSize(activeGroup);
-                    if ((sizeChangePxHeight && height === newHeight) || (sizeChangePxWidth && width === newWidth)) {
-                        this.workbenchGrid.resizeView(this.editorPartView, {
-                            width: viewSize.width + (sizeChangePxWidth && width === newWidth ? sizeChangePxWidth : 0),
-                            height: viewSize.height + (sizeChangePxHeight && height === newHeight ? sizeChangePxHeight : 0)
-                        });
-                    }
-                }
-                break;
-            default:
-                return;
+            }
+            break;
+        default:
+            return;
         }
     }
     setActivityBarHidden(hidden) {
@@ -1235,8 +1436,7 @@ class Layout extends Disposable {
         this.stateModel.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, hidden);
         if (hidden) {
             this.mainContainer.classList.add(LayoutClasses.MAIN_EDITOR_AREA_HIDDEN);
-        }
-        else {
+        } else {
             this.mainContainer.classList.remove(LayoutClasses.MAIN_EDITOR_AREA_HIDDEN);
         }
         this.workbenchGrid.setViewVisible(this.editorPartView, !hidden);
@@ -1261,8 +1461,7 @@ class Layout extends Disposable {
         this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, hidden);
         if (hidden) {
             this.mainContainer.classList.add(LayoutClasses.SIDEBAR_HIDDEN);
-        }
-        else {
+        } else {
             this.mainContainer.classList.remove(LayoutClasses.SIDEBAR_HIDDEN);
         }
         this.workbenchGrid.setViewVisible(this.sideBarPartView, !hidden);
@@ -1292,30 +1491,55 @@ class Layout extends Disposable {
     }
     adjustPartPositions(sideBarPosition, panelAlignment, panelPosition) {
         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;
-        const preMoveAuxiliaryBarSize = !this.isVisible(Parts.AUXILIARYBAR_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView) ?? this.auxiliaryBarPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
+        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;
+        const preMoveAuxiliaryBarSize = !this.isVisible(Parts.AUXILIARYBAR_PART) ? Sizing.Invisible(
+            this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView) ?? this.auxiliaryBarPartView.minimumWidth
+        ) : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
         const focusedPart = [Parts.PANEL_PART, Parts.SIDEBAR_PART, Parts.AUXILIARYBAR_PART].find(part => this.hasFocus(part));
         if (sideBarPosition === Position.LEFT) {
             this.workbenchGrid.moveViewTo(this.activityBarPartView, [2, 0]);
-            this.workbenchGrid.moveView(this.sideBarPartView, preMoveSideBarSize, sideBarSiblingToEditor ? this.editorPartView : this.activityBarPartView, sideBarSiblingToEditor ? Direction.Left : Direction.Right);
+            this.workbenchGrid.moveView(
+                this.sideBarPartView,
+                preMoveSideBarSize,
+                sideBarSiblingToEditor ? this.editorPartView : this.activityBarPartView,
+                sideBarSiblingToEditor ? Direction.Left : Direction.Right
+            );
             if (auxiliaryBarSiblingToEditor) {
-                this.workbenchGrid.moveView(this.auxiliaryBarPartView, preMoveAuxiliaryBarSize, this.editorPartView, Direction.Right);
-            }
-            else {
+                this.workbenchGrid.moveView(
+                    this.auxiliaryBarPartView,
+                    preMoveAuxiliaryBarSize,
+                    this.editorPartView,
+                    Direction.Right
+                );
+            } else {
                 this.workbenchGrid.moveViewTo(this.auxiliaryBarPartView, [2, -1]);
             }
-        }
-        else {
+        } else {
             this.workbenchGrid.moveViewTo(this.activityBarPartView, [2, -1]);
-            this.workbenchGrid.moveView(this.sideBarPartView, preMoveSideBarSize, sideBarSiblingToEditor ? this.editorPartView : this.activityBarPartView, sideBarSiblingToEditor ? Direction.Right : Direction.Left);
+            this.workbenchGrid.moveView(
+                this.sideBarPartView,
+                preMoveSideBarSize,
+                sideBarSiblingToEditor ? this.editorPartView : this.activityBarPartView,
+                sideBarSiblingToEditor ? Direction.Right : Direction.Left
+            );
             if (auxiliaryBarSiblingToEditor) {
-                this.workbenchGrid.moveView(this.auxiliaryBarPartView, preMoveAuxiliaryBarSize, this.editorPartView, Direction.Left);
-            }
-            else {
+                this.workbenchGrid.moveView(
+                    this.auxiliaryBarPartView,
+                    preMoveAuxiliaryBarSize,
+                    this.editorPartView,
+                    Direction.Left
+                );
+            } else {
                 this.workbenchGrid.moveViewTo(this.auxiliaryBarPartView, [2, 0]);
             }
         }
@@ -1323,7 +1547,12 @@ class Layout extends Disposable {
             this.focusPart(focusedPart);
         }
         if (isPanelVertical) {
-            this.workbenchGrid.moveView(this.panelPartView, preMovePanelWidth, this.editorPartView, panelPosition === Position.LEFT ? Direction.Left : Direction.Right);
+            this.workbenchGrid.moveView(
+                this.panelPartView,
+                preMovePanelWidth,
+                this.editorPartView,
+                panelPosition === Position.LEFT ? Direction.Left : Direction.Right
+            );
             this.workbenchGrid.resizeView(this.panelPartView, {
                 height: preMovePanelHeight,
                 width: preMovePanelWidth
@@ -1346,7 +1575,7 @@ class Layout extends Disposable {
         if (!isHorizontal(this.getPanelPosition())) {
             this.setPanelPosition(Position.BOTTOM);
         }
-        if (alignment !== 'center' && this.isPanelMaximized()) {
+        if (alignment !== "center" && this.isPanelMaximized()) {
             this.toggleMaximizedPanel();
         }
         this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT, alignment);
@@ -1366,8 +1595,7 @@ class Layout extends Disposable {
         const panelOpensMaximized = this.panelOpensMaximized();
         if (hidden) {
             this.mainContainer.classList.add(LayoutClasses.PANEL_HIDDEN);
-        }
-        else {
+        } else {
             this.mainContainer.classList.remove(LayoutClasses.PANEL_HIDDEN);
         }
         if (hidden && isPanelMaximized) {
@@ -1377,18 +1605,15 @@ class Layout extends Disposable {
         let focusEditor = false;
         if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
             this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Panel);
-            if (!isIOS &&
-                !this.isAuxiliaryBarMaximized()
-            ) {
+            if (
+            !isIOS && !this.isAuxiliaryBarMaximized()) {
                 focusEditor = true;
             }
         }
         else if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
             let panelToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Panel);
             if (!panelToOpen || !this.hasViews(panelToOpen)) {
-                panelToOpen = this.viewDescriptorService
-                    .getViewContainersByLocation(ViewContainerLocation.Panel)
-                    .find(viewContainer => this.hasViews(viewContainer.id))?.id;
+                panelToOpen = this.viewDescriptorService.getViewContainersByLocation(ViewContainerLocation.Panel).find(viewContainer => this.hasViews(viewContainer.id))?.id;
             }
             if (panelToOpen) {
                 this.openViewContainer(ViewContainerLocation.Panel, panelToOpen, !skipLayout);
@@ -1401,8 +1626,7 @@ class Layout extends Disposable {
             if (!skipLayout && isPanelMaximized !== panelOpensMaximized) {
                 this.toggleMaximizedPanel();
             }
-        }
-        else {
+        } else {
             this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_WAS_LAST_MAXIMIZED, isPanelMaximized);
         }
         if (focusEditor) {
@@ -1416,9 +1640,8 @@ class Layout extends Disposable {
         this.setAuxiliaryBarMaximized(!this.isAuxiliaryBarMaximized());
     }
     setAuxiliaryBarMaximized(maximized) {
-        if (this.inMaximizedAuxiliaryBarTransition ||
-            (maximized === this.isAuxiliaryBarMaximized())
-        ) {
+        if (
+        this.inMaximizedAuxiliaryBarTransition || (maximized === this.isAuxiliaryBarMaximized())) {
             return false;
         }
         if (maximized) {
@@ -1446,13 +1669,13 @@ class Layout extends Disposable {
                     this.setEditorHidden(true);
                 }
                 this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, state);
-            }
-            finally {
+            } finally {
                 this.inMaximizedAuxiliaryBarTransition = false;
             }
-        }
-        else {
-            const state = assertReturnsDefined(this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY));
+        } else {
+            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 {
@@ -1464,8 +1687,7 @@ class Layout extends Disposable {
                     width: this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE),
                     height: size.height
                 });
-            }
-            finally {
+            } finally {
                 this.inMaximizedAuxiliaryBarTransition = false;
             }
         }
@@ -1474,9 +1696,10 @@ class Layout extends Disposable {
         return true;
     }
     isPanelMaximized() {
-        return ((
-        this.getPanelAlignment() === 'center' || !isHorizontal(this.getPanelPosition()))
-        ) && !this.isVisible(Parts.EDITOR_PART, mainWindow) && !this.isAuxiliaryBarMaximized();
+        return (
+            (
+            this.getPanelAlignment() === "center" || !isHorizontal(this.getPanelPosition())) && !this.isVisible(Parts.EDITOR_PART, mainWindow) && !this.isAuxiliaryBarMaximized()
+        );
     }
     toggleMaximizedPanel() {
         const size = this.workbenchGrid.getViewSize(this.panelPartView);
@@ -1486,14 +1709,12 @@ class Layout extends Disposable {
             if (this.isVisible(Parts.PANEL_PART)) {
                 if (isHorizontal(panelPosition)) {
                     this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT, size.height);
-                }
-                else {
+                } else {
                     this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH, size.width);
                 }
             }
             this.setEditorHidden(true);
-        }
-        else {
+        } else {
             this.setEditorHidden(false);
             this.workbenchGrid.resizeView(this.panelPartView, {
                 width: isHorizontal(panelPosition) ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH),
@@ -1503,10 +1724,12 @@ class Layout extends Disposable {
         this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_WAS_LAST_MAXIMIZED, maximize);
     }
     panelOpensMaximized() {
-        if (this.getPanelAlignment() !== 'center' && isHorizontal(this.getPanelPosition())) {
+        if (this.getPanelAlignment() !== "center" && isHorizontal(this.getPanelPosition())) {
             return false;
         }
-        const panelOpensMaximized = partOpensMaximizedFromString(this.configurationService.getValue(WorkbenchLayoutSettings.PANEL_OPENS_MAXIMIZED));
+        const panelOpensMaximized = partOpensMaximizedFromString(
+            this.configurationService.getValue(WorkbenchLayoutSettings.PANEL_OPENS_MAXIMIZED)
+        );
         const panelLastIsMaximized = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_WAS_LAST_MAXIMIZED);
         return panelOpensMaximized === PartOpensMaximizedOptions.ALWAYS || (panelOpensMaximized === PartOpensMaximizedOptions.REMEMBER_LAST && panelLastIsMaximized);
     }
@@ -1517,8 +1740,7 @@ class Layout extends Disposable {
         this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, hidden);
         if (hidden) {
             this.mainContainer.classList.add(LayoutClasses.AUXILIARYBAR_HIDDEN);
-        }
-        else {
+        } else {
             this.mainContainer.classList.remove(LayoutClasses.AUXILIARYBAR_HIDDEN);
         }
         this.workbenchGrid.setViewVisible(this.auxiliaryBarPartView, !hidden);
@@ -1529,9 +1751,7 @@ class Layout extends Disposable {
         else if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.AuxiliaryBar)) {
             let viewletToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.AuxiliaryBar);
             if (!viewletToOpen || !this.hasViews(viewletToOpen)) {
-                viewletToOpen = this.viewDescriptorService
-                    .getViewContainersByLocation(ViewContainerLocation.AuxiliaryBar)
-                    .find(viewContainer => this.hasViews(viewContainer.id))?.id;
+                viewletToOpen = this.viewDescriptorService.getViewContainersByLocation(ViewContainerLocation.AuxiliaryBar).find(viewContainer => this.hasViews(viewContainer.id))?.id;
             }
             if (viewletToOpen) {
                 this.openViewContainer(ViewContainerLocation.AuxiliaryBar, viewletToOpen, !skipLayout);
@@ -1540,25 +1760,25 @@ class Layout extends Disposable {
     }
     setPartHidden(hidden, part) {
         switch (part) {
-            case Parts.ACTIVITYBAR_PART:
-                return this.setActivityBarHidden(hidden);
-            case Parts.SIDEBAR_PART:
-                return this.setSideBarHidden(hidden);
-            case Parts.EDITOR_PART:
-                return this.setEditorHidden(hidden);
-            case Parts.BANNER_PART:
-                return this.setBannerHidden(hidden);
-            case Parts.AUXILIARYBAR_PART:
-                return this.setAuxiliaryBarHidden(hidden);
-            case Parts.PANEL_PART:
-                return this.setPanelHidden(hidden);
+        case Parts.ACTIVITYBAR_PART:
+            return this.setActivityBarHidden(hidden);
+        case Parts.SIDEBAR_PART:
+            return this.setSideBarHidden(hidden);
+        case Parts.EDITOR_PART:
+            return this.setEditorHidden(hidden);
+        case Parts.BANNER_PART:
+            return this.setBannerHidden(hidden);
+        case Parts.AUXILIARYBAR_PART:
+            return this.setAuxiliaryBarHidden(hidden);
+        case Parts.PANEL_PART:
+            return this.setPanelHidden(hidden);
         }
     }
     hasMainWindowBorder() {
         return this.state.runtime.mainWindowBorder;
     }
     getMainWindowBorderRadius() {
-        return this.state.runtime.mainWindowBorder && isMacintosh ? '10px' : undefined;
+        return this.state.runtime.mainWindowBorder && isMacintosh ? "10px" : undefined;
     }
     getSideBarPosition() {
         return this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON);
@@ -1581,15 +1801,14 @@ class Layout extends Disposable {
     }
     toggleMenuBar() {
         let currentVisibilityValue = getMenuBarVisibility(this.configurationService);
-        if (typeof currentVisibilityValue !== 'string') {
-            currentVisibilityValue = 'classic';
+        if (typeof currentVisibilityValue !== "string") {
+            currentVisibilityValue = "classic";
         }
         let newVisibilityValue;
-        if (currentVisibilityValue === 'visible' || currentVisibilityValue === 'classic') {
-            newVisibilityValue = hasNativeMenu(this.configurationService) ? 'toggle' : 'compact';
-        }
-        else {
-            newVisibilityValue = 'classic';
+        if (currentVisibilityValue === "visible" || currentVisibilityValue === "classic") {
+            newVisibilityValue = hasNativeMenu(this.configurationService) ? "toggle" : "compact";
+        } else {
+            newVisibilityValue = "classic";
         }
         this.configurationService.updateValue(MenuSettings.MenuBarVisibility, newVisibilityValue);
     }
@@ -1614,12 +1833,11 @@ class Layout extends Disposable {
         if (newPositionValue !== oldPositionValue && !editorHidden) {
             if (isHorizontal(position)) {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH, size.width);
-            }
-            else if (isHorizontal(positionFromString(oldPositionValue))) {
+            } else if (isHorizontal(positionFromString(oldPositionValue))) {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT, size.height);
             }
         }
-        if (isHorizontal(position) && this.getPanelAlignment() !== 'center' && editorHidden) {
+        if (isHorizontal(position) && this.getPanelAlignment() !== "center" && editorHidden) {
             this.toggleMaximizedPanel();
             editorHidden = false;
         }
@@ -1628,16 +1846,33 @@ class Layout extends Disposable {
         const auxiliaryBarVisible = this.isVisible(Parts.AUXILIARYBAR_PART);
         const hadFocus = this.hasFocus(Parts.PANEL_PART);
         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);
-        }
-        else {
-            this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH), this.editorPartView, Direction.Left);
+            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
+            );
+        } else {
+            this.workbenchGrid.moveView(
+                this.panelPartView,
+                editorHidden ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH),
+                this.editorPartView,
+                Direction.Left
+            );
         }
         if (hadFocus) {
             this.focusPart(Parts.PANEL_PART);
@@ -1666,12 +1901,14 @@ class Layout extends Disposable {
         }
         if (maximized) {
             this.state.runtime.maximized.add(targetWindowId);
-        }
-        else {
+        } else {
             this.state.runtime.maximized.delete(targetWindowId);
         }
         this.updateWindowBorder();
-        this._onDidChangeWindowMaximized.fire({ windowId: targetWindowId, maximized });
+        this._onDidChangeWindowMaximized.fire({
+            windowId: targetWindowId,
+            maximized
+        });
     }
     getVisibleNeighborPart(part, direction) {
         if (!this.workbenchGrid) {
@@ -1685,8 +1922,17 @@ class Layout extends Disposable {
             return undefined;
         }
         for (const neighborView of neighborViews) {
-            const neighborPart = [Parts.ACTIVITYBAR_PART, Parts.EDITOR_PART, Parts.PANEL_PART, Parts.AUXILIARYBAR_PART, Parts.SIDEBAR_PART, Parts.STATUSBAR_PART, Parts.TITLEBAR_PART]
-                .find(partId => this.getPart(partId) === neighborView && this.isVisible(partId, mainWindow));
+            const neighborPart = [
+                Parts.ACTIVITYBAR_PART,
+                Parts.EDITOR_PART,
+                Parts.PANEL_PART,
+                Parts.AUXILIARYBAR_PART,
+                Parts.SIDEBAR_PART,
+                Parts.STATUSBAR_PART,
+                Parts.TITLEBAR_PART
+            ].find(
+                partId => this.getPart(partId) === neighborView && this.isVisible(partId, mainWindow)
+            );
             if (neighborPart !== undefined) {
                 return neighborPart;
             }
@@ -1697,9 +1943,17 @@ class Layout extends Disposable {
         const bannerFirst = this.workbenchGrid.getNeighborViews(this.titleBarPartView, Direction.Up, false).length > 0;
         const shouldBannerBeFirst = this.shouldShowBannerFirst();
         if (bannerFirst !== shouldBannerBeFirst) {
-            this.workbenchGrid.moveView(this.bannerPartView, Sizing.Distribute, this.titleBarPartView, shouldBannerBeFirst ? Direction.Up : Direction.Down);
+            this.workbenchGrid.moveView(
+                this.bannerPartView,
+                Sizing.Distribute,
+                this.titleBarPartView,
+                shouldBannerBeFirst ? Direction.Up : Direction.Down
+            );
         }
-        this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
+        this.workbenchGrid.setViewVisible(
+            this.titleBarPartView,
+            shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled)
+        );
     }
     arrangeEditorNodes(nodes, availableHeight, availableWidth) {
         if (!nodes.sideBar && !nodes.auxiliaryBar) {
@@ -1711,8 +1965,7 @@ class Layout extends Disposable {
         if (nodes.sideBar) {
             if (this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON) === Position.LEFT) {
                 result.splice(0, 0, nodes.sideBar);
-            }
-            else {
+            } else {
                 result.push(nodes.sideBar);
             }
             nodes.editor.size -= this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN) ? 0 : nodes.sideBar.size;
@@ -1720,14 +1973,13 @@ class Layout extends Disposable {
         if (nodes.auxiliaryBar) {
             if (this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON) === Position.RIGHT) {
                 result.splice(0, 0, nodes.auxiliaryBar);
-            }
-            else {
+            } else {
                 result.push(nodes.auxiliaryBar);
             }
             nodes.editor.size -= this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN) ? 0 : nodes.auxiliaryBar.size;
         }
         return {
-            type: 'branch',
+            type: "branch",
             data: result,
             size: availableHeight,
             visible: ( result.some(node => node.visible))
@@ -1746,25 +1998,22 @@ class Layout extends Disposable {
             nodes.editor.size = availableWidth - activityBarSize - sideBarSize - panelSize - auxiliaryBarSize;
             if (panelPostion === Position.RIGHT) {
                 result.push(nodes.panel);
-            }
-            else {
+            } else {
                 result.splice(0, 0, nodes.panel);
             }
             if (sideBarPosition === Position.LEFT) {
                 result.push(nodes.auxiliaryBar);
                 result.splice(0, 0, nodes.sideBar);
                 result.splice(0, 0, nodes.activityBar);
-            }
-            else {
+            } else {
                 result.splice(0, 0, nodes.auxiliaryBar);
                 result.push(nodes.sideBar);
                 result.push(nodes.activityBar);
             }
-        }
-        else {
+        } else {
             const panelAlignment = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT);
-            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 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,
@@ -1773,7 +2022,7 @@ class Layout extends Disposable {
             }, availableHeight - panelSize, editorSectionWidth);
             const data = panelPostion === Position.BOTTOM ? [editorNodes, nodes.panel] : [nodes.panel, editorNodes];
             result.push({
-                type: 'branch',
+                type: "branch",
                 data,
                 size: editorSectionWidth,
                 visible: ( data.some(node => node.visible))
@@ -1781,30 +2030,30 @@ class Layout extends Disposable {
             if (!sideBarNextToEditor) {
                 if (sideBarPosition === Position.LEFT) {
                     result.splice(0, 0, nodes.sideBar);
-                }
-                else {
+                } else {
                     result.push(nodes.sideBar);
                 }
             }
             if (!auxiliaryBarNextToEditor) {
                 if (sideBarPosition === Position.RIGHT) {
                     result.splice(0, 0, nodes.auxiliaryBar);
-                }
-                else {
+                } else {
                     result.push(nodes.auxiliaryBar);
                 }
             }
             if (sideBarPosition === Position.LEFT) {
                 result.splice(0, 0, nodes.activityBar);
-            }
-            else {
+            } else {
                 result.push(nodes.activityBar);
             }
         }
         return result;
     }
     createGridDescriptor() {
-        const { width, height } = this._mainContainerDimension;
+        const {
+            width,
+            height
+        } = this._mainContainerDimension;
         const sideBarSize = this.stateModel.getInitializationValue(LayoutStateKeys.SIDEBAR_SIZE);
         const auxiliaryBarSize = this.stateModel.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE);
         const panelSize = this.stateModel.getInitializationValue(LayoutStateKeys.PANEL_SIZE);
@@ -1813,47 +2062,58 @@ class Layout extends Disposable {
         const statusBarHeight = this.statusBarPartView.minimumHeight;
         const activityBarWidth = this.activityBarPartView.minimumWidth;
         const middleSectionHeight = height - titleBarHeight - statusBarHeight;
-        const titleAndBanner = [
-            {
-                type: 'leaf',
-                data: { type: Parts.TITLEBAR_PART },
-                size: titleBarHeight,
-                visible: this.isVisible(Parts.TITLEBAR_PART, mainWindow)
+        const titleAndBanner = [{
+            type: "leaf",
+            data: {
+                type: Parts.TITLEBAR_PART
             },
-            {
-                type: 'leaf',
-                data: { type: Parts.BANNER_PART },
-                size: bannerHeight,
-                visible: false
-            }
-        ];
+            size: titleBarHeight,
+            visible: this.isVisible(Parts.TITLEBAR_PART, mainWindow)
+        }, {
+            type: "leaf",
+            data: {
+                type: Parts.BANNER_PART
+            },
+            size: bannerHeight,
+            visible: false
+        }];
         const activityBarNode = {
-            type: 'leaf',
-            data: { type: Parts.ACTIVITYBAR_PART },
+            type: "leaf",
+            data: {
+                type: Parts.ACTIVITYBAR_PART
+            },
             size: activityBarWidth,
             visible: !this.stateModel.getRuntimeValue(LayoutStateKeys.ACTIVITYBAR_HIDDEN)
         };
         const sideBarNode = {
-            type: 'leaf',
-            data: { type: Parts.SIDEBAR_PART },
+            type: "leaf",
+            data: {
+                type: Parts.SIDEBAR_PART
+            },
             size: sideBarSize,
             visible: !this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
         };
         const auxiliaryBarNode = {
-            type: 'leaf',
-            data: { type: Parts.AUXILIARYBAR_PART },
+            type: "leaf",
+            data: {
+                type: Parts.AUXILIARYBAR_PART
+            },
             size: auxiliaryBarSize,
             visible: this.isVisible(Parts.AUXILIARYBAR_PART)
         };
         const editorNode = {
-            type: 'leaf',
-            data: { type: Parts.EDITOR_PART },
+            type: "leaf",
+            data: {
+                type: Parts.EDITOR_PART
+            },
             size: 0,
             visible: !this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN)
         };
         const panelNode = {
-            type: 'leaf',
-            data: { type: Parts.PANEL_PART },
+            type: "leaf",
+            data: {
+                type: Parts.PANEL_PART
+            },
             size: panelSize,
             visible: !this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
         };
@@ -1866,18 +2126,20 @@ class Layout extends Disposable {
         }, width, middleSectionHeight);
         const result = {
             root: {
-                type: 'branch',
+                type: "branch",
                 size: width,
                 data: [
                     ...(this.shouldShowBannerFirst() ? titleAndBanner.reverse() : titleAndBanner),
                     {
-                        type: 'branch',
+                        type: "branch",
                         data: middleSection,
                         size: middleSectionHeight
                     },
                     {
-                        type: 'leaf',
-                        data: { type: Parts.STATUSBAR_PART },
+                        type: "leaf",
+                        data: {
+                            type: Parts.STATUSBAR_PART
+                        },
                         size: statusBarHeight,
                         visible: !this.stateModel.getRuntimeValue(LayoutStateKeys.STATUSBAR_HIDDEN)
                     }
@@ -1894,9 +2156,9 @@ class Layout extends Disposable {
             panelVisible: !this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN),
             statusbarVisible: !this.stateModel.getRuntimeValue(LayoutStateKeys.STATUSBAR_HIDDEN),
             sideBarPosition: positionToString(this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_POSITON)),
-            panelPosition: positionToString(this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION)),
+            panelPosition: positionToString(this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION))
         };
-        this.telemetryService.publicLog2('startupLayout', layoutDescriptor);
+        this.telemetryService.publicLog2("startupLayout", layoutDescriptor);
         return result;
     }
     dispose() {
@@ -1929,53 +2191,53 @@ class InitializationStateKey extends WorkbenchLayoutStateKey {
     }
 }
 const LayoutStateKeys = {
-    MAIN_EDITOR_CENTERED: ( new RuntimeStateKey('editor.centered', StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
-    ZEN_MODE_ACTIVE: ( new RuntimeStateKey('zenMode.active', StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
-    ZEN_MODE_EXIT_INFO: ( new RuntimeStateKey('zenMode.exitInfo', StorageScope.WORKSPACE, StorageTarget.MACHINE, {
+    MAIN_EDITOR_CENTERED: ( new RuntimeStateKey("editor.centered", StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
+    ZEN_MODE_ACTIVE: ( new RuntimeStateKey("zenMode.active", StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
+    ZEN_MODE_EXIT_INFO: ( new RuntimeStateKey("zenMode.exitInfo", StorageScope.WORKSPACE, StorageTarget.MACHINE, {
         transitionedToCenteredEditorLayout: false,
         transitionedToFullScreen: false,
         handleNotificationsDoNotDisturbMode: false,
         wasVisible: {
             auxiliaryBar: false,
             panel: false,
-            sideBar: false,
-        },
+            sideBar: false
+        }
     })),
-    SIDEBAR_SIZE: ( new InitializationStateKey('sideBar.size', StorageScope.PROFILE, StorageTarget.MACHINE, 300)),
-    AUXILIARYBAR_SIZE: ( new InitializationStateKey('auxiliaryBar.size', StorageScope.PROFILE, StorageTarget.MACHINE, 300)),
-    PANEL_SIZE: ( new InitializationStateKey('panel.size', StorageScope.PROFILE, StorageTarget.MACHINE, 300)),
+    SIDEBAR_SIZE: ( new InitializationStateKey("sideBar.size", StorageScope.PROFILE, StorageTarget.MACHINE, 300)),
+    AUXILIARYBAR_SIZE: ( new InitializationStateKey("auxiliaryBar.size", StorageScope.PROFILE, StorageTarget.MACHINE, 300)),
+    PANEL_SIZE: ( new InitializationStateKey("panel.size", StorageScope.PROFILE, StorageTarget.MACHINE, 300)),
     PANEL_LAST_NON_MAXIMIZED_HEIGHT: ( new RuntimeStateKey(
-        'panel.lastNonMaximizedHeight',
+        "panel.lastNonMaximizedHeight",
         StorageScope.PROFILE,
         StorageTarget.MACHINE,
         300
     )),
     PANEL_LAST_NON_MAXIMIZED_WIDTH: ( new RuntimeStateKey(
-        'panel.lastNonMaximizedWidth',
+        "panel.lastNonMaximizedWidth",
         StorageScope.PROFILE,
         StorageTarget.MACHINE,
         300
     )),
     PANEL_WAS_LAST_MAXIMIZED: ( new RuntimeStateKey(
-        'panel.wasLastMaximized',
+        "panel.wasLastMaximized",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         false
     )),
     AUXILIARYBAR_WAS_LAST_MAXIMIZED: ( new RuntimeStateKey(
-        'auxiliaryBar.wasLastMaximized',
+        "auxiliaryBar.wasLastMaximized",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         false
     )),
     AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE: ( new RuntimeStateKey(
-        'auxiliaryBar.lastNonMaximizedSize',
+        "auxiliaryBar.lastNonMaximizedSize",
         StorageScope.PROFILE,
         StorageTarget.MACHINE,
         300
     )),
     AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY: ( new RuntimeStateKey(
-        'auxiliaryBar.lastNonMaximizedVisibility',
+        "auxiliaryBar.lastNonMaximizedVisibility",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         {
@@ -1985,33 +2247,33 @@ const LayoutStateKeys = {
             auxiliaryBarVisible: false
         }
     )),
-    AUXILIARYBAR_EMPTY: ( new InitializationStateKey('auxiliaryBar.empty', StorageScope.PROFILE, StorageTarget.MACHINE, false)),
+    AUXILIARYBAR_EMPTY: ( new InitializationStateKey("auxiliaryBar.empty", StorageScope.PROFILE, StorageTarget.MACHINE, false)),
     SIDEBAR_POSITON: ( new RuntimeStateKey(
-        'sideBar.position',
+        "sideBar.position",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         Position.LEFT
     )),
     PANEL_POSITION: ( new RuntimeStateKey(
-        'panel.position',
+        "panel.position",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         Position.BOTTOM
     )),
-    PANEL_ALIGNMENT: ( new RuntimeStateKey('panel.alignment', StorageScope.PROFILE, StorageTarget.USER, 'center')),
+    PANEL_ALIGNMENT: ( new RuntimeStateKey("panel.alignment", StorageScope.PROFILE, StorageTarget.USER, "center")),
     ACTIVITYBAR_HIDDEN: ( new RuntimeStateKey(
-        'activityBar.hidden',
+        "activityBar.hidden",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         false,
         true
     )),
-    SIDEBAR_HIDDEN: ( new RuntimeStateKey('sideBar.hidden', StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
-    EDITOR_HIDDEN: ( new RuntimeStateKey('editor.hidden', StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
-    PANEL_HIDDEN: ( new RuntimeStateKey('panel.hidden', StorageScope.WORKSPACE, StorageTarget.MACHINE, true)),
-    AUXILIARYBAR_HIDDEN: ( new RuntimeStateKey('auxiliaryBar.hidden', StorageScope.WORKSPACE, StorageTarget.MACHINE, true)),
+    SIDEBAR_HIDDEN: ( new RuntimeStateKey("sideBar.hidden", StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
+    EDITOR_HIDDEN: ( new RuntimeStateKey("editor.hidden", StorageScope.WORKSPACE, StorageTarget.MACHINE, false)),
+    PANEL_HIDDEN: ( new RuntimeStateKey("panel.hidden", StorageScope.WORKSPACE, StorageTarget.MACHINE, true)),
+    AUXILIARYBAR_HIDDEN: ( new RuntimeStateKey("auxiliaryBar.hidden", StorageScope.WORKSPACE, StorageTarget.MACHINE, true)),
     STATUSBAR_HIDDEN: ( new RuntimeStateKey(
-        'statusBar.hidden',
+        "statusBar.hidden",
         StorageScope.WORKSPACE,
         StorageTarget.MACHINE,
         false,
@@ -2019,21 +2281,25 @@ const LayoutStateKeys = {
     ))
 };
 var WorkbenchLayoutSettings;
-(function (WorkbenchLayoutSettings) {
+(function(WorkbenchLayoutSettings) {
     WorkbenchLayoutSettings["AUXILIARYBAR_DEFAULT_VISIBILITY"] = "workbench.secondarySideBar.defaultVisibility";
+    WorkbenchLayoutSettings["AUXILIARYBAR_FORCE_MAXIMIZED"] = "workbench.secondarySideBar.forceMaximized";
     WorkbenchLayoutSettings["ACTIVITY_BAR_VISIBLE"] = "workbench.activityBar.visible";
     WorkbenchLayoutSettings["PANEL_POSITION"] = "workbench.panel.defaultLocation";
     WorkbenchLayoutSettings["PANEL_OPENS_MAXIMIZED"] = "workbench.panel.opensMaximized";
     WorkbenchLayoutSettings["ZEN_MODE_CONFIG"] = "zenMode";
     WorkbenchLayoutSettings["EDITOR_CENTERED_LAYOUT_AUTO_RESIZE"] = "workbench.editor.centeredLayoutAutoResize";
+    WorkbenchLayoutSettings["EDITOR_RESTORE_EDITORS"] = "workbench.editor.restoreEditors";
 })(WorkbenchLayoutSettings || (WorkbenchLayoutSettings = {}));
 var LegacyWorkbenchLayoutSettings;
-(function (LegacyWorkbenchLayoutSettings) {
+(function(LegacyWorkbenchLayoutSettings) {
     LegacyWorkbenchLayoutSettings["STATUSBAR_VISIBLE"] = "workbench.statusBar.visible";
     LegacyWorkbenchLayoutSettings["SIDEBAR_POSITION"] = "workbench.sideBar.location";
 })(LegacyWorkbenchLayoutSettings || (LegacyWorkbenchLayoutSettings = {}));
 class LayoutStateModel extends Disposable {
-    static { this.STORAGE_PREFIX = 'workbench.'; }
+    static {
+        this.STORAGE_PREFIX = "workbench.";
+    }
     constructor(storageService, configurationService, contextService, environmentService) {
         super();
         this.storageService = storageService;
@@ -2048,17 +2314,24 @@ class LayoutStateModel extends Disposable {
             [StorageScope.PROFILE]: this.storageService.isNew(StorageScope.PROFILE),
             [StorageScope.APPLICATION]: this.storageService.isNew(StorageScope.APPLICATION)
         };
-        this._register(this.configurationService.onDidChangeConfiguration(configurationChange => this.updateStateFromLegacySettings(configurationChange)));
+        this._register(this.configurationService.onDidChangeConfiguration(
+            configurationChange => this.updateStateFromLegacySettings(configurationChange)
+        ));
     }
     updateStateFromLegacySettings(configurationChangeEvent) {
         if (configurationChangeEvent.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
             this.setRuntimeValueAndFire(LayoutStateKeys.ACTIVITYBAR_HIDDEN, this.isActivityBarHidden());
         }
         if (configurationChangeEvent.affectsConfiguration(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE)) {
-            this.setRuntimeValueAndFire(LayoutStateKeys.STATUSBAR_HIDDEN, !this.configurationService.getValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE));
+            this.setRuntimeValueAndFire(
+                LayoutStateKeys.STATUSBAR_HIDDEN,
+                !this.configurationService.getValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE)
+            );
         }
         if (configurationChangeEvent.affectsConfiguration(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION)) {
-            this.setRuntimeValueAndFire(LayoutStateKeys.SIDEBAR_POSITON, positionFromString(this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? 'left'));
+            this.setRuntimeValueAndFire(LayoutStateKeys.SIDEBAR_POSITON, positionFromString(
+                this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? "left"
+            ));
         }
     }
     updateLegacySettingsFromState(key, value) {
@@ -2067,12 +2340,13 @@ class LayoutStateModel extends Disposable {
             return;
         }
         if (key === LayoutStateKeys.ACTIVITYBAR_HIDDEN) {
-            this.configurationService.updateValue(LayoutSettings.ACTIVITY_BAR_LOCATION, value ? ActivityBarPosition.HIDDEN : undefined);
-        }
-        else if (key === LayoutStateKeys.STATUSBAR_HIDDEN) {
+            this.configurationService.updateValue(
+                LayoutSettings.ACTIVITY_BAR_LOCATION,
+                value ? ActivityBarPosition.HIDDEN : undefined
+            );
+        } else if (key === LayoutStateKeys.STATUSBAR_HIDDEN) {
             this.configurationService.updateValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE, !value);
-        }
-        else if (key === LayoutStateKeys.SIDEBAR_POSITON) {
+        } else if (key === LayoutStateKeys.SIDEBAR_POSITON) {
             this.configurationService.updateValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION, positionToString(value));
         }
     }
@@ -2088,37 +2362,47 @@ class LayoutStateModel extends Disposable {
             }
         }
         this.stateCache.set(LayoutStateKeys.ACTIVITYBAR_HIDDEN.name, this.isActivityBarHidden());
-        this.stateCache.set(LayoutStateKeys.STATUSBAR_HIDDEN.name, !this.configurationService.getValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE));
-        this.stateCache.set(LayoutStateKeys.SIDEBAR_POSITON.name, positionFromString(this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? 'left'));
+        this.stateCache.set(
+            LayoutStateKeys.STATUSBAR_HIDDEN.name,
+            !this.configurationService.getValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE)
+        );
+        this.stateCache.set(LayoutStateKeys.SIDEBAR_POSITON.name, positionFromString(
+            this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? "left"
+        ));
+        const auxiliaryBarForceMaximized = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED);
         const workbenchState = this.contextService.getWorkbenchState();
         const mainContainerDimension = configuration.mainContainerDimension;
         LayoutStateKeys.SIDEBAR_SIZE.defaultValue = Math.min(300, mainContainerDimension.width / 4);
-        LayoutStateKeys.SIDEBAR_HIDDEN.defaultValue = workbenchState === WorkbenchState.EMPTY;
-        LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = Math.min(300, mainContainerDimension.width / 4);
+        LayoutStateKeys.SIDEBAR_HIDDEN.defaultValue = workbenchState === WorkbenchState.EMPTY || auxiliaryBarForceMaximized === true;
+        LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = auxiliaryBarForceMaximized ? Math.max(300, mainContainerDimension.width / 2) : Math.min(300, mainContainerDimension.width / 4);
         LayoutStateKeys.AUXILIARYBAR_HIDDEN.defaultValue = (() => {
             if (isWeb && !this.environmentService.remoteAuthority) {
                 return true;
             }
+            if (auxiliaryBarForceMaximized === true) {
+                return false;
+            }
             const configuration = this.configurationService.inspect(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
-            if (configuration.defaultValue !== 'hidden' && !isConfigured(configuration) && this.stateCache.get(LayoutStateKeys.AUXILIARYBAR_EMPTY.name)) {
+            if (configuration.defaultValue !== "hidden" && !isConfigured(configuration) && this.stateCache.get(LayoutStateKeys.AUXILIARYBAR_EMPTY.name)) {
                 return true;
             }
-            if (this.isNew[StorageScope.APPLICATION] &&
-                configuration.value !== 'hidden') {
+            if (this.isNew[StorageScope.APPLICATION] && configuration.value !== "hidden") {
                 return false;
             }
             switch (configuration.value) {
-                case 'hidden':
-                    return true;
-                case 'visibleInWorkspace':
-                case 'maximizedInWorkspace':
-                    return workbenchState === WorkbenchState.EMPTY;
-                default:
-                    return false;
+            case "hidden":
+                return true;
+            case "visibleInWorkspace":
+            case "maximizedInWorkspace":
+                return workbenchState === WorkbenchState.EMPTY;
+            default:
+                return false;
             }
         })();
         LayoutStateKeys.PANEL_SIZE.defaultValue = (this.stateCache.get(LayoutStateKeys.PANEL_POSITION.name) ?? isHorizontal(LayoutStateKeys.PANEL_POSITION.defaultValue)) ? mainContainerDimension.height / 3 : mainContainerDimension.width / 4;
-        LayoutStateKeys.PANEL_POSITION.defaultValue = positionFromString(this.configurationService.getValue(WorkbenchLayoutSettings.PANEL_POSITION) ?? 'bottom');
+        LayoutStateKeys.PANEL_POSITION.defaultValue = positionFromString(
+            this.configurationService.getValue(WorkbenchLayoutSettings.PANEL_POSITION) ?? "bottom"
+        );
         for (key in LayoutStateKeys) {
             const stateKey = LayoutStateKeys[key];
             if (this.stateCache.get(stateKey.name) === undefined) {
@@ -2126,38 +2410,46 @@ class LayoutStateModel extends Disposable {
             }
         }
         this.applyOverrides(configuration);
-        this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, undefined, this._store)(storageChangeEvent => {
-            let key;
-            for (key in LayoutStateKeys) {
-                const stateKey = LayoutStateKeys[key];
-                if (stateKey instanceof RuntimeStateKey && stateKey.scope === StorageScope.PROFILE && stateKey.target === StorageTarget.USER) {
-                    if (`${LayoutStateModel.STORAGE_PREFIX}${stateKey.name}` === storageChangeEvent.key) {
-                        const value = this.loadKeyFromStorage(stateKey) ?? stateKey.defaultValue;
-                        if (this.stateCache.get(stateKey.name) !== value) {
-                            this.stateCache.set(stateKey.name, value);
-                            this._onDidChangeState.fire({ key: stateKey, value });
+        this._register(
+            this.storageService.onDidChangeValue(StorageScope.PROFILE, undefined, this._store)(storageChangeEvent => {
+                let key;
+                for (key in LayoutStateKeys) {
+                    const stateKey = LayoutStateKeys[key];
+                    if (stateKey instanceof RuntimeStateKey && stateKey.scope === StorageScope.PROFILE && stateKey.target === StorageTarget.USER) {
+                        if (`${LayoutStateModel.STORAGE_PREFIX}${stateKey.name}` === storageChangeEvent.key) {
+                            const value = this.loadKeyFromStorage(stateKey) ?? stateKey.defaultValue;
+                            if (this.stateCache.get(stateKey.name) !== value) {
+                                this.stateCache.set(stateKey.name, value);
+                                this._onDidChangeState.fire({
+                                    key: stateKey,
+                                    value
+                                });
+                            }
                         }
                     }
                 }
-            }
-        }));
+            })
+        );
     }
     applyOverrides(configuration) {
         if (this.isNew[StorageScope.WORKSPACE]) {
             const defaultAuxiliaryBarVisibility = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
-            if (defaultAuxiliaryBarVisibility === 'maximized' ||
-                (defaultAuxiliaryBarVisibility === 'maximizedInWorkspace' && this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY)) {
+            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)) {
+        if (this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) && this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN) && !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED)) {
             this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, false);
         }
         if (this.isNew[StorageScope.WORKSPACE] && configuration.mainContainerDimension.width <= DEFAULT_WORKSPACE_WINDOW_DIMENSIONS.width) {
-            this.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, Math.min(300, configuration.mainContainerDimension.width / 4));
-            this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, Math.min(300, configuration.mainContainerDimension.width / 4));
+            this.setInitializationValue(
+                LayoutStateKeys.SIDEBAR_SIZE,
+                Math.min(300, configuration.mainContainerDimension.width / 4)
+            );
+            this.setInitializationValue(
+                LayoutStateKeys.AUXILIARYBAR_SIZE,
+                Math.min(300, configuration.mainContainerDimension.width / 4)
+            );
         }
     }
     applyAuxiliaryBarMaximizedOverride() {
@@ -2171,7 +2463,10 @@ class LayoutStateModel extends Disposable {
         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_LAST_NON_MAXIMIZED_SIZE,
+            this.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE)
+        );
         this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, true);
     }
     save(workspace, global) {
@@ -2179,8 +2474,7 @@ class LayoutStateModel extends Disposable {
         const isZenMode = this.getRuntimeValue(LayoutStateKeys.ZEN_MODE_ACTIVE);
         for (key in LayoutStateKeys) {
             const stateKey = LayoutStateKeys[key];
-            if ((workspace && stateKey.scope === StorageScope.WORKSPACE) ||
-                (global && stateKey.scope === StorageScope.PROFILE)) {
+            if ((workspace && stateKey.scope === StorageScope.WORKSPACE) || (global && stateKey.scope === StorageScope.PROFILE)) {
                 if (isZenMode && stateKey instanceof RuntimeStateKey && stateKey.zenModeIgnore) {
                     continue;
                 }
@@ -2197,15 +2491,21 @@ class LayoutStateModel extends Disposable {
     getRuntimeValue(key, fallbackToSetting) {
         if (fallbackToSetting) {
             switch (key) {
-                case LayoutStateKeys.ACTIVITYBAR_HIDDEN:
-                    this.stateCache.set(key.name, this.isActivityBarHidden());
-                    break;
-                case LayoutStateKeys.STATUSBAR_HIDDEN:
-                    this.stateCache.set(key.name, !this.configurationService.getValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE));
-                    break;
-                case LayoutStateKeys.SIDEBAR_POSITON:
-                    this.stateCache.set(key.name, this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? 'left');
-                    break;
+            case LayoutStateKeys.ACTIVITYBAR_HIDDEN:
+                this.stateCache.set(key.name, this.isActivityBarHidden());
+                break;
+            case LayoutStateKeys.STATUSBAR_HIDDEN:
+                this.stateCache.set(
+                    key.name,
+                    !this.configurationService.getValue(LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE)
+                );
+                break;
+            case LayoutStateKeys.SIDEBAR_POSITON:
+                this.stateCache.set(
+                    key.name,
+                    this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? "left"
+                );
+                break;
             }
         }
         return this.stateCache.get(key.name);
@@ -2233,20 +2533,31 @@ class LayoutStateModel extends Disposable {
             return;
         }
         this.setRuntimeValue(key, value);
-        this._onDidChangeState.fire({ key, value });
+        this._onDidChangeState.fire({
+            key,
+            value
+        });
     }
     saveKeyToStorage(key) {
         const value = this.stateCache.get(key.name);
-        this.storageService.store(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, typeof value === 'object' ? JSON.stringify(value) : value, key.scope, key.target);
+        this.storageService.store(
+            `${LayoutStateModel.STORAGE_PREFIX}${key.name}`,
+            typeof value === "object" ? JSON.stringify(value) : value,
+            key.scope,
+            key.target
+        );
     }
     loadKeyFromStorage(key) {
         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': return (value === 'true');
-                case 'number': return parseInt(value);
-                case 'object': return JSON.parse(value);
+            case "boolean":
+                return (value === "true");
+            case "number":
+                return parseInt(value);
+            case "object":
+                return JSON.parse(value);
             }
         }
         return value;