@codingame/monaco-vscode-workbench-service-override 37.6.0 → 37.6.1

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

@@ -2,57 +2,57 @@
 import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, createElement, addDisposableListener, EventType, isActiveDocument, getActiveElement, getActiveWindow, isAncestorUsingFlowTo, getFullscreenElement, size, computeScreenAwareSize, getWindowId } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { setContainerElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
-import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { SerializableGrid, Sizing, Direction } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { DeferredPromise, Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { toDisposable, DisposableStore, DisposableMap, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/performance';
+import { Disposable, toDisposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 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 { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ChatAIDisabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/chatSettings';
+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, ModernUIDensity, Position, isHorizontal, ZenModeSettings, isMultiWindowPart, isFloatingTopEdgeExposed, positionToString, partOpensMaximizedFromString, PartOpensMaximizedOptions, 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, isDefaultOverriden } 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 { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ChatAIDisabledSettingId } from '@codingame/monaco-vscode-api/vscode/vs/platform/chat/common/chatSettings';
+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 { GroupActivationReason, 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 { 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 { isHighContrast } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/theme';
 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 } 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 { 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 { isHighContrast } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/theme';
 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 { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IBannerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/banner/browser/bannerService.service';
-import { GroupActivationReason, 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, ModernUIDensity, Position, isHorizontal, ZenModeSettings, isMultiWindowPart, isFloatingTopEdgeExposed, positionToString, partOpensMaximizedFromString, PartOpensMaximizedOptions, 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 { AbstractLayout, WorkbenchLayoutSettings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/abstractlayout';
-export { AbstractLayout, WorkbenchLayoutSettings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/abstractlayout';
-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';
 
@@ -92,7 +92,7 @@ const TITLE_BAR_SETTINGS = [
 ];
 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 AbstractLayout {
+class Layout extends Disposable {
     get activeContainer() {
         return this.getContainerFromDocument(getActiveDocument());
     }
@@ -156,8 +156,9 @@ class Layout extends AbstractLayout {
         };
     }
     constructor(parent, layoutOptions) {
-        super(layoutOptions);
+        super();
         this.parent = parent;
+        this.layoutOptions = layoutOptions;
         this._onDidChangeZenMode = this._register(( new Emitter()));
         this.onDidChangeZenMode = this._onDidChangeZenMode.event;
         this._onDidChangeMainEditorCenteredLayout = this._register(( new Emitter()));
@@ -189,6 +190,7 @@ class Layout extends AbstractLayout {
         this.parts = ( new Map());
         this.initialized = false;
         this.disposed = false;
+        this._openedDefaultEditors = false;
         this.whenReadyPromise = ( new DeferredPromise());
         this.whenReady = this.whenReadyPromise.p;
         this.whenRestoredPromise = ( new DeferredPromise());
@@ -218,7 +220,7 @@ class Layout extends AbstractLayout {
         this.statusBarService = accessor.get(IStatusbarService);
         accessor.get(IBannerService);
         this.registerLayoutListeners();
-        this.initLayoutState(accessor);
+        this.initLayoutState(accessor.get(ILifecycleService), accessor.get(IFileService));
     }
     registerLayoutListeners() {
         const showEditorIfHidden = explicitUserAction => {
@@ -508,7 +510,7 @@ class Layout extends AbstractLayout {
             this.layout();
         }
     }
-    initLayoutState(accessor) {
+    initLayoutState(lifecycleService, fileService) {
         this._mainContainerDimension = getClientArea(
             this.parent,
             this.contextService.getWorkbenchState() === WorkbenchState.EMPTY ? DEFAULT_EMPTY_WINDOW_DIMENSIONS : DEFAULT_WORKSPACE_WINDOW_DIMENSIONS
@@ -536,6 +538,23 @@ class Layout extends AbstractLayout {
             }
             this.doUpdateLayoutConfiguration();
         }));
+        const initialEditorsState = this.getInitialEditorsState();
+        if (initialEditorsState) {
+            this.logService.trace("Initial editor state", initialEditorsState);
+        }
+        const initialLayoutState = {
+            layout: {
+                editors: initialEditorsState?.layout
+            },
+            editor: {
+                restoreEditors: this.shouldRestoreEditors(this.contextService, initialEditorsState),
+                editorsToOpen: this.resolveEditorsToOpen(fileService, initialEditorsState)
+            },
+            views: {
+                defaults: this.getDefaultLayoutViews(this.environmentService, this.storageService),
+                containerToRestore: {}
+            }
+        };
         const layoutRuntimeState = {
             activeContainerId: this.getActiveContainerId(),
             mainWindowFullscreen: isFullscreen(mainWindow),
@@ -550,7 +569,7 @@ class Layout extends AbstractLayout {
             }
         };
         this.state = {
-            initialization: this.getInitLayoutState(accessor),
+            initialization: initialLayoutState,
             runtime: layoutRuntimeState
         };
         if (this.isVisible(Parts.SIDEBAR_PART)) {
@@ -559,7 +578,7 @@ class Layout extends AbstractLayout {
                 StorageScope.WORKSPACE,
                 this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id
             );
-            if (!this.environmentService.isBuilt || accessor.get(ILifecycleService).startupKind === StartupKind.ReloadedWindow || this.environmentService.isExtensionDevelopment && !this.environmentService.extensionTestsLocationURI)
+            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;
             }
@@ -595,18 +614,187 @@ class Layout extends AbstractLayout {
         }
         this.updateWindowBorder(true);
     }
+    getDefaultLayoutViews(environmentService, storageService) {
+        const defaultLayout = environmentService.options?.defaultLayout;
+        if (!defaultLayout) {
+            return undefined;
+        }
+        if (!defaultLayout.force && !storageService.isNew(StorageScope.WORKSPACE)) {
+            return undefined;
+        }
+        const {
+            views
+        } = defaultLayout;
+        if (views?.length) {
+            return views.map(view => view.id);
+        }
+        return undefined;
+    }
+    shouldRestoreEditors(contextService, initialEditorsState) {
+        if (isTemporaryWorkspace(contextService.getWorkspace())) {
+            return false;
+        }
+        if (this.configurationService.getValue(WorkbenchLayoutSettings.EDITOR_RESTORE_EDITORS) === false) {
+            return false;
+        }
+        const forceRestoreEditors = this.configurationService.getValue("window.restoreWindows") === "preserve";
+        return !!forceRestoreEditors || initialEditorsState === undefined;
+    }
     willRestoreEditors() {
         return this.state.initialization.editor.restoreEditors;
     }
+    async resolveEditorsToOpen(fileService, initialEditorsState) {
+        if (initialEditorsState) {
+            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
+                        }
+                    }
+                }];
+            }
+            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
+                        }
+                    }
+                }];
+            }
+            const filesToOpenOrCreate = [];
+            const resolvedFilesToOpenOrCreate = await pathsToEditors(initialEditorsState.filesToOpenOrCreate, fileService, this.logService);
+            for (let i = 0; i < resolvedFilesToOpenOrCreate.length; i++) {
+                const resolvedFileToOpenOrCreate = resolvedFilesToOpenOrCreate[i];
+                if (resolvedFileToOpenOrCreate) {
+                    filesToOpenOrCreate.push({
+                        editor: resolvedFileToOpenOrCreate,
+                        viewColumn: initialEditorsState.filesToOpenOrCreate?.[i].viewColumn
+                    });
+                }
+            }
+            return filesToOpenOrCreate;
+        }
+        else if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY && this.configurationService.getValue("workbench.startupEditor") === "newUntitledFile") {
+            if (this.editorGroupService.hasRestorableState) {
+                return [];
+            }
+            return [{
+                editor: {
+                    resource: undefined
+                }
+            }];
+        }
+        return [];
+    }
+    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))) {
+            this._openedDefaultEditors = true;
+            return {
+                layout: defaultLayout.layout?.editors,
+                filesToOpenOrCreate: defaultLayout?.editors?.map(editor => {
+                    return {
+                        viewColumn: editor.viewColumn,
+                        fileUri: URI.revive(editor.uri),
+                        openOnlyIfExists: editor.openOnlyIfExists,
+                        options: editor.options
+                    };
+                })
+            };
+        }
+        const {
+            filesToOpenOrCreate,
+            filesToDiff,
+            filesToMerge
+        } = this.environmentService;
+        if (filesToOpenOrCreate || filesToDiff || filesToMerge) {
+            return {
+                filesToOpenOrCreate,
+                filesToDiff,
+                filesToMerge
+            };
+        }
+        return undefined;
+    }
     isRestored() {
         return this.restored;
     }
