@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js

@@ -6,12 +6,22 @@ import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Emitter, Relay } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { addDisposableListener, EventHelper, EventType, getWindow, trackFocus, getActiveElement, isActiveElement, focusWindow, isAncestor, Dimension, isMouseEvent, findParentWithClass } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventHelper, EventType, getWindow, trackFocus, getActiveElement, isActiveElement, isAncestor, Dimension, isMouseEvent, findParentWithClass } from '../../../../base/browser/dom.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { Themable, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { contrastBorder, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { EDITOR_GROUP_EMPTY_BACKGROUND, EDITOR_GROUP_HEADER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND } from '../../../common/theme.js';
 import { EditorPanes } from './editorPanes.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
@@ -37,6 +47,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { EditorActivation } from '../../../../platform/editor/common/editor.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { URI } from '../../../../base/common/uri.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { isNative, isWindows, isLinux, isMacintosh } from '../../../../base/common/platform.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -47,7 +58,7 @@ import { EditorTitleControl } from './editorTitleControl.js';
 import { EditorPane } from './editorPane.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
 import { IHostService } from '../../../services/host/browser/host.js';
-import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var EditorGroupView_1;
 let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
     static createNew(editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
@@ -59,7 +70,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     static createCopy(copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
         return instantiationService.createInstance(EditorGroupView_1, copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex);
     }
-    constructor(from, editorPartsView, groupsView, groupsLabel, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService, editorResolverService, hostService) {
+    constructor(from, editorPartsView, groupsView, groupsLabel, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService, editorResolverService, hostService, dialogService) {
         super(themeService);
         this.editorPartsView = editorPartsView;
         this.groupsView = groupsView;
@@ -78,6 +89,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.logService = logService;
         this.editorResolverService = editorResolverService;
         this.hostService = hostService;
+        this.dialogService = dialogService;
         this._onDidFocus = this._register(( new Emitter()));
         this.onDidFocus = this._onDidFocus.event;
         this._onWillDispose = this._register(( new Emitter()));
@@ -202,7 +214,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                         groupActiveEditorPinnedContext.set(this.model.isPinned(this.model.activeEditor));
                     }
                     break;
-                case 11 :
+                case 12 :
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorStickyContext.set(this.model.isSticky(this.model.activeEditor));
                     }
@@ -368,6 +380,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this._register(this.model.onDidModelChange(e => this.onDidGroupModelChange(e)));
         this._register(this.groupsView.onDidChangeEditorPartOptions(e => this.onDidChangeEditorPartOptions(e)));
         this._register(this.groupsView.onDidVisibilityChange(e => this.onDidVisibilityChange(e)));
+        this._register(this.onDidFocus(() => this.onDidGainFocus()));
     }
     onDidGroupModelChange(e) {
         this._onDidModelChange.fire(e);
@@ -388,12 +401,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     this.handleOnDidCloseEditor(e.editor, e.editorIndex, e.context, e.sticky);
                 }
                 break;
-            case 13 :
+            case 14 :
                 this.onWillDisposeEditor(e.editor);
                 break;
-            case 12 :
+            case 13 :
                 this.onDidChangeEditorDirty(e.editor);
                 break;
+            case 11 :
+                this.onDidChangeEditorTransient(e.editor);
+                break;
             case 8 :
                 this.onDidChangeEditorLabel(e.editor);
                 break;
@@ -429,15 +445,33 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         return true;
     }
