@codingame/monaco-vscode-views-service-override 1.83.16 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,14 +18,14 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "1.83.16",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.16",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.83.16",
-    "@codingame/monaco-vscode-keybindings-service-override": "1.83.16",
-    "@codingame/monaco-vscode-environment-service-override": "1.83.16",
-    "@codingame/monaco-vscode-extensions-service-override": "1.83.16",
-    "@codingame/monaco-vscode-files-service-override": "1.83.16"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-extensions-service-override": "1.85.0-next.0",
+    "@codingame/monaco-vscode-files-service-override": "1.85.0-next.0"
   }
 }

package/tools/editor.d.ts

@@ -1,6 +1,6 @@
+import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { ICodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/services/resolverService';
 
 type OpenEditor = (modelRef: IReference<IResolvedTextEditorModel>, options: IEditorOptions | undefined, sideBySide?: boolean) => Promise<ICodeEditor | undefined>;

package/tools/editor.js

@@ -89,7 +89,7 @@ function wrapOpenEditor(textModelService, defaultBehavior, fallbackBahavior) {
 }
 let MonacoEditorService = class MonacoEditorService extends EditorService {
     constructor(_openEditorFallback, _isEditorPartVisible, _editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService, textModelService) {
-        super(_editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService);
+        super(undefined, _editorGroupService, instantiationService, fileService, configurationService, contextService, uriIdentityService, editorResolverService, workspaceTrustRequestService, hostService, textEditorService);
         this._isEditorPartVisible = _isEditorPartVisible;
         this.openEditor = wrapOpenEditor(textModelService, this.openEditor.bind(this), _openEditorFallback);
     }
@@ -229,7 +229,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
             });
             this.pane = new StandaloneEditorPane(editor, editorInput, this);
             this._onDidModelChange.fire({
-                kind: 3 ,
+                kind: 4 ,
                 editor: editorInput,
                 editorIndex: 0
             });
@@ -242,7 +242,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
                 const pane = this.pane;
                 this.pane = undefined;
                 this._onDidModelChange.fire({
-                    kind: 4 ,
+                    kind: 5 ,
                     editorIndex: 0
                 });
                 this._onDidActiveEditorChange.fire({
@@ -279,6 +279,19 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
             this.pane = new StandaloneEditorPane(editor, editorInput, this);
         }
     }
+    get groupsView() {
+        return unsupported();
+    }
+    notifyLabelChanged() { }
+    createEditorActions() {
+        return {
+            actions: {
+                primary: [],
+                secondary: []
+            },
+            onDidChange: Event.None
+        };
+    }
     get titleHeight() { return unsupported(); }
     setActive(isActive) {
         this.active = isActive;
@@ -315,6 +328,8 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this._serviceBrand = undefined;
         this.additionalGroups = [];
         this.activeGroupOverride = undefined;
+        this.onDidCreateAuxiliaryEditorPart = this.delegate.onDidCreateAuxiliaryEditorPart;
+        this.onDidChangeGroupMaximized = this.delegate.onDidChangeGroupMaximized;
         this._onDidChangeActiveGroup = new Emitter();
         this.onDidChangeActiveGroup = Event.any(this._onDidChangeActiveGroup.event, this.delegate.onDidChangeActiveGroup);
         this._onDidAddGroup = new Emitter();
@@ -323,8 +338,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.onDidRemoveGroup = Event.any(this._onDidRemoveGroup.event, this.delegate.onDidRemoveGroup);
         this.onDidMoveGroup = this.delegate.onDidMoveGroup;
         this.onDidActivateGroup = this.delegate.onDidActivateGroup;
-        this.onDidLayout = this.delegate.onDidLayout;
-        this.onDidScroll = this.delegate.onDidScroll;
         this.onDidChangeGroupIndex = this.delegate.onDidChangeGroupIndex;
         this.onDidChangeGroupLocked = this.delegate.onDidChangeGroupLocked;
         this.getLayout = () => {
@@ -351,12 +364,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.applyLayout = (...args) => {
             return this.delegate.applyLayout(...args);
         };
-        this.centerLayout = (...args) => {
-            return this.delegate.centerLayout(...args);
-        };
-        this.isLayoutCentered = (...args) => {
-            return this.delegate.isLayoutCentered(...args);
-        };
         this.setGroupOrientation = (...args) => {
             return this.delegate.setGroupOrientation(...args);
         };
@@ -381,9 +388,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         this.copyGroup = (...args) => {
             return this.delegate.copyGroup(...args);
         };
-        this.enforcePartOptions = (...args) => {
-            return this.delegate.enforcePartOptions(...args);
-        };
         this.onDidChangeEditorPartOptions = this.delegate.onDidChangeEditorPartOptions;
         setTimeout(() => {
             const codeEditorService = StandaloneServices.get(ICodeEditorService);
@@ -393,8 +397,16 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
                         this.activeGroupOverride = this.additionalGroups.find(group => group.editor === editor);
                         this._onDidChangeActiveGroup.fire(this.activeGroup);
                     };
+                    const onEditorBlurred = () => {
+                        if (this.activeGroupOverride === this.additionalGroups.find(group => group.editor === editor)) {
+                            this.activeGroupOverride = undefined;
+                            this._onDidChangeActiveGroup.fire(this.activeGroup);
+                        }
+                    };
                     editor.onDidFocusEditorText(onEditorFocused);
                     editor.onDidFocusEditorWidget(onEditorFocused);
+                    editor.onDidBlurEditorText(onEditorBlurred);
+                    editor.onDidBlurEditorWidget(onEditorBlurred);
                     if (editor.hasWidgetFocus()) {
                         onEditorFocused();
                     }
@@ -422,20 +434,33 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             codeEditorService.listCodeEditors().forEach(handleCodeEditor);
         });
     }