-    restoreParts(accessor) {
+    restoreParts(instantiationService) {
         const layoutReadyPromises = [];
         const layoutRestoredPromises = [];
-        layoutReadyPromises.push(
-            this.restoreLayout(accessor, this.state.initialization, layoutRestoredPromises)
-        );
+        layoutReadyPromises.push((async () => {
+            mark("code/willRestoreEditors");
+            await this.editorGroupService.whenReady;
+            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");
+            let openEditorsPromise = undefined;
+            if (editors.length) {
+                const editorGroupsInVisualOrder = this.editorGroupService.mainPart.getGroups(GroupsOrder.GRID_APPEARANCE);
+                const mapEditorsToGroup = ( new Map());
+                for (const editor of editors) {
+                    const group = editorGroupsInVisualOrder[(editor.viewColumn ?? 1) - 1];
+                    let editorsByGroup = mapEditorsToGroup.get(group.id);
+                    if (!editorsByGroup) {
+                        editorsByGroup = ( new Set());
+                        mapEditorsToGroup.set(group.id, editorsByGroup);
+                    }
+                    editorsByGroup.add(editor.editor);
+                }
+                openEditorsPromise = Promise.all(Array.from(mapEditorsToGroup).map(async ([groupId, editors]) => {
+                    try {
+                        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
+            );
+            layoutRestoredPromises.push(Promise.all([
+                openEditorsPromise?.finally(() => mark("code/restoreEditors/editorsOpened")),
+                customEditorRestorePromise?.finally(() => mark("code/restoreEditors/customEditorsOpened")),
+                this.editorGroupService.whenRestored.finally(() => mark("code/restoreEditors/editorGroupsRestored"))
+            ]).finally(() => {
+                mark("code/didRestoreEditors");
+            }));
+        })());
         const restoreDefaultViewsPromise = (async () => {
             if (this.state.initialization.views.defaults?.length) {
                 mark("code/willOpenDefaultViews");
@@ -1653,7 +1841,7 @@ class Layout extends AbstractLayout {
     toggleSecondarySideBar() {
         const visible = !this.isSecondarySideBarVisible();
         this.setPartHidden(!visible, Parts.AUXILIARYBAR_PART);
-        alert(visible ? ( localize(5596, "Secondary Side Bar shown")) : ( localize(5597, "Secondary Side Bar hidden")));
+        alert(visible ? ( localize(5595, "Secondary Side Bar shown")) : ( localize(5596, "Secondary Side Bar hidden")));
     }
     isSecondarySideBarVisible() {
         return this.isVisible(Parts.AUXILIARYBAR_PART);
@@ -2169,6 +2357,17 @@ const LayoutStateKeys = {
         true
     ))
 };
+var 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) {
     LegacyWorkbenchLayoutSettings["STATUSBAR_VISIBLE"] = "workbench.statusBar.visible";
@@ -2445,4 +2644,4 @@ class LayoutStateModel extends Disposable {
     }
 }
 
-export { Layout, LayoutStateModel, TITLE_BAR_SETTINGS };
+export { Layout, TITLE_BAR_SETTINGS };

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

@@ -42,5 +42,5 @@ export declare class Workbench extends Layout {
     protected renderWorkbench(instantiationService: IInstantiationService, notificationService: NotificationService, storageService: IStorageService, configurationService: IConfigurationService): void;
     private createPart;
     protected createNotificationsHandlers(instantiationService: IInstantiationService, notificationService: NotificationService): void;
-    protected restore(accessor: ServicesAccessor): void;
+    protected restore(instantiationService: IInstantiationService, lifecycleService: ILifecycleService): void;
 }

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

@@ -111,7 +111,7 @@ class Workbench extends Layout {
                 );
                 this.createWorkbenchLayout();
                 this.layout();
-                this.restore(accessor);
+                this.restore(instantiationService, lifecycleService);
             });
             return instantiationService;
         } catch (error) {
@@ -333,10 +333,9 @@ class Workbench extends Layout {
             ), () => notificationsToasts.isVisible || notificationsCenter.isVisible)
         });
     }
-    restore(accessor) {
-        const lifecycleService = accessor.get(ILifecycleService);
+    restore(instantiationService, lifecycleService) {
         try {
-            this.restoreParts(accessor);
+            this.restoreParts(instantiationService);
         } catch (error) {
             onUnexpectedError(error);
         }