@codingame/monaco-vscode-api 36.2.7 → 37.1.0

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

@@ -148,11 +148,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(true, args, accessor),
         metadata: {
-            description: ( localize(3637, "Move the active editor by tabs or groups")),
+            description: ( localize(3913, "Move the active editor by tabs or groups")),
             args: [{
-                name: ( localize(3638, "Active editor move argument")),
+                name: ( localize(3914, "Active editor move argument")),
                 description: ( localize(
-                    3639,
+                    3915,
                     "Argument Properties:\n\t* 'to': String value providing where to move.\n\t* 'by': String value providing the unit for move (by tab or by group).\n\t* 'value': Number value providing how many positions or an absolute position to move."
                 )),
                 constraint: isSelectedEditorsMoveCopyArg,
@@ -167,11 +167,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(false, args, accessor),
         metadata: {
-            description: ( localize(3640, "Copy the active editor by groups")),
+            description: ( localize(3916, "Copy the active editor by groups")),
             args: [{
-                name: ( localize(3641, "Active editor copy argument")),
+                name: ( localize(3917, "Active editor copy argument")),
                 description: ( localize(
-                    3642,
+                    3918,
                     "Argument Properties:\n\t* 'to': String value providing where to copy.\n\t* 'value': Number value providing how many positions or an absolute position to copy."
                 )),
                 constraint: isSelectedEditorsMoveCopyArg,
@@ -381,7 +381,7 @@ function registerEditorGroupsLayoutCommands() {
                             "default": 0,
                             "description": `The orientation of the root group in the layout. 0 for horizontal, 1 for vertical.`,
                             "enum": [0, 1],
-                            "enumDescriptions": [( localize(3643, "Horizontal")), ( localize(3644, "Vertical"))]
+                            "enumDescriptions": [( localize(3919, "Horizontal")), ( localize(3920, "Vertical"))]
                         },
                         "groups": {
                             "$ref": "#/definitions/editorGroupsSchema",
@@ -1142,7 +1142,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3645, "Split Editor in Group")),
+                title: ( localize2(3921, "Split Editor in Group")),
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -1205,7 +1205,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: ( localize2(3646, "Join Editor in Group")),
+                title: ( localize2(3922, "Join Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -1232,7 +1232,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3647, "Toggle Split Editor in Group")),
+                title: ( localize2(3923, "Toggle Split Editor in Group")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -1262,7 +1262,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: ( localize2(3648, "Toggle Layout of Split Editor in Group")),
+                title: ( localize2(3924, "Toggle Layout of Split Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1286,7 +1286,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: ( localize2(3649, "Focus First Side in Active Editor")),
+                title: ( localize2(3925, "Focus First Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1307,7 +1307,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: ( localize2(3650, "Focus Second Side in Active Editor")),
+                title: ( localize2(3926, "Focus Second Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1328,7 +1328,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: ( localize2(3651, "Focus Other Side in Active Editor")),
+                title: ( localize2(3927, "Focus Other Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1396,7 +1396,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3652, "Toggle Editor Group Lock")),
+                title: ( localize2(3928, "Toggle Editor Group Lock")),
                 category: Categories.View,
                 f1: true
             });
@@ -1409,7 +1409,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3653, "Lock Editor Group")),
+                title: ( localize2(3929, "Lock Editor Group")),
                 category: Categories.View,
                 precondition: ( ActiveEditorGroupLockedContext.toNegated()),
                 f1: true
@@ -1423,7 +1423,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3654, "Unlock Editor Group")),
+                title: ( localize2(3930, "Unlock Editor Group")),
                 precondition: ActiveEditorGroupLockedContext,
                 category: Categories.View,
                 f1: true
@@ -1504,7 +1504,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID,
-                title: ( localize2(3655, "Open Modal Editor in Main Window")),
+                title: ( localize2(3931, "Open Modal Editor in Main Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.openInProduct,
@@ -1533,7 +1533,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID,
-                title: ( localize2(3656, "Open Modal Editor in New Window")),
+                title: ( localize2(3932, "Open Modal Editor in New Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.emptyWindow,
@@ -1570,7 +1570,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID,
-                title: ( localize2(3657, "Toggle Modal Editor Sidebar")),
+                title: ( localize2(3933, "Toggle Modal Editor Sidebar")),
                 category: Categories.View,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalSidebarContext))
@@ -1590,14 +1590,14 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID,
-                title: ( localize2(3658, "Maximize Modal Editor")),
+                title: ( localize2(3934, "Maximize Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 precondition: EditorPartModalContext,
                 icon: Codicon.screenFull,
                 toggled: {
                     condition: EditorPartModalMaximizedContext,
-                    title: ( localize(3659, "Restore Modal Editor"))
+                    title: ( localize(3935, "Restore Modal Editor"))
                 },
                 menu: {
                     id: MenuId.ModalEditorTitle,
@@ -1620,7 +1620,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: CLOSE_MODAL_EDITOR_COMMAND_ID,
-                title: ( localize2(3660, "Close Modal Editor")),
+                title: ( localize2(3936, "Close Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.close,
@@ -1659,7 +1659,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID,
-                title: ( localize2(3661, "Navigate to Previous Item in Modal Editor")),
+                title: ( localize2(3937, "Navigate to Previous Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {
@@ -1686,7 +1686,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID,
-                title: ( localize2(3662, "Navigate to Next Item in Modal Editor")),
+                title: ( localize2(3938, "Navigate to Next Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {

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

@@ -59,6 +59,7 @@ let DropOverlay = class DropOverlay extends Themable {
     }
     constructor(
         groupView,
+        supportsSplitting,
         themeService,
         configurationService,
         instantiationService,
@@ -69,6 +70,7 @@ let DropOverlay = class DropOverlay extends Themable {
     ) {
         super(themeService);
         this.groupView = groupView;
+        this.supportsSplitting = supportsSplitting;
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
         this.editorService = editorService;
@@ -97,7 +99,7 @@ let DropOverlay = class DropOverlay extends Themable {
         this.overlay = $(".editor-group-overlay-indicator");
         container.appendChild(this.overlay);
         if (this.enableDropIntoEditor) {
-            this.dropIntoPromptElement = renderFormattedText(( localize(3672, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
+            this.dropIntoPromptElement = renderFormattedText(( localize(3948, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
             this.dropIntoPromptElement.classList.add("editor-group-overlay-drop-into-prompt");
             this.overlay.appendChild(this.dropIntoPromptElement);
         }
@@ -155,8 +157,8 @@ let DropOverlay = class DropOverlay extends Themable {
                         }
                     }
                 }
-                let splitOnDragAndDrop = !!this.groupView.groupsView.partOptions.splitOnDragAndDrop;
-                if (this.isToggleSplitOperation(e)) {
+                let splitOnDragAndDrop = this.supportsSplitting && !!this.groupView.groupsView.partOptions.splitOnDragAndDrop;
+                if (this.supportsSplitting && this.isToggleSplitOperation(e)) {
                     splitOnDragAndDrop = !splitOnDragAndDrop;
                 }
                 this.positionOverlay(e.offsetX, e.offsetY, isDraggingGroup, splitOnDragAndDrop);
@@ -319,6 +321,22 @@ let DropOverlay = class DropOverlay extends Themable {
         const preferSplitVertically = this.groupView.groupsView.partOptions.openSideBySideDirection === "right";
         const editorControlWidth = this.groupView.element.clientWidth;
         const editorControlHeight = this.groupView.element.clientHeight - this.getOverlayOffsetHeight();
+        if (!enableSplitting) {
+            this.doPositionOverlay({
+                top: "0",
+                left: "0",
+                width: "100%",
+                height: "100%"
+            });
+            this.toggleDropIntoPrompt(true);
+            const overlay = assertReturnsDefined(this.overlay);
+            overlay.style.opacity = "1";
+            setTimeout(() => overlay.classList.add("overlay-move-transition"), 0);
+            this.currentDropOperation = {
+                splitDirection: undefined
+            };
+            return;
+        }
         let edgeWidthThresholdFactor;
         let edgeHeightThresholdFactor;
         if (enableSplitting) {
@@ -466,7 +484,7 @@ let DropOverlay = class DropOverlay extends Themable {
         this._disposed = true;
     }
 };
-DropOverlay = DropOverlay_1 = ( __decorate([( __param(1, IThemeService)), ( __param(2, IConfigurationService)), ( __param(3, IInstantiationService)), ( __param(4, IEditorService)), ( __param(5, IEditorGroupsService)), ( __param(6, ITreeViewsDnDService)), ( __param(7, IWorkspaceContextService))], DropOverlay));
+DropOverlay = DropOverlay_1 = ( __decorate([( __param(2, IThemeService)), ( __param(3, IConfigurationService)), ( __param(4, IInstantiationService)), ( __param(5, IEditorService)), ( __param(6, IEditorGroupsService)), ( __param(7, ITreeViewsDnDService)), ( __param(8, IWorkspaceContextService))], DropOverlay));
 let EditorDropTarget = class EditorDropTarget extends Themable {
     constructor(
         groupsView,
@@ -541,7 +559,7 @@ let EditorDropTarget = class EditorDropTarget extends Themable {
             if (!this.overlay) {
                 const targetGroupView = this.findTargetGroupView(target);
                 if (targetGroupView) {
-                    this._overlay = this.instantiationService.createInstance(DropOverlay, targetGroupView);
+                    this._overlay = this.instantiationService.createInstance(DropOverlay, targetGroupView, this.delegate.supportsSplitting !== false);
                 }
             }
         }

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

@@ -14,6 +14,7 @@ import { IKeybindingService } from "../../../../platform/keybinding/common/keybi
 import { MenuId } from "../../../../platform/actions/common/actions.js";
 import { IMenuService } from "../../../../platform/actions/common/actions.service.js";
 import { IContextMenuService } from "../../../../platform/contextview/browser/contextView.service.js";
+import { ICommandService } from "../../../../platform/commands/common/commands.service.js";
 import { IEditorOptions } from "../../../../platform/editor/common/editor.js";
 import { IFileDialogService } from "../../../../platform/dialogs/common/dialogs.service.js";
 import { IDialogService } from "../../../../platform/dialogs/common/dialogs.service.js";
@@ -45,6 +46,7 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
     private readonly hostService;
     private readonly dialogService;
     private readonly fileService;
+    private readonly commandService;
     static createNew(editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupsLabel: string, groupIndex: number, instantiationService: IInstantiationService, options?: IEditorGroupViewOptions): IEditorGroupView;
     static createFromSerialized(serialized: ISerializedEditorGroupModel, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupsLabel: string, groupIndex: number, instantiationService: IInstantiationService, options?: IEditorGroupViewOptions): IEditorGroupView;
     static createCopy(copyFrom: IEditorGroupView, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupsLabel: string, groupIndex: number, instantiationService: IInstantiationService, options?: IEditorGroupViewOptions): IEditorGroupView;
@@ -87,12 +89,14 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
      * `0` (default) is a no-op for all other layouts.
      */
     private _contentRightInset;
+    private readonly _onDidRelayout;
+    readonly onDidRelayout: Event<void>;
     private readonly disposedEditorsWorker;
     private readonly mapEditorToPendingConfirmation;
     private readonly containerToolBarMenuDisposable;
     private readonly whenRestoredPromise;
     readonly whenRestored: Promise<void>;
-    constructor(from: IEditorGroupView | ISerializedEditorGroupModel | null, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupsLabel: string, _index: number, options: IEditorGroupViewOptions | undefined, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, themeService: IThemeService, telemetryService: ITelemetryService, keybindingService: IKeybindingService, menuService: IMenuService, contextMenuService: IContextMenuService, fileDialogService: IFileDialogService, editorService: EditorServiceImpl, filesConfigurationService: IFilesConfigurationService, uriIdentityService: IUriIdentityService, logService: ILogService, editorResolverService: IEditorResolverService, hostService: IHostService, dialogService: IDialogService, fileService: IFileService);
+    constructor(from: IEditorGroupView | ISerializedEditorGroupModel | null, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupsLabel: string, _index: number, options: IEditorGroupViewOptions | undefined, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, themeService: IThemeService, telemetryService: ITelemetryService, keybindingService: IKeybindingService, menuService: IMenuService, contextMenuService: IContextMenuService, fileDialogService: IFileDialogService, editorService: EditorServiceImpl, filesConfigurationService: IFilesConfigurationService, uriIdentityService: IUriIdentityService, logService: ILogService, editorResolverService: IEditorResolverService, hostService: IHostService, dialogService: IDialogService, fileService: IFileService, commandService: ICommandService);
     private handleGroupContextKeys;
     private registerContainerListeners;
     private createContainerToolbar;
@@ -115,6 +119,7 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
     private onDidChangeEditorDirty;
     private onDidChangeEditorTransient;
     private onDidChangeEditorLabel;
+    private onDidChangeEditorCapabilities;
     private onDidChangeEditorSelection;
     private onDidVisibilityChange;
     private onDidGainFocus;
@@ -133,6 +138,8 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
     get editors(): EditorInput[];
     get count(): number;
     get stickyCount(): number;
+    /** The container that bounds the editor pane, excluding any docked content inset. */
+    get editorPaneContainer(): HTMLElement;
     get activeEditorPane(): IVisibleEditorPane | undefined;
     get activeEditor(): EditorInput | null;
     get selectedEditors(): EditorInput[];
@@ -190,6 +197,7 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
     private doCloseEditors;
     closeAllEditors(options: {
         excludeConfirming: true;
+        force?: boolean;
     }): boolean;
     closeAllEditors(options?: ICloseAllEditorsOptions): Promise<boolean>;
     private doCloseAllEditors;
@@ -211,9 +219,8 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
     } | undefined>;
     layout(width: number, height: number, top: number, left: number): void;
     /**
-     * Sets the right inset (px) reserved beside the editor pane while the title
-     * keeps the full group width, then relayouts. `0` restores the default
-     * full-width content.
+     * Sets the right inset reserved beside the editor header and pane while tabs remain full-width.
+     * `0` restores the default full-width content.
      */
     setContentRightInset(inset: number): void;
     relayout(): void;

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

@@ -4,7 +4,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import * as editorgroupview from './media/editorgroupview.css';
 import { isSerializedEditorGroupModel, EditorGroupModel, isGroupEditorCloseEvent, isGroupEditorOpenEvent } from '../../../common/editor/editorGroupModel.js';
 import { EditorResourceAccessor, SideBySideEditor, EditorInputCapabilities, TEXT_DIFF_EDITOR_ID, GroupModelChangeKind, DEFAULT_EDITOR_ASSOCIATION, EditorsOrder, EditorCloseContext, SaveReason, CloseDirection } from '../../../common/editor.js';
-import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
+import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCannotCloseContext, SideBySideEditorActiveContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Emitter, Relay } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -39,12 +39,15 @@ import { EventType as EventType$1 } from '../../../../base/browser/touch.js';
 import { fillActiveEditorViewState } from './editor.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { SubmenuAction, Separator } from '../../../../base/common/actions.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { getAvailableEditorTypes, createEditorTypeActions } from './editorTypePicker.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { hash } from '../../../../base/common/hash.js';
 import { getMimeTypes } from '../../../../editor/common/services/languagesAssociations.js';
 import { extname, isEqual } from '../../../../base/common/resources.js';
@@ -150,7 +153,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         editorResolverService,
         hostService,
         dialogService,
-        fileService
+        fileService,
+        commandService
     ) {
         super(themeService);
         this.editorPartsView = editorPartsView;
@@ -172,6 +176,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.hostService = hostService;
         this.dialogService = dialogService;
         this.fileService = fileService;
+        this.commandService = commandService;
         this._onDidFocus = this._register(( new Emitter()));
         this.onDidFocus = this._onDidFocus.event;
         this._onWillDispose = this._register(( new Emitter()));
@@ -191,6 +196,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this._onWillOpenEditor = this._register(( new Emitter()));
         this.onWillOpenEditor = this._onWillOpenEditor.event;
         this._contentRightInset = 0;
+        this._onDidRelayout = this._register(( new Emitter()));
+        this.onDidRelayout = this._onDidRelayout.event;
         this.disposedEditorsWorker = this._register(( new RunOnceWorker(editors => this.handleDisposedEditors(editors), 0)));
         this.mapEditorToPendingConfirmation = ( new Map());
         this.containerToolBarMenuDisposable = this._register(( new MutableDisposable()));
@@ -234,7 +241,11 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 this.editorPartsView,
                 this.groupsView,
                 this,
-                this.model
+                this.model,
+                options?.menuIds,
+                options?.showHeader === true,
+                options?.reserveHeaderSpace,
+                options?.useModernUITabs === true
             ));
             this.editorContainer = $(".editor-container");
             this.element.appendChild(this.editorContainer);
@@ -273,6 +284,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const groupTextCompareEditorActiveContext = this.editorPartsView.bind(TextCompareEditorActiveContext, this);
         const groupActiveEditorAvailableEditorIds = this.editorPartsView.bind(ActiveEditorAvailableEditorIdsContext, this);
         const groupActiveEditorCanSplitInGroupContext = this.editorPartsView.bind(ActiveEditorCanSplitInGroupContext, this);
+        const groupActiveEditorCannotCloseContext = this.editorPartsView.bind(ActiveEditorCannotCloseContext, this);
         const groupActiveEditorIsSideBySideEditorContext = this.editorPartsView.bind(SideBySideEditorActiveContext, this);
         const activeEditorListener = this._register(( new MutableDisposable()));
         const observeActiveEditor = () => {
@@ -290,6 +302,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 );
                 if (activeEditor) {
                     groupActiveEditorCanSplitInGroupContext.set(activeEditor.hasCapability(EditorInputCapabilities.CanSplitInGroup));
+                    groupActiveEditorCannotCloseContext.set(activeEditor.hasCapability(EditorInputCapabilities.CannotClose));
                     groupActiveEditorIsSideBySideEditorContext.set(activeEditor.typeId === SideBySideEditorInput.ID);
                     groupActiveEditorDirtyContext.set(activeEditor.isDirty() && !activeEditor.isSaving());
                     activeEditorListener.value = activeEditor.onDidChangeDirty(() => {
@@ -297,6 +310,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     });
                 } else {
                     groupActiveEditorCanSplitInGroupContext.set(false);
+                    groupActiveEditorCannotCloseContext.set(false);
                     groupActiveEditorIsSideBySideEditorContext.set(false);
                     groupActiveEditorDirtyContext.set(false);
                 }
@@ -366,6 +380,11 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     groupActiveEditorStickyContext.set(this.model.isSticky(this.model.activeEditor));
                 }
                 break;
+            case GroupModelChangeKind.EDITOR_CAPABILITIES:
+                if (e.editor && e.editor === this.model.activeEditor) {
+                    observeActiveEditor();
+                }
+                break;
             case GroupModelChangeKind.EDITORS_SELECTION:
                 multipleEditorsSelectedContext.set(this.model.selectedEditors.length > 1);
                 twoEditorsSelectedContext.set(this.model.selectedEditors.length === 2);
@@ -410,7 +429,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const toolbarContainer = $(".editor-group-container-toolbar");
         this.element.appendChild(toolbarContainer);
         const containerToolbar = this._register(( new ActionBar(toolbarContainer, {
-            ariaLabel: ( localize(3673, "Empty editor group actions")),
+            ariaLabel: ( localize(3949, "Empty editor group actions")),
             highlightToggledItems: true
         })));
         const containerToolbarMenu = this._register(
@@ -501,7 +520,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (this.isEmpty) {
             this.element.classList.add("empty");
             this.element.tabIndex = 0;
-            this.element.setAttribute("aria-label", ( localize(3674, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute("aria-label", ( localize(3950, "{0} (empty)", this.ariaLabel)));
         }
         else {
             this.element.classList.remove("empty");
@@ -591,6 +610,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         case GroupModelChangeKind.EDITOR_LABEL:
             this.onDidChangeEditorLabel(e.editor);
             break;
+        case GroupModelChangeKind.EDITOR_CAPABILITIES:
+            this.onDidChangeEditorCapabilities(e.editor);
+            break;
         }
     }
     onDidOpenEditor(editor, editorIndex) {
@@ -728,6 +750,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     onDidChangeEditorLabel(editor) {
         this.titleControl.updateEditorLabel(editor);
     }
+    onDidChangeEditorCapabilities(editor) {
+        this.titleControl.updateEditorCapabilities(editor);
+    }
     onDidChangeEditorSelection() {
         this.titleControl.updateEditorSelections();
     }
@@ -744,15 +769,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     get label() {
         if (this.groupsLabel) {
-            return localize(3675, "{0}: Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3951, "{0}: Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3676, "Group {0}", this._index + 1);
+        return localize(3952, "Group {0}", this._index + 1);
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return localize(3677, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3953, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3678, "Editor Group {0}", this._index + 1);
+        return localize(3954, "Editor Group {0}", this._index + 1);
     }
     get disposed() {
         return this._disposed;
@@ -801,6 +826,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     get stickyCount() {
         return this.model.stickyCount;
     }
+    get editorPaneContainer() {
+        return this.editorContainer;
+    }
     get activeEditorPane() {
         return this.editorPane ? this.editorPane.activeEditorPane ?? undefined : undefined;
     }
@@ -1133,7 +1161,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (!keepCopy || editor.hasCapability(EditorInputCapabilities.Singleton) ) {
             const canMoveVeto = editor.canMove(this.id, target.id);
             if (typeof canMoveVeto === "string") {
-                this.dialogService.error(canMoveVeto, ( localize(3679, "Try saving or reverting the editor first and then try again.")));
+                this.dialogService.error(canMoveVeto, ( localize(3955, "Try saving or reverting the editor first and then try again.")));
                 return false;
             }
         }
@@ -1195,6 +1223,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (!editor) {
             return false;
         }
+        if (!options?.force && !internalOptions?.force && editor.hasCapability(EditorInputCapabilities.CannotClose)) {
+            return false;
+        }
         const veto = await this.handleCloseConfirmation([editor]);
         if (veto) {
             return false;
@@ -1411,7 +1442,12 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (this.isEmpty) {
             return true;
         }
-        const editors = this.doGetEditorsToClose(args);
+        const editors = this.doGetEditorsToClose(args).filter(
+            editor => options?.force || !editor.hasCapability(EditorInputCapabilities.CannotClose)
+        );
+        if (!editors.length) {
+            return true;
+        }
         const veto = await this.handleCloseConfirmation(editors.slice(0));
         if (veto) {
             return false;
@@ -1467,7 +1503,13 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.doCloseAllEditors(options);
             return true;
         }
-        return this.handleCloseConfirmation(this.model.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, options)).then(veto => {
+        const editors = this.model.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, options).filter(
+            editor => options?.force || !editor.hasCapability(EditorInputCapabilities.CannotClose)
+        );
+        if (!editors.length) {
+            return true;
+        }
+        return this.handleCloseConfirmation(editors).then(veto => {
             if (veto) {
                 return false;
             }
@@ -1476,7 +1518,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         });
     }
     doCloseAllEditors(options) {
-        let editors = this.model.getEditors(EditorsOrder.SEQUENTIAL, options);
+        let editors = this.model.getEditors(EditorsOrder.SEQUENTIAL, options).filter(
+            editor => options?.force || !editor.hasCapability(EditorInputCapabilities.CannotClose)
+        );
         if (options?.excludeConfirming) {
             editors = editors.filter(editor => !this.shouldConfirmClose(editor));
         }
@@ -1546,7 +1590,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     closed = await this.doCloseEditorWithConfirmationHandling(editor, {
                         preserveFocus: true
                     }, {
-                        context: EditorCloseContext.REPLACE
+                        context: EditorCloseContext.REPLACE,
+                        force: true
                     });
                 }
                 if (!closed) {
@@ -1565,7 +1610,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     await this.doCloseEditorWithConfirmationHandling(activeReplacement.editor, {
                         preserveFocus: true
                     }, {
-                        context: EditorCloseContext.REPLACE
+                        context: EditorCloseContext.REPLACE,
+                        force: true
                     });
                 }
             }
@@ -1598,6 +1644,22 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 shouldForwardArgs: true,
                 renderShortTitle: true
             }), "navigation", shouldInlineGroup);
+            if (menuId === MenuId.EditorTitle) {
+                const available = getAvailableEditorTypes(this.activeEditor, this.editorResolverService);
+                if (available) {
+                    const editorTypeActions = createEditorTypeActions(
+                        available,
+                        this.editorResolverService,
+                        this.commandService,
+                        this.editorService
+                    );
+                    const reopenWithSubmenu = ( new SubmenuAction("editor.reopenWith", ( localize(3956, "Reopen Editor With")), editorTypeActions));
+                    if (actions.secondary.length) {
+                        actions.secondary.push(( new Separator()));
+                    }
+                    actions.secondary.push(reopenWithSubmenu);
+                }
+            }
         } else {
             const onDidChangeEmitter = disposables.add(( new Emitter()));
             onDidChange = onDidChangeEmitter.event;
@@ -1657,12 +1719,12 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             left
         };
         this.element.classList.toggle("max-height-478px", height <= 478);
+        const contentWidth = Math.max(0, width - this._contentRightInset);
         const titleControlSize = this.titleControl.layout({
             container: ( new Dimension(width, height)),
             available: ( new Dimension(width, height - this.editorPane.minimumHeight))
-        });
+        }, contentWidth);
         this.progressBar.getContainer().style.top = `${Math.max(this.titleHeight.offset - 2, 0)}px`;
-        const contentWidth = Math.max(0, width - this._contentRightInset);
         const editorHeight = Math.max(0, height - titleControlSize.height);
         this.editorContainer.style.width = `${contentWidth}px`;
         this.editorContainer.style.height = `${editorHeight}px`;
@@ -1690,6 +1752,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 left
             } = this.lastLayout;
             this.layout(width, height, top, left);
+            this._onDidRelayout.fire();
         }
     }
     setBoundarySashes(sashes) {
@@ -1704,6 +1767,6 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         super.dispose();
     }
 };
-EditorGroupView = EditorGroupView_1 = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IContextKeyService)), ( __param(8, IThemeService)), ( __param(9, ITelemetryService)), ( __param(10, IKeybindingService)), ( __param(11, IMenuService)), ( __param(12, IContextMenuService)), ( __param(13, IFileDialogService)), ( __param(14, IEditorService)), ( __param(15, IFilesConfigurationService)), ( __param(16, IUriIdentityService)), ( __param(17, ILogService)), ( __param(18, IEditorResolverService)), ( __param(19, IHostService)), ( __param(20, IDialogService)), ( __param(21, IFileService))], EditorGroupView));
+EditorGroupView = EditorGroupView_1 = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IContextKeyService)), ( __param(8, IThemeService)), ( __param(9, ITelemetryService)), ( __param(10, IKeybindingService)), ( __param(11, IMenuService)), ( __param(12, IContextMenuService)), ( __param(13, IFileDialogService)), ( __param(14, IEditorService)), ( __param(15, IFilesConfigurationService)), ( __param(16, IUriIdentityService)), ( __param(17, ILogService)), ( __param(18, IEditorResolverService)), ( __param(19, IHostService)), ( __param(20, IDialogService)), ( __param(21, IFileService)), ( __param(22, ICommandService))], EditorGroupView));
 
 export { EditorGroupView };