@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -2,7 +2,7 @@ import { IThemeService } from "../../../../platform/theme/common/themeService.se
 import { Part } from "../../part.js";
 import { Dimension } from "../../../../base/browser/dom.js";
 import { Event } from "../../../../base/common/event.js";
-import { GroupDirection, GroupsArrangement, GroupOrientation, IMergeGroupOptions, GroupsOrder, IFindGroupScope, EditorGroupLayout, IEditorSideGroup, IEditorDropTargetDelegate, IEditorPart } from "../../../services/editor/common/editorGroupsService.js";
+import { GroupDirection, GroupsArrangement, GroupOrientation, IMergeGroupOptions, GroupsOrder, IFindGroupScope, EditorGroupLayout, IEditorSideGroup, IEditorDropTargetDelegate, IEditorPart, GroupActivationReason, IEditorGroupActivationEvent } from "../../../services/editor/common/editorGroupsService.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { LayoutPriority, IViewSize, ISerializedGrid } from "../../../../base/browser/ui/grid/grid.js";
 import { GroupIdentifier, IEditorPartOptions, IEditorPartOptionsChangeEvent } from "../../../common/editor.js";
@@ -50,7 +50,7 @@ export declare class EditorPart extends Part<IEditorPartMemento> implements IEdi
     private readonly _onDidChangeGroupMaximized;
     readonly onDidChangeGroupMaximized: Event<boolean>;
     private readonly _onDidActivateGroup;
-    readonly onDidActivateGroup: Event<IEditorGroupView>;
+    readonly onDidActivateGroup: Event<IEditorGroupActivationEvent>;
     private readonly _onDidAddGroup;
     readonly onDidAddGroup: Event<IEditorGroupView>;
     private readonly _onDidRemoveGroup;
@@ -75,7 +75,7 @@ export declare class EditorPart extends Part<IEditorPartMemento> implements IEdi
     private mostRecentActiveGroups;
     protected readonly container: HTMLElement;
     readonly scopedInstantiationService: IInstantiationService;
-    private readonly scopedContextKeyService;
+    protected readonly scopedContextKeyService: IContextKeyService;
     private centeredLayoutWidget;
     private gridWidget;
     private readonly gridWidgetDisposables;
@@ -114,7 +114,7 @@ export declare class EditorPart extends Part<IEditorPartMemento> implements IEdi
     findGroup(scope: IFindGroupScope, source?: IEditorGroupView | GroupIdentifier, wrap?: boolean): IEditorGroupView | undefined;
     private doFindGroupByDirection;
     private doFindGroupByLocation;