+    toResourceTelemetryDescriptor(resource) {
+        if (!resource) {
+            return undefined;
+        }
+        const path = resource ? resource.scheme === Schemas.file ? resource.fsPath : resource.path : undefined;
+        if (!path) {
+            return undefined;
+        }
+        let resourceExt = extname(resource);
+        const queryStringLocation = resourceExt.indexOf('?');
+        resourceExt = queryStringLocation !== -1 ? resourceExt.substr(0, queryStringLocation) : resourceExt;
+        return { mimeType: ( new TelemetryTrustedValue(getMimeTypes(resource).join(', '))), scheme: resource.scheme, ext: resourceExt, path: hash(path) };
+    }
     toEditorTelemetryDescriptor(editor) {
         const descriptor = editor.getTelemetryDescriptor();
-        const resource = EditorResourceAccessor.getOriginalUri(editor);
-        const path = resource ? resource.scheme === Schemas.file ? resource.fsPath : resource.path : undefined;
-        if (resource && path) {
-            let resourceExt = extname(resource);
-            const queryStringLocation = resourceExt.indexOf('?');
-            resourceExt = queryStringLocation !== -1 ? resourceExt.substr(0, queryStringLocation) : resourceExt;
-            descriptor['resource'] = { mimeType: ( new TelemetryTrustedValue(getMimeTypes(resource).join(', '))), scheme: resource.scheme, ext: resourceExt, path: hash(path) };
+        const resource = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.BOTH });
+        if (URI.isUri(resource)) {
+            descriptor['resource'] = this.toResourceTelemetryDescriptor(resource);
+            return descriptor;
+        }
+        else if (resource) {
+            if (resource.primary) {
+                descriptor['resource'] = this.toResourceTelemetryDescriptor(resource.primary);
+            }
+            if (resource.secondary) {
+                descriptor['resourceSecondary'] = this.toResourceTelemetryDescriptor(resource.secondary);
+            }
             return descriptor;
         }
         return descriptor;
@@ -468,7 +502,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.doCloseEditor(inactiveEditor, true);
         }
         if (activeEditor) {
-            this.doCloseEditor(activeEditor);
+            this.doCloseEditor(activeEditor, true);
         }
     }
     onDidChangeEditorPartOptions(event) {
@@ -493,12 +527,23 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.pinEditor(editor);
         this.titleControl.updateEditorDirty(editor);
     }
+    onDidChangeEditorTransient(editor) {
+        const transient = this.model.isTransient(editor);
+        if (!transient && !this.groupsView.partOptions.enablePreview) {
+            this.pinEditor(editor);
+        }
+    }
     onDidChangeEditorLabel(editor) {
         this.titleControl.updateEditorLabel(editor);
     }
     onDidVisibilityChange(visible) {
         this.editorPane.setVisible(visible);
     }
+    onDidGainFocus() {
+        if (this.activeEditor) {
+            this.model.setTransient(this.activeEditor, false);
+        }
+    }
     get index() {
         return this._index;
     }
@@ -595,6 +640,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     isSticky(editorOrIndex) {
         return this.model.isSticky(editorOrIndex);
     }
+    isTransient(editorOrIndex) {
+        return this.model.isTransient(editorOrIndex);
+    }
     isActive(editor) {
         return this.model.isActive(editor);
     }
@@ -638,7 +686,6 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return this.model.isLast(editor);
     }
     focus() {
-        focusWindow(this.element);
         if (this.activeEditorPane) {
             this.activeEditorPane.focus();
         }
@@ -692,7 +739,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         this._onWillOpenEditor.fire({ editor, groupId: this.id });
         const pinned = options?.sticky
-            || !this.groupsView.partOptions.enablePreview
+            || (!this.groupsView.partOptions.enablePreview && !options?.transient)
             || editor.isDirty()
             || ((options?.pinned ?? typeof options?.index === 'number') )
             || (typeof options?.index === 'number' && this.model.isSticky(options.index))
@@ -701,6 +748,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             index: options ? options.index : undefined,
             pinned,
             sticky: options?.sticky || (typeof options?.index === 'number' && this.model.isSticky(options.index)),
+            transient: !!options?.transient,
             active: this.count === 0 || !options || !options.inactive,
             supportSideBySide: internalOptions?.supportSideBySide
         };
@@ -805,21 +853,29 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const internalOptions = {
             skipTitleUpdate: this !== target
         };
+        let moveFailed = false;
+        const movedEditors = ( new Set());
         for (const { editor, options } of editors) {
-            this.moveEditor(editor, target, options, internalOptions);
+            if (this.moveEditor(editor, target, options, internalOptions)) {
+                movedEditors.add(editor);
+            }
+            else {
+                moveFailed = true;
+            }
         }
         if (internalOptions.skipTitleUpdate) {
-            const movedEditors = ( editors.map(({ editor }) => editor));
-            target.titleControl.openEditors(movedEditors);
-            this.titleControl.closeEditors(movedEditors);
+            target.titleControl.openEditors(Array.from(movedEditors));
+            this.titleControl.closeEditors(Array.from(movedEditors));
         }