+    get parts() { return this.delegate.parts; }
+    createAuxiliaryEditorPart(options) {
+        return this.delegate.createAuxiliaryEditorPart(options);
+    }
+    get mainPart() { return this.delegate.mainPart; }
+    get activePart() { return this.delegate.activePart; }
+    getPart(container) {
+        return this.delegate.getPart(container);
+    }
+    toggleMaximizeGroup(group) {
+        return this.delegate.toggleMaximizeGroup(group);
+    }
+    toggleExpandGroup(group) {
+        return this.delegate.toggleExpandGroup(group);
+    }
+    createEditorDropTarget(container, delegate) {
+        return this.delegate.createEditorDropTarget(container, delegate);
+    }
     get groups() {
         return [...this.additionalGroups, ...this.delegate.groups];
     }
     get activeGroup() {
         return this.activeGroupOverride ?? this.delegate.activeGroup;
     }
-    get contentDimension() { return this.delegate.contentDimension; }
     get sideGroup() { return this.delegate.sideGroup; }
     get count() { return this.delegate.count + this.additionalGroups.length; }
     get orientation() { return this.delegate.orientation; }
-    get isReady() { return this.delegate.isReady; }
-    get whenReady() { return this.delegate.whenReady; }
-    get whenRestored() { return this.delegate.whenRestored; }
-    get hasRestorableState() { return this.delegate.hasRestorableState; }
     get partOptions() { return this.delegate.partOptions; }
 };
 MonacoDelegateEditorGroupsService = __decorate([

package/views.d.ts

@@ -2,11 +2,11 @@ import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/brow
 import { ViewContainerLocation, ViewContainer } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { BrandedService, ServicesAccessor } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';

package/views.js

@@ -10,7 +10,6 @@ import { ViewDescriptorService } from './vscode/src/vs/workbench/services/views/
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { ActivityService } from './vscode/src/vs/workbench/services/activity/browser/activityService.js';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { PaneCompositeParts } from './vscode/src/vs/workbench/browser/parts/paneCompositePart.js';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
 import { MutableDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
@@ -23,8 +22,6 @@ import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPan
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Part } from 'vscode/vscode/vs/workbench/browser/part';
-import { EditorPart } from './vscode/src/vs/workbench/browser/parts/editor/editorPart.js';
 import './vscode/src/vs/workbench/contrib/files/browser/fileCommands.js';
 import './vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js';
 import './vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js';
@@ -46,7 +43,6 @@ import './vscode/src/vs/workbench/contrib/files/browser/files.contribution2.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorDropService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorDropService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
@@ -62,7 +58,6 @@ export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/edito
 import { ITextEditorService, TextEditorService } from 'vscode/vscode/vs/workbench/services/textfile/common/textEditorService';
 import { CodeEditorService } from 'vscode/vscode/vs/workbench/services/editor/browser/codeEditorService';
 import { IUntitledTextEditorService, UntitledTextEditorService } from 'vscode/vscode/vs/workbench/services/untitled/common/untitledTextEditorService';
-import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
 import { HistoryService } from './vscode/src/vs/workbench/services/history/browser/historyService.js';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
@@ -88,8 +83,6 @@ import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeS
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
-import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService';
-import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/common/titleService';
 import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { ProgressService } from './vscode/src/vs/workbench/services/progress/browser/progressService.js';
 import { DomScrollableElement } from 'monaco-editor/esm/vs/base/browser/ui/scrollbar/scrollableElement.js';
@@ -108,6 +101,9 @@ import { IWorkspaceContextService, isTemporaryWorkspace } from 'monaco-editor/es
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
+import { PaneCompositePartService } from './vscode/src/vs/workbench/browser/parts/paneCompositePartService.js';
+import { EditorParts } from './vscode/src/vs/workbench/browser/parts/editor/editorParts.js';
+import { IAuxiliaryWindowService, BrowserAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { MonacoEditorService, MonacoDelegateEditorGroupsService } from './tools/editor.js';
 import getServiceOverride$2 from '@codingame/monaco-vscode-bulk-edit-service-override';
 import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-override';
@@ -161,16 +157,24 @@ function _attachPart(part, container) {
     };
 }
 function attachPart(part, container) {
-    return _attachPart(getPart(part), container);
+    const _part = getPart(part);
+    if (_part == null) {
+        throw new Error('Part not found');
+    }
+    return _attachPart(_part, container);
 }
 function onPartVisibilityChange(part, listener) {
-    return getPart(part).onDidVisibilityChange(listener);
+    const _part = getPart(part);
+    if (_part == null) {
+        throw new Error('Part not found');
+    }
+    return _part.onDidVisibilityChange(listener);
 }
 function isPartVisibile(part) {
-    return StandaloneServices.get(IWorkbenchLayoutService).isVisible(part);
+    return StandaloneServices.get(IWorkbenchLayoutService).isVisible(part, window);
 }
 function setPartVisibility(part, visible) {
-    StandaloneServices.get(IWorkbenchLayoutService).setPartHidden(!visible, part);
+    StandaloneServices.get(IWorkbenchLayoutService).setPartHidden(!visible, part, window);
 }
 function renderActivitybarPar(container) {
     return attachPart("workbench.parts.activitybar" , container);
@@ -317,7 +321,10 @@ function registerCustomView(options) {
     });
     const views = [{
             id: options.id,
-            name: options.name,
+            name: {
+                value: options.name,
+                original: options.name
+            },
             ctorDescriptor: new SyncDescriptor(class extends ViewPane {
                 renderBody(container) {
                     super.renderBody(container);
@@ -385,17 +392,6 @@ function registerCustomView(options) {
     }
     return disposableCollection;
 }
-let EditorDropService = class EditorDropService {
-    constructor(editorPart) {
-        this.editorPart = editorPart;
-    }
-    createEditorDropTarget(container, delegate) {
-        return this.editorPart.createEditorDropTarget(container, delegate);
-    }
-};
-EditorDropService = __decorate([
-    ( __param(0, IEditorGroupsService))
-], EditorDropService);
 function isElementVisible(el) {
     if (!el.isConnected) {
         return false;
@@ -409,79 +405,23 @@ function isElementVisible(el) {
     return el.offsetHeight > 0 && el.offsetWidth > 0;
 }
 function isEditorPartVisible() {
-    const container = StandaloneServices.get(IEditorGroupsService).getContainer();
+    const container = StandaloneServices.get(IEditorGroupsService).mainPart.getContainer();
     return container != null && isElementVisible(container);
 }
-let MonacoEditorPart = class MonacoEditorPart extends MonacoDelegateEditorGroupsService {
+let MonacoEditorParts = class MonacoEditorParts extends MonacoDelegateEditorGroupsService {
     constructor(instantiationService) {
-        super(instantiationService.createInstance(EditorPart), instantiationService);
-        this.onDidChangeSizeConstraints = this.delegate.onDidChangeSizeConstraints;
+        super(instantiationService.createInstance(EditorParts), instantiationService);
         this.restoreGroup = (...args) => {
             return this.delegate.restoreGroup(...args);
         };
-        this.isGroupMaximized = (...args) => {
-            return this.delegate.isGroupMaximized(...args);
-        };
-        this.createEditorDropTarget = (...args) => {
-            return this.delegate.createEditorDropTarget(...args);
-        };
-        this.updateStyles = (...args) => {
-            return this.delegate.updateStyles(...args);
-        };
-        this.setBoundarySashes = (...args) => {
-            return this.delegate.setBoundarySashes(...args);
-        };
-        this.layout = (...args) => {
-            return this.delegate.layout(...args);
-        };
-        this.toJSON = (...args) => {
-            return this.delegate.toJSON(...args);
-        };
-        this.onDidVisibilityChange = this.delegate.onDidVisibilityChange;
-        this.create = (...args) => {
-            return this.delegate.create(...args);
-        };
-        this.getContainer = (...args) => {
-            return this.delegate.getContainer(...args);
-        };
-        this.setVisible = (...args) => {
-            return this.delegate.setVisible(...args);
-        };
-        this.getId = (...args) => {
-            return this.delegate.getId(...args);
-        };
-    }
-    get minimumWidth() {
-        return this.delegate.minimumWidth;
-    }
-    get maximumWidth() {
-        return this.delegate.maximumWidth;
-    }
-    get minimumHeight() {
-        return this.delegate.minimumHeight;
-    }
-    get maximumHeight() {
-        return this.delegate.maximumHeight;
     }
-    get snap() {
-        return this.delegate.snap;
-    }
-    get onDidChange() {
-        return this.delegate.onDidChange;
-    }
-    get priority() {
-        return this.delegate.priority;
-    }
-    get dimension() {
-        return this.delegate.dimension;
-    }
-    get element() {
-        return this.delegate.element;
+    registerPart(part) {
+        return this.delegate.registerPart(part);
     }
 };
-MonacoEditorPart = __decorate([
+MonacoEditorParts = __decorate([
     ( __param(0, IInstantiationService))
-], MonacoEditorPart);
+], MonacoEditorParts);
 let webviewIframeAlternateDomains;
 registerAssets({
     'vs/workbench/contrib/webview/browser/pre/service-worker.js': () => changeUrlDomain(new URL('./assets/service-worker.js', import.meta.url).href, webviewIframeAlternateDomains),
@@ -504,9 +444,6 @@ onRenderWorkbench(async (accessor) => {
     const configurationService = accessor.get(IConfigurationService);
     const fileService = accessor.get(IFileService);
     const workingCopyBackupService = accessor.get(IWorkingCopyBackupService);
-    const withStatusBar = accessor.get(IStatusbarService) instanceof Part;
-    const withBannerPart = accessor.get(IBannerService) instanceof Part;
-    const withTitlePart = accessor.get(ITitleService) instanceof Part;
     const layoutService = accessor.get(ILayoutService);
     function getInitialEditorsState() {
         const defaultLayout = environmentService.options?.defaultLayout;
@@ -588,7 +525,7 @@ onRenderWorkbench(async (accessor) => {
             return filesToOpenOrCreate;
         }
         else if (contextService.getWorkbenchState() === 1  && configurationService.getValue('workbench.startupEditor') === 'newUntitledFile') {
-            if (editorGroupService.hasRestorableState) {
+            if (editorGroupService.mainPart.hasRestorableState) {
                 return [];
             }
             const hasBackups = await workingCopyBackupService.hasBackups();
@@ -655,31 +592,30 @@ onRenderWorkbench(async (accessor) => {
     const invisibleContainer = document.createElement('div');
     invisibleContainer.style.display = 'none';
     document.body.append(invisibleContainer);
-    for (const { id, role, classes, options, enabled = true } of [
-        { id: "workbench.parts.titlebar" , role: 'none', classes: ['titlebar'], enabled: withTitlePart },
-        { id: "workbench.parts.banner" , role: 'banner', classes: ['banner'], enabled: withBannerPart },
+    for (const { id, role, classes, options } of [
+        { id: "workbench.parts.titlebar" , role: 'none', classes: ['titlebar'] },
+        { id: "workbench.parts.banner" , role: 'banner', classes: ['banner'] },
         { id: "workbench.parts.activitybar" , role: 'none', classes: ['activitybar', 'left'] },
         { id: "workbench.parts.sidebar" , role: 'none', classes: ['sidebar', 'left'] },
         { id: "workbench.parts.editor" , role: 'main', classes: ['editor'], options: { restorePreviousState: initialLayoutState.editor.restoreEditors } },
         { id: "workbench.parts.panel" , role: 'none', classes: ['panel', 'basepanel', positionToString(2 )] },
         { id: "workbench.parts.auxiliarybar" , role: 'none', classes: ['auxiliarybar', 'basepanel', 'right'] },
-        { id: "workbench.parts.statusbar" , role: 'status', classes: ['statusbar'], enabled: withStatusBar }
+        { id: "workbench.parts.statusbar" , role: 'status', classes: ['statusbar'] }
     ]) {
-        if (!enabled) {
-            continue;
-        }
-        const partContainer = createPart(id, role, classes);
         const part = layoutService.getPart(id);
-        part.create(partContainer, options);
-        renderPart(partContainer, part);
-        part.layout(9999, 9999, 0, 0);
-        invisibleContainer.append(partContainer);
+        if (part != null) {
+            const partContainer = createPart(id, role, classes);
+            part.create(partContainer, options);
+            renderPart(partContainer, part);
+            part.layout(9999, 9999, 0, 0);
+            invisibleContainer.append(partContainer);
+        }
     }
     const layoutReadyPromises = [];
     const layoutRestoredPromises = [];
     layoutReadyPromises.push((async () => {
         mark('code/willRestoreEditors');
-        await editorGroupService.whenReady;
+        await editorGroupService.mainPart.whenReady;
         mark('code/restoreEditors/editorGroupsReady');
         if (initialLayoutState.layout?.editors != null) {
             editorGroupService.applyLayout(initialLayoutState.layout.editors);
@@ -710,7 +646,7 @@ onRenderWorkbench(async (accessor) => {
         }
         layoutRestoredPromises.push(Promise.all([
             openEditorsPromise?.finally(() => mark('code/restoreEditors/editorsOpened')),
-            editorGroupService.whenRestored.finally(() => mark('code/restoreEditors/editorGroupsRestored'))
+            editorGroupService.mainPart.whenRestored.finally(() => mark('code/restoreEditors/editorGroupsRestored'))
         ]).finally(() => {
             mark('code/didRestoreEditors');
         }));
@@ -820,13 +756,12 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         [( IViewsService.toString())]: new SyncDescriptor(ViewsService, [], false),
         [( IViewDescriptorService.toString())]: new SyncDescriptor(ViewDescriptorService, [], true),
         [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
-        [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositeParts, [], true),
+        [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositePartService, [], true),
         [( IHoverService.toString())]: new SyncDescriptor(HoverService, [], true),
         [( IExplorerService.toString())]: new SyncDescriptor(ExplorerService, [], true),
         [( ICodeEditorService.toString())]: new SyncDescriptor(CodeEditorService, [], true),
         [( ITextEditorService.toString())]: new SyncDescriptor(TextEditorService, [], false),
-        [( IEditorGroupsService.toString())]: new SyncDescriptor(MonacoEditorPart, [], false),
-        [( IEditorDropService.toString())]: new SyncDescriptor(EditorDropService, [], true),
+        [( IEditorGroupsService.toString())]: new SyncDescriptor(MonacoEditorParts, [], false),
         [( IEditorService.toString())]: new SyncDescriptor(MonacoEditorService, [openEditorFallback, isEditorPartVisible], false),
         [( IEditorResolverService.toString())]: new SyncDescriptor(EditorResolverService, [], false),
         [( IBreadcrumbsService.toString())]: new SyncDescriptor(BreadcrumbsService, [], true),
@@ -838,7 +773,8 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         [( IWebviewService.toString())]: new SyncDescriptor(WebviewService, [], true),
         [( IWebviewViewService.toString())]: new SyncDescriptor(WebviewViewService, [], true),
         [( IWebviewWorkbenchService.toString())]: new SyncDescriptor(WebviewEditorService, [], true),
-        [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true)
+        [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true),
+        [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true)
     };
 }
 

package/vscode/src/vs/base/browser/ui/centered/centeredViewLayout.js

@@ -33,14 +33,14 @@ function toSplitViewView(view, getHeight) {
     };
 }
 class CenteredViewLayout {
-    constructor(container, view, state = { ...defaultState }) {
+    constructor(container, view, state = { ...defaultState }, centeredLayoutFixedWidth = false) {
         this.container = container;
         this.view = view;
         this.state = state;
+        this.centeredLayoutFixedWidth = centeredLayoutFixedWidth;
         this.lastLayoutPosition = { width: 0, height: 0, left: 0, top: 0 };
         this.didLayout = false;
         this.splitViewDisposables = ( new DisposableStore());
-        this.centeredLayoutFixedWidth = true;
         this._boundarySashes = {};
         this.container.appendChild(this.view.element);
         this.container.style.overflow = 'hidden';

package/vscode/src/vs/base/browser/ui/grid/grid.js

@@ -143,6 +143,7 @@ class Grid extends Disposable {
         }
         this.onDidChange = this.gridview.onDidChange;
         this.onDidScroll = this.gridview.onDidScroll;
+        this.onDidChangeViewMaximized = this.gridview.onDidChangeViewMaximized;
     }
     style(styles) {
         this.gridview.style(styles);
@@ -258,9 +259,16 @@ class Grid extends Disposable {
         const location = this.getViewLocation(view);
         return this.gridview.resizeView(location, size);
     }
-    isViewSizeMaximized(view) {
+    isViewExpanded(view) {
         const location = this.getViewLocation(view);
-        return this.gridview.isViewSizeMaximized(location);
+        return this.gridview.isViewExpanded(location);
+    }
+    isViewMaximized(view) {
+        const location = this.getViewLocation(view);
+        return this.gridview.isViewMaximized(location);
+    }
+    hasMaximizedView() {
+        return this.gridview.hasMaximizedView();
     }
     getViewSize(view) {
         if (!view) {
@@ -273,9 +281,19 @@ class Grid extends Disposable {
         const location = this.getViewLocation(view);
         return this.gridview.getViewCachedVisibleSize(location);
     }
-    maximizeViewSize(view) {
+    maximizeView(view) {
+        if (this.views.size < 2) {
+            throw new Error('At least two views are required to maximize a view');
+        }
         const location = this.getViewLocation(view);
-        this.gridview.maximizeViewSize(location);
+        this.gridview.maximizeView(location);
+    }
+    exitMaximizedView() {
+        this.gridview.exitMaximizedView();
+    }
+    expandView(view) {
+        const location = this.getViewLocation(view);
+        this.gridview.expandView(location);
     }
     distributeViewSizes() {
         this.gridview.distributeViewSizes();
@@ -356,12 +374,21 @@ class SerializableGrid extends Grid {
     static serializeNode(node, orientation) {
         const size = orientation === 0  ? node.box.width : node.box.height;
         if (!isGridBranchNode(node)) {
+            const serializedLeafNode = { type: 'leaf', data: node.view.toJSON(), size };
             if (typeof node.cachedVisibleSize === 'number') {
-                return { type: 'leaf', data: node.view.toJSON(), size: node.cachedVisibleSize, visible: false };
+                serializedLeafNode.size = node.cachedVisibleSize;
+                serializedLeafNode.visible = false;
             }
-            return { type: 'leaf', data: node.view.toJSON(), size };
+            else if (node.maximized) {
+                serializedLeafNode.maximized = true;
+            }
+            return serializedLeafNode;
+        }
+        const data = ( node.children.map(c => SerializableGrid.serializeNode(c, orthogonal(orientation))));
+        if (( data.some(c => c.visible !== false))) {
+            return { type: 'branch', data: data, size };
         }
-        return { type: 'branch', data: ( node.children.map(c => SerializableGrid.serializeNode(c, orthogonal(orientation)))), size };
+        return { type: 'branch', data: data, size, visible: false };
     }
     static deserialize(json, deserializer, options = {}) {
         if (typeof json.orientation !== 'number') {