-    activateGroup(group: IEditorGroupView | GroupIdentifier, preserveWindowOrder?: boolean): IEditorGroupView;
+    activateGroup(group: IEditorGroupView | GroupIdentifier, preserveWindowOrder?: boolean, reason?: GroupActivationReason): IEditorGroupView;
     restoreGroup(group: IEditorGroupView | GroupIdentifier): IEditorGroupView;
     getSize(group: IEditorGroupView | GroupIdentifier): {
         width: number;
@@ -164,7 +164,7 @@ export declare class EditorPart extends Part<IEditorPartMemento> implements IEdi
     private get gridSeparatorBorder();
     updateStyles(): void;
     protected createContentArea(parent: HTMLElement, options?: IEditorPartCreationOptions): HTMLElement;
-    private handleContextKeys;
+    protected handleContextKeys(): void;
     private setupDragAndDropSupport;
     centerLayout(active: boolean): void;
     isLayoutCentered(): boolean;

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

@@ -15,7 +15,7 @@ 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 { GroupOrientation, GroupsOrder, GroupLocation, GroupsArrangement, GroupDirection, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
+import { GroupOrientation, GroupsOrder, GroupLocation, GroupsArrangement, GroupActivationReason, GroupDirection, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { isGridBranchNode, createSerializedGrid, Sizing, Direction, SerializableGrid } from '../../../../base/browser/ui/grid/grid.js';
 import { GroupModelChangeKind } from '../../../common/editor.js';
@@ -42,7 +42,7 @@ import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { IsAuxiliaryWindowContext, EditorPartMultipleEditorGroupsContext, EditorPartMaximizedEditorGroupContext } from '../../../common/contextkeys.js';
+import { EditorPartMultipleEditorGroupsContext, EditorPartMaximizedEditorGroupContext } from '../../../common/contextkeys.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { LayoutPriority } from '../../../../base/browser/ui/splitview/splitview.js';
 import { orthogonal } from '../../../../base/browser/ui/grid/gridview.js';
@@ -321,9 +321,9 @@ let EditorPart = class EditorPart extends Part {
             }
         }
     }
-    activateGroup(group, preserveWindowOrder) {
+    activateGroup(group, preserveWindowOrder, reason) {
         const groupView = this.assertGroupView(group);
-        this.doSetGroupActive(groupView);
+        this.doSetGroupActive(groupView, reason);
         if (!preserveWindowOrder) {
             this.hostService.moveTop(getWindow(this.element));
         }
@@ -575,7 +575,7 @@ let EditorPart = class EditorPart extends Part {
         });
         return groupView;
     }
-    doSetGroupActive(group) {
+    doSetGroupActive(group, reason = GroupActivationReason.DEFAULT) {
         if (this._activeGroup !== group) {
             const previousActiveGroup = this._activeGroup;
             this._activeGroup = group;
@@ -587,7 +587,10 @@ let EditorPart = class EditorPart extends Part {
             this.doRestoreGroup(group);
             this._onDidChangeActiveGroup.fire(group);
         }
-        this._onDidActivateGroup.fire(group);
+        this._onDidActivateGroup.fire({
+            group,
+            reason
+        });
     }
     doRestoreGroup(group) {
         if (!this.gridWidget) {
@@ -770,7 +773,7 @@ let EditorPart = class EditorPart extends Part {
     }
     createEditorDropTarget(container, delegate) {
         assertType(isHTMLElement(container));
-        return this.scopedInstantiationService.createInstance(EditorDropTarget, container, delegate);
+        return this.scopedInstantiationService.createInstance(EditorDropTarget, this, container, delegate);
     }
     get minimumWidth() {
         return Math.min(
@@ -835,8 +838,6 @@ let EditorPart = class EditorPart extends Part {
         return this.container;
     }
     handleContextKeys() {
-        const isAuxiliaryWindowContext = IsAuxiliaryWindowContext.bindTo(this.scopedContextKeyService);
-        isAuxiliaryWindowContext.set(this.windowId !== mainWindow.vscodeWindowId);
         const multipleEditorGroupsContext = EditorPartMultipleEditorGroupsContext.bindTo(this.scopedContextKeyService);
         const maximizedEditorGroupContext = EditorPartMaximizedEditorGroupContext.bindTo(this.scopedContextKeyService);
         const updateContextKeys = () => {

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

@@ -1,4 +1,4 @@
-import { EditorGroupLayout, GroupDirection, GroupOrientation, GroupsArrangement, GroupsOrder, IAuxiliaryEditorPart, IEditorGroupContextKeyProvider, IEditorDropTargetDelegate, IEditorSideGroup, IEditorWorkingSet, IFindGroupScope, IMergeGroupOptions, IEditorWorkingSetOptions, IEditorPart } from "../../../services/editor/common/editorGroupsService.js";
+import { EditorGroupLayout, GroupDirection, GroupOrientation, GroupsArrangement, GroupsOrder, IAuxiliaryEditorPart, IEditorGroupContextKeyProvider, IEditorDropTargetDelegate, IEditorSideGroup, IEditorWorkingSet, IFindGroupScope, IMergeGroupOptions, IEditorWorkingSetOptions, IEditorPart, IModalEditorPart, IEditorGroupActivationEvent } from "../../../services/editor/common/editorGroupsService.js";
 import { IEditorGroupsService } from "../../../services/editor/common/editorGroupsService.service.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { GroupIdentifier, IEditorPartOptions } from "../../../common/editor.js";
@@ -14,6 +14,7 @@ import { IAuxiliaryWindowService } from "../../../services/auxiliaryWindow/brows
 import { ContextKeyValue, IContextKey, RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { DeepPartial } from "../../../../base/common/types.js";
+import { IModalEditorPartOptions } from "../../../../platform/editor/common/editor.js";
 interface IEditorPartsUIState {
     readonly auxiliary: IAuxiliaryEditorPartState[];
     readonly mru: number[];
@@ -36,15 +37,21 @@ export declare class EditorParts extends MultiWindowParts<EditorPart, IEditorPar
     private registerListeners;
     protected createMainEditorPart(): MainEditorPart;
     private readonly mapPartToInstantiationService;
+    private modalPartInstantiationService;
     getScopedInstantiationService(part: IEditorPart): IInstantiationService;
     private readonly _onDidCreateAuxiliaryEditorPart;
     readonly onDidCreateAuxiliaryEditorPart: import("../../../../base/common/event.js").Event<IAuxiliaryEditorPart>;
     createAuxiliaryEditorPart(options?: IAuxiliaryEditorPartOpenOptions): Promise<IAuxiliaryEditorPart>;
+    private modalEditorPart;
+    get activeModalEditorPart(): IModalEditorPart | undefined;
+    private modalEditorMaximized;
+    createModalEditorPart(options?: IModalEditorPartOptions): Promise<IModalEditorPart>;
     registerPart(part: EditorPart): IDisposable;
     protected unregisterPart(part: EditorPart): void;
     private registerEditorPartListeners;
     private doUpdateMostRecentActive;
     private getGroupsLabel;
+    protected getPartByDocument(document: Document): EditorPart;
     getPart(group: IEditorGroupView | GroupIdentifier): EditorPart;
     getPart(element: HTMLElement): EditorPart;
     private static readonly EDITOR_PARTS_UI_STATE_STORAGE_KEY;
@@ -80,7 +87,7 @@ export declare class EditorParts extends MultiWindowParts<EditorPart, IEditorPar
     private readonly _onDidMoveGroup;
     readonly onDidMoveGroup: import("../../../../base/common/event.js").Event<IEditorGroupView>;
     private readonly _onDidActivateGroup;
-    readonly onDidActivateGroup: import("../../../../base/common/event.js").Event<IEditorGroupView>;
+    readonly onDidActivateGroup: import("../../../../base/common/event.js").Event<IEditorGroupActivationEvent>;
     private readonly _onDidChangeGroupIndex;
     readonly onDidChangeGroupIndex: import("../../../../base/common/event.js").Event<IEditorGroupView>;
     private readonly _onDidChangeGroupLocked;

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

@@ -9,6 +9,7 @@ import { MainEditorPart } from './editorPart.js';
 import '../../../../platform/instantiation/common/extensions.js';
 import { distinct } from '../../../../base/common/arrays.js';
 import { AuxiliaryEditorPart } from './auxiliaryEditorPart.js';
+import { ModalEditorPart } from './modalEditorPart.js';
 import { MultiWindowParts } from '../../part.js';
 import { DeferredPromise } from '../../../../base/common/async.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@@ -17,7 +18,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.service.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { isHTMLElement } from '../../../../base/browser/dom.js';
+import { getActiveElement, isAncestor, isHTMLElement } from '../../../../base/browser/dom.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
@@ -43,6 +44,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this.mapPartToInstantiationService = ( new Map());
         this._onDidCreateAuxiliaryEditorPart = this._register(( new Emitter()));
         this.onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
+        this.modalEditorMaximized = false;
         this.workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
         this._isReady = false;
         this.whenReadyPromise = ( new DeferredPromise());
@@ -94,22 +96,26 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     }
     getScopedInstantiationService(part) {
         if (part === this.mainPart) {
-            if (!( this.mapPartToInstantiationService.has(part.windowId))) {
-                this.instantiationService.invokeFunction(accessor => {
+            let mainPartInstantiationService = this.mapPartToInstantiationService.get(part.windowId);
+            if (!mainPartInstantiationService) {
+                mainPartInstantiationService = this.instantiationService.invokeFunction(accessor => {
                     const editorService = accessor.get(IEditorService);
                     const statusbarService = accessor.get(IStatusbarService);
-                    this.mapPartToInstantiationService.set(
-                        part.windowId,
-                        this._register(this.mainPart.scopedInstantiationService.createChild(( new ServiceCollection(
-                            [IEditorService, editorService.createScoped(this.mainPart, this._store)],
-                            [
-                                IStatusbarService,
-                                statusbarService.createScoped(statusbarService, this._store)
-                            ]
-                        ))))
-                    );
+                    const mainPartInstantiationService = this._register(this.mainPart.scopedInstantiationService.createChild(( new ServiceCollection(
+                        [IEditorService, editorService.createScoped(this.mainPart, this._store)],
+                        [
+                            IStatusbarService,
+                            statusbarService.createScoped(statusbarService, this._store)
+                        ]
+                    ))));
+                    this.mapPartToInstantiationService.set(part.windowId, mainPartInstantiationService);
+                    return mainPartInstantiationService;
                 });
             }
+            return mainPartInstantiationService;
+        }
+        if (part === this.modalEditorPart && this.modalPartInstantiationService) {
+            return this.modalPartInstantiationService;
         }
         return this.mapPartToInstantiationService.get(part.windowId) ?? this.instantiationService;
     }
@@ -127,6 +133,34 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this._onDidCreateAuxiliaryEditorPart.fire(part);
         return part;
     }
+    get activeModalEditorPart() {
+        return this.modalEditorPart;
+    }
+    async createModalEditorPart(options) {
+        if (this.modalEditorPart) {
+            this.modalEditorPart.updateOptions(options);
+            return this.modalEditorPart;
+        }
+        const {
+            part,
+            instantiationService,
+            disposables
+        } = await this.instantiationService.createInstance(ModalEditorPart, this).create({
+            ...options,
+            maximized: options?.maximized ?? this.modalEditorMaximized
+        });
+        this.modalEditorPart = part;
+        this.modalPartInstantiationService = instantiationService;
+        disposables.add(toDisposable(() => {
+            this.modalPartInstantiationService = undefined;
+            this.modalEditorPart = undefined;
+        }));
+        disposables.add(part.onDidChangeMaximized(maximized => {
+            this.modalEditorMaximized = maximized;
+        }));
+        this._onDidAddGroup.fire(part.activeGroup);
+        return part;
+    }
     registerPart(part) {
         const disposables = this._register(( new DisposableStore()));
         disposables.add(super.registerPart(part));
@@ -161,7 +195,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         disposables.add(part.onDidAddGroup(group => this._onDidAddGroup.fire(group)));
         disposables.add(part.onDidRemoveGroup(group => this._onDidRemoveGroup.fire(group)));
         disposables.add(part.onDidMoveGroup(group => this._onDidMoveGroup.fire(group)));
-        disposables.add(part.onDidActivateGroup(group => this._onDidActivateGroup.fire(group)));
+        disposables.add(part.onDidActivateGroup(e => this._onDidActivateGroup.fire(e)));
         disposables.add(
             part.onDidChangeGroupMaximized(maximized => this._onDidChangeGroupMaximized.fire(maximized))
         );
@@ -182,7 +216,21 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return localize(3432, "Window {0}", index + 1);
+        return localize(3483, "Window {0}", index + 1);
+    }
+    getPartByDocument(document) {
+        if (this._parts.size > 1) {
+            const activeElement = getActiveElement();
+            for (const part of this._parts) {
+                if (part !== this.mainPart && part.element?.ownerDocument === document) {
+                    const container = part.getContainer();
+                    if (container && isAncestor(activeElement, container)) {
+                        return part;
+                    }
+                }
+            }
+        }
+        return super.getPartByDocument(document);
     }
     getPart(groupOrElement) {
         if (this._parts.size > 1) {
@@ -240,13 +288,22 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     }
     createState() {
         return {
-            auxiliary: ( this.parts.filter(part => part !== this.mainPart).map(part => {
-                const auxiliaryWindow = this.auxiliaryWindowService.getWindow(part.windowId);
-                return {
-                    state: part.createState(),
-                    ...auxiliaryWindow?.createState()
-                };
-            })),
+            auxiliary: ( ( this.parts.map(part => ({
+                part,
+                auxiliaryWindow: this.auxiliaryWindowService.getWindow(part.windowId)
+            }))).filter((
+                {
+                    auxiliaryWindow
+                }
+            ) => auxiliaryWindow !== undefined).map((
+                {
+                    part,
+                    auxiliaryWindow
+                }
+            ) => ({
+                state: part.createState(),
+                ...auxiliaryWindow.createState()
+            }))),
             mru: ( this.mostRecentActiveParts.map(part => this.parts.indexOf(part)))
         };
     }

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

@@ -132,7 +132,7 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         this.ID = "workbench.editors.workspaceTrustRequiredEditor";
     }
     static {
-        this.LABEL = ( localize(3433, "Workspace Trust Required"));
+        this.LABEL = ( localize(3484, "Workspace Trust Required"));
     }
     static {
         this.DESCRIPTOR = EditorPaneDescriptor.create(this, this.ID, this.LABEL);
@@ -162,14 +162,14 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         return {
             icon: "$(workspace-untrusted)",
             label: isSingleFolderWorkspaceIdentifier(toWorkspaceIdentifier(this.workspaceService.getWorkspace())) ? ( localize(
-                3434,
+                3485,
                 "The file is not displayed in the editor because trust has not been granted to the folder."
             )) : ( localize(
-                3435,
+                3486,
                 "The file is not displayed in the editor because trust has not been granted to the workspace."
             )),
             actions: [{
-                label: ( localize(3436, "Manage Workspace Trust")),
+                label: ( localize(3487, "Manage Workspace Trust")),
                 run: () => this.commandService.executeCommand("workbench.trust.manage")
             }]
         };
@@ -184,7 +184,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         this.ID = "workbench.editors.errorEditor";
     }
     static {
-        this.LABEL = ( localize(3437, "Error Editor"));
+        this.LABEL = ( localize(3488, "Error Editor"));
     }
     static {
         this.DESCRIPTOR = EditorPaneDescriptor.create(this, this.ID, this.LABEL);
@@ -215,16 +215,16 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         const isFileNotFound = error?.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         let label;
         if (isFileNotFound) {
-            label = ( localize(3438, "The editor could not be opened because the file was not found."));
+            label = ( localize(3489, "The editor could not be opened because the file was not found."));
         } else if (isEditorOpenError(error) && error.forceMessage) {
             label = error.message;
         } else if (error) {
             label = ( localize(
-                3439,
+                3490,
                 "The editor could not be opened due to an unexpected error. Please consult the log for more details."
             ));
         } else {
-            label = ( localize(3440, "The editor could not be opened due to an unexpected error."));
+            label = ( localize(3491, "The editor could not be opened due to an unexpected error."));
         }
         let icon = "$(error)";
         if (isEditorOpenError(error)) {
@@ -249,13 +249,13 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
             }));
         } else {
             actions = [{
-                label: ( localize(3441, "Try Again")),
+                label: ( localize(3492, "Try Again")),
                 run: () => this.group.openEditor(input, {
                     ...options,
                     source: EditorOpenSource.USER
                 })
             }, {
-                label: ( localize(3442, "Show Logs")),
+                label: ( localize(3493, "Show Logs")),
                 run: () => this.commandService.executeCommand(showWindowLogActionId)
             }];
         }

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

@@ -23,7 +23,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
         super(prefix, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localize(3443, "No matching editors")),
+                label: ( localize(3494, "No matching editors")),
                 groupId: -1
             }
         });
@@ -139,18 +139,18 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 ariaLabel: (() => {
                     if (mapGroupIdToGroupAriaLabel.size > 1) {
                         return isDirty ? ( localize(
-                            3444,
+                            3495,
                             "{0}, unsaved changes, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         )) : ( localize(
-                            3445,
+                            3496,
                             "{0}, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         ));
                     }
-                    return isDirty ? ( localize(3446, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
+                    return isDirty ? ( localize(3497, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
                 })(),
                 description,
                 iconClasses: getIconClasses(
@@ -164,7 +164,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 buttons: (() => {
                     return [{
                         iconClass: isDirty ? ("dirty-editor " + ThemeIcon.asClassName(Codicon.closeDirty)) : ThemeIcon.asClassName(Codicon.close),
-                        tooltip: ( localize(3447, "Close Editor")),
+                        tooltip: ( localize(3498, "Close Editor")),
                         alwaysVisible: isDirty
                     }];
                 })(),