+        return !moveFailed;
     }
     moveEditor(editor, target, options, internalOptions) {
         if (this === target) {
             this.doMoveEditorInsideGroup(editor, options);
+            return true;
         }
         else {
-            this.doMoveOrCopyEditorAcrossGroups(editor, target, options, { ...internalOptions, keepCopy: false });
+            return this.doMoveOrCopyEditorAcrossGroups(editor, target, options, { ...internalOptions, keepCopy: false });
         }
     }
     doMoveEditorInsideGroup(candidate, options) {
@@ -845,6 +901,17 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     doMoveOrCopyEditorAcrossGroups(editor, target, openOptions, internalOptions) {
         const keepCopy = internalOptions?.keepCopy;
+        if (!keepCopy || editor.hasCapability(8 ) ) {
+            const canMoveVeto = editor.canMove(this.id, target.id);
+            if (typeof canMoveVeto === 'string') {
+                this.dialogService.error(canMoveVeto, ( localizeWithPath(
+                    'vs/workbench/browser/parts/editor/editorGroupView',
+                    'moveErrorDetails',
+                    "Try saving or reverting the editor first and then try again."
+                )));
+                return false;
+            }
+        }
         const options = fillActiveEditorViewState(this, editor, {
             ...openOptions,
             pinned: true,
@@ -861,6 +928,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (!keepCopy) {
             this.doCloseEditor(editor, true , { ...internalOptions, context: EditorCloseContext.MOVE });
         }
+        return true;
     }
     copyEditors(editors, target) {
         const internalOptions = {
@@ -1308,6 +1376,7 @@ EditorGroupView = EditorGroupView_1 = ( __decorate([
     ( __param(15, IUriIdentityService)),
     ( __param(16, ILogService)),
     ( __param(17, IEditorResolverService)),
-    ( __param(18, IHostService))
+    ( __param(18, IHostService)),
+    ( __param(19, IDialogService))
 ], EditorGroupView));
 export { EditorGroupView };

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js

@@ -10,7 +10,17 @@ import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/key
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { registerColor, transparent, editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 registerColor('editorWatermark.foreground', { dark: ( transparent(editorForeground, 0.6)), light: ( transparent(editorForeground, 0.68)), hcDark: editorForeground, hcLight: editorForeground }, ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editorGroupWatermark',
     'editorLineHighlight',
@@ -162,12 +172,13 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
                 const dt = append(dl, $('dt'));
                 dt.textContent = entry.text;
                 const dd = append(dl, $('dd'));
-                const keybinding = ( new KeybindingLabel(
+                this.keybindingLabel?.dispose();
+                this.keybindingLabel = ( new KeybindingLabel(
                     dd,
                     OS,
                     { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles }
                 ));
-                keybinding.set(keys);
+                this.keybindingLabel.set(keys);
             }
         };
         update();
@@ -180,6 +191,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
     dispose() {
         super.dispose();
         this.clear();
+        this.keybindingLabel?.dispose();
     }
 };
 EditorGroupWatermark = ( __decorate([

package/vscode/src/vs/workbench/browser/parts/editor/editorPane.d.ts

@@ -1,3 +1,4 @@
+import { CodeWindow } from '../../../../base/browser/window.js';
 import { Composite } from '../../composite.js';
 import { IEditorPane, IEditorOpenContext, IEditorMemento } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
@@ -34,6 +35,7 @@ import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
  * This class is only intended to be subclassed and not instantiated.
  */
 declare abstract class EditorPane extends Composite implements IEditorPane {
+    readonly group: IEditorGroup;
     readonly onDidChangeSizeConstraints: Event<any>;
     protected readonly _onDidChangeControl: Emitter<void>;
     readonly onDidChangeControl: Event<void>;
@@ -46,13 +48,12 @@ declare abstract class EditorPane extends Composite implements IEditorPane {
     get input(): EditorInput | undefined;
     protected _options: IEditorOptions | undefined;
     get options(): IEditorOptions | undefined;
-    private _group;
-    get group(): IEditorGroup | undefined;
+    get window(): CodeWindow;
     /**
      * Should be overridden by editors that have their own ScopedContextKeyService
      */
     get scopedContextKeyService(): IContextKeyService | undefined;
-    constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
+    constructor(id: string, group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     create(parent: HTMLElement): void;
     /**
      * Called to create the editor in the parent HTMLElement. Subclasses implement
@@ -93,15 +94,13 @@ declare abstract class EditorPane extends Composite implements IEditorPane {
      * to the current input.
      */
     setOptions(options: IEditorOptions | undefined): void;
-    setVisible(visible: boolean, group?: IEditorGroup): void;
+    setVisible(visible: boolean): void;
     /**
-     * Indicates that the editor control got visible or hidden in a specific group. A
-     * editor instance will only ever be visible in one editor group.
+     * Indicates that the editor control got visible or hidden.
      *
      * @param visible the state of visibility of this editor
-     * @param group the editor group this editor is in.
      */
-    protected setEditorVisible(visible: boolean, group: IEditorGroup | undefined): void;
+    protected setEditorVisible(visible: boolean): void;
     setBoundarySashes(_sashes: IBoundarySashes): void;
     protected getEditorMemento<T>(editorGroupService: IEditorGroupsService, configurationService: ITextResourceConfigurationService, key: string, limit?: number): IEditorMemento<T>;
     getViewState(): object | undefined;

package/vscode/src/vs/workbench/browser/parts/editor/editorPane.js

@@ -8,6 +8,7 @@ import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from './
 import { isEqual, joinPath } from '../../../../base/common/resources.js';
 import { indexOfPath } from '../../../../base/common/extpath.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { getWindowById } from '../../../../base/browser/dom.js';
 class EditorPane extends Composite {
     static { this.EDITOR_MEMENTOS = ( new Map()); }
     get minimumWidth() { return DEFAULT_EDITOR_MIN_DIMENSIONS.width; }
@@ -16,10 +17,11 @@ class EditorPane extends Composite {
     get maximumHeight() { return DEFAULT_EDITOR_MAX_DIMENSIONS.height; }
     get input() { return this._input; }
     get options() { return this._options; }
-    get group() { return this._group; }
+    get window() { return getWindowById(this.group.windowId, true).window; }
     get scopedContextKeyService() { return undefined; }
-    constructor(id, telemetryService, themeService, storageService) {
+    constructor(id, group, telemetryService, themeService, storageService) {
         super(id, telemetryService, themeService, storageService);
+        this.group = group;
         this.onDidChangeSizeConstraints = Event.None;
         this._onDidChangeControl = this._register(( new Emitter()));
         this.onDidChangeControl = this._onDidChangeControl.event;
@@ -39,12 +41,11 @@ class EditorPane extends Composite {
     setOptions(options) {
         this._options = options;
     }
-    setVisible(visible, group) {
+    setVisible(visible) {
         super.setVisible(visible);
-        this.setEditorVisible(visible, group);
+        this.setEditorVisible(visible);
     }
-    setEditorVisible(visible, group) {
-        this._group = group;
+    setEditorVisible(visible) {
     }
     setBoundarySashes(_sashes) {
     }

package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js

@@ -1,11 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { toAction } from '../../../../base/common/actions.js';
 import { Emitter } from '../../../../base/common/event.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { EditorExtensions, createEditorOpenError, isEditorOpenError } from '../../../common/editor.js';
-import { getWindow, getActiveElement, isAncestor, show, Dimension, hide } from '../../../../base/browser/dom.js';
+import { EditorExtensions, isEditorOpenError } from '../../../common/editor.js';
+import { getActiveElement, getWindowById, isAncestor, show, Dimension, hide } from '../../../../base/browser/dom.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -20,7 +19,6 @@ import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IHostService } from '../../../services/host/browser/host.js';
-import { mainWindow } from '../../../../base/browser/window.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 let EditorPanes = class EditorPanes extends Disposable {
     get minimumWidth() { return this._activeEditorPane?.minimumWidth ?? DEFAULT_EDITOR_MIN_DIMENSIONS.width; }
@@ -63,26 +61,7 @@ let EditorPanes = class EditorPanes extends Disposable {
     }
     async openEditor(editor, options, internalOptions, context = Object.create(null)) {
         try {
-            if (getWindow(this.editorGroupParent) !== mainWindow && editor.hasCapability(1024 )) {
-                return await this.doShowError(createEditorOpenError(( localizeWithPath(
-                    'vs/workbench/browser/parts/editor/editorPanes',
-                    'editorUnsupportedInAuxWindow',
-                    "This type of editor cannot be opened in other windows yet."
-                )), [
-                    toAction({
-                        id: 'workbench.editor.action.closeEditor', label: ( localizeWithPath(
-                        'vs/workbench/browser/parts/editor/editorPanes',
-                        'openFolder',
-                        "Close Editor"
-                    )), run: async () => {
-                            return this.groupView.closeEditor(editor);
-                        }
-                    })
-                ], { forceMessage: true, forceSeverity: Severity.Warning }), editor, options, internalOptions, context);
-            }
-            else {
-                return await this.doOpenEditor(this.getEditorPaneDescriptor(editor), editor, options, internalOptions, context);
-            }
+            return await this.doOpenEditor(this.getEditorPaneDescriptor(editor), editor, options, internalOptions, context);
         }
         catch (error) {
             if (options?.ignoreError) {
@@ -110,13 +89,13 @@ let EditorPanes = class EditorPanes extends Disposable {
         };
     }
     async doShowErrorDialog(error, editor) {
-        let severity = Severity.Error;
+        let severity = Severity$1.Error;
         let message = undefined;
         let detail = toErrorMessage(error);
         let errorActions = undefined;
         if (isEditorOpenError(error)) {
             errorActions = error.actions;
-            severity = error.forceSeverity ?? Severity.Error;
+            severity = error.forceSeverity ?? Severity$1.Error;
             if (error.forceMessage) {
                 message = error.message;
                 detail = undefined;
@@ -185,7 +164,7 @@ let EditorPanes = class EditorPanes extends Disposable {
                 pane.focus();
             }
             else if (!internalOptions?.preserveWindowOrder) {
-                this.hostService.moveTop(getWindow(this.editorGroupParent));
+                this.hostService.moveTop(getWindowById(this.groupView.windowId, true).window);
             }
         }
         return { pane, changed, cancelled };
@@ -229,7 +208,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         const container = assertIsDefined(editorPane.getContainer());
         this.editorPanesParent.appendChild(container);
         show(container);
-        editorPane.setVisible(true, this.groupView);
+        editorPane.setVisible(true);
         if (this.pagePosition) {
             editorPane.layout(( new Dimension(this.pagePosition.width, this.pagePosition.height)), { top: this.pagePosition.top, left: this.pagePosition.left });
         }
@@ -243,6 +222,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         if (!editorPane.getContainer()) {
             const editorPaneContainer = document.createElement('div');
             editorPaneContainer.classList.add('editor-instance');
+            this.editorPanesParent.appendChild(editorPaneContainer);
             editorPane.create(editorPaneContainer);
         }
         return editorPane;
@@ -252,7 +232,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         if (existingEditorPane) {
             return existingEditorPane;
         }
-        const editorPane = this._register(descriptor.instantiate(this.instantiationService));
+        const editorPane = this._register(descriptor.instantiate(this.instantiationService, this.groupView));
         this.editorPanes.push(editorPane);
         return editorPane;
     }
@@ -299,7 +279,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         }
         this.editorOperation.stop();
         this.safeRun(() => this._activeEditorPane?.clearInput());
-        this.safeRun(() => this._activeEditorPane?.setVisible(false, this.groupView));
+        this.safeRun(() => this._activeEditorPane?.setVisible(false));
         const editorPaneContainer = this._activeEditorPane.getContainer();
         if (editorPaneContainer) {
             this.editorPanesParent.removeChild(editorPaneContainer);
@@ -313,7 +293,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         }
     }
     setVisible(visible) {
-        this.safeRun(() => this._activeEditorPane?.setVisible(visible, this.groupView));
+        this.safeRun(() => this._activeEditorPane?.setVisible(visible));
     }
     layout(pagePosition) {
         this.pagePosition = pagePosition;

package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js

@@ -3,7 +3,17 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { Part } from '../../part.js';
 import { getWindow, getActiveElement, isAncestorOfActiveElement, addDisposableGenericMouseDownListener, EventHelper, Dimension, $ } from '../../../../base/browser/dom.js';
 import { Emitter, Relay, Event } from '../../../../base/common/event.js';
-import { contrastBorder, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { isGridBranchNode, createSerializedGrid, Sizing, SerializableGrid } from '../../../../base/browser/ui/grid/grid.js';
 import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from '../../../common/theme.js';

package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
+import '../../../services/editor/common/editorGroupsService.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { MainEditorPart } from './editorPart.js';