@codingame/monaco-vscode-api 34.1.2 → 35.0.0

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

@@ -16,6 +16,7 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { EditorResolution } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen, WorkbenchTreeStickyScrollFocused } from '../../../../platform/list/browser/listService.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
@@ -147,11 +148,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(true, args, accessor),
         metadata: {
-            description: ( localize(3561, "Move the active editor by tabs or groups")),
+            description: ( localize(3637, "Move the active editor by tabs or groups")),
             args: [{
-                name: ( localize(3562, "Active editor move argument")),
+                name: ( localize(3638, "Active editor move argument")),
                 description: ( localize(
-                    3563,
+                    3639,
                     "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,
@@ -166,11 +167,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(false, args, accessor),
         metadata: {
-            description: ( localize(3564, "Copy the active editor by groups")),
+            description: ( localize(3640, "Copy the active editor by groups")),
             args: [{
-                name: ( localize(3565, "Active editor copy argument")),
+                name: ( localize(3641, "Active editor copy argument")),
                 description: ( localize(
-                    3566,
+                    3642,
                     "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,
@@ -380,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(3567, "Horizontal")), ( localize(3568, "Vertical"))]
+                            "enumDescriptions": [( localize(3643, "Horizontal")), ( localize(3644, "Vertical"))]
                         },
                         "groups": {
                             "$ref": "#/definitions/editorGroupsSchema",
@@ -1141,7 +1142,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3569, "Split Editor in Group")),
+                title: ( localize2(3645, "Split Editor in Group")),
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -1204,7 +1205,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: ( localize2(3570, "Join Editor in Group")),
+                title: ( localize2(3646, "Join Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -1231,7 +1232,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3571, "Toggle Split Editor in Group")),
+                title: ( localize2(3647, "Toggle Split Editor in Group")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -1261,7 +1262,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: ( localize2(3572, "Toggle Layout of Split Editor in Group")),
+                title: ( localize2(3648, "Toggle Layout of Split Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1285,7 +1286,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: ( localize2(3573, "Focus First Side in Active Editor")),
+                title: ( localize2(3649, "Focus First Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1306,7 +1307,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: ( localize2(3574, "Focus Second Side in Active Editor")),
+                title: ( localize2(3650, "Focus Second Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1327,7 +1328,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: ( localize2(3575, "Focus Other Side in Active Editor")),
+                title: ( localize2(3651, "Focus Other Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1395,7 +1396,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3576, "Toggle Editor Group Lock")),
+                title: ( localize2(3652, "Toggle Editor Group Lock")),
                 category: Categories.View,
                 f1: true
             });
@@ -1408,7 +1409,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3577, "Lock Editor Group")),
+                title: ( localize2(3653, "Lock Editor Group")),
                 category: Categories.View,
                 precondition: ( ActiveEditorGroupLockedContext.toNegated()),
                 f1: true
@@ -1422,7 +1423,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3578, "Unlock Editor Group")),
+                title: ( localize2(3654, "Unlock Editor Group")),
                 precondition: ActiveEditorGroupLockedContext,
                 category: Categories.View,
                 f1: true
@@ -1503,7 +1504,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID,
-                title: ( localize2(3579, "Open Modal Editor in Main Window")),
+                title: ( localize2(3655, "Open Modal Editor in Main Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.openInProduct,
@@ -1532,7 +1533,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID,
-                title: ( localize2(3580, "Open Modal Editor in New Window")),
+                title: ( localize2(3656, "Open Modal Editor in New Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.emptyWindow,
@@ -1569,7 +1570,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID,
-                title: ( localize2(3581, "Toggle Modal Editor Sidebar")),
+                title: ( localize2(3657, "Toggle Modal Editor Sidebar")),
                 category: Categories.View,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalSidebarContext))
@@ -1589,14 +1590,14 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID,
-                title: ( localize2(3582, "Maximize Modal Editor")),
+                title: ( localize2(3658, "Maximize Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 precondition: EditorPartModalContext,
                 icon: Codicon.screenFull,
                 toggled: {
                     condition: EditorPartModalMaximizedContext,
-                    title: ( localize(3583, "Restore Modal Editor"))
+                    title: ( localize(3659, "Restore Modal Editor"))
                 },
                 menu: {
                     id: MenuId.ModalEditorTitle,
@@ -1619,7 +1620,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: CLOSE_MODAL_EDITOR_COMMAND_ID,
-                title: ( localize2(3584, "Close Modal Editor")),
+                title: ( localize2(3660, "Close Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.close,
@@ -1627,11 +1628,15 @@ function registerModalEditorCommands() {
                 keybinding: [{
                     primary: KeyCode.Escape,
                     weight: KeybindingWeight.WorkbenchContrib + 10,
-                    when: ( EditorContextKeys.focus.toNegated())
+                    when: ( ContextKeyExpr.and(( EditorContextKeys.focus.toNegated()), ( RawWorkbenchListFocusContextKey.negate())))
                 }, {
                     primary: KeyCode.Escape,
                     weight: KeybindingWeight.EditorContrib - 1,
                     when: EditorContextKeys.focus
+                }, {
+                    primary: KeyCode.Escape,
+                    weight: KeybindingWeight.WorkbenchContrib + 1,
+                    when: ( ContextKeyExpr.and(RawWorkbenchListFocusContextKey, ( WorkbenchTreeFindOpen.negate()), ( WorkbenchTreeStickyScrollFocused.negate())))
                 }],
                 menu: {
                     id: MenuId.ModalEditorTitle,
@@ -1654,7 +1659,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID,
-                title: ( localize2(3585, "Navigate to Previous Item in Modal Editor")),
+                title: ( localize2(3661, "Navigate to Previous Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {
@@ -1681,7 +1686,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID,
-                title: ( localize2(3586, "Navigate to Next Item in Modal Editor")),
+                title: ( localize2(3662, "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

@@ -97,7 +97,7 @@ let DropOverlay = class DropOverlay extends Themable {
         this.overlay = $(".editor-group-overlay-indicator");
         container.appendChild(this.overlay);
         if (this.enableDropIntoEditor) {
-            this.dropIntoPromptElement = renderFormattedText(( localize(3596, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
+            this.dropIntoPromptElement = renderFormattedText(( localize(3672, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
             this.dropIntoPromptElement.classList.add("editor-group-overlay-drop-into-prompt");
             this.overlay.appendChild(this.dropIntoPromptElement);
         }

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

@@ -80,6 +80,13 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
     private readonly progressBar;
     private readonly editorContainer;
     private readonly editorPane;
+    /**
+     * Optional inset (in px) reserved on the right of the editor pane while the
+     * title control keeps the full group width. Used by the Agents window to dock
+     * the detail panel beside the editor content under one full-width tab bar.
+     * `0` (default) is a no-op for all other layouts.
+     */
+    private _contentRightInset;
     private readonly disposedEditorsWorker;
     private readonly mapEditorToPendingConfirmation;
     private readonly containerToolBarMenuDisposable;
@@ -203,6 +210,12 @@ export declare class EditorGroupView extends Themable implements IEditorGroupVie
         height: number;
     } | 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.
+     */
+    setContentRightInset(inset: number): void;
     relayout(): void;
     setBoundarySashes(sashes: IBoundarySashes): void;
     toJSON(): ISerializedEditorGroupModel;

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

@@ -190,6 +190,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.onWillMoveEditor = this._onWillMoveEditor.event;
         this._onWillOpenEditor = this._register(( new Emitter()));
         this.onWillOpenEditor = this._onWillOpenEditor.event;
+        this._contentRightInset = 0;
         this.disposedEditorsWorker = this._register(( new RunOnceWorker(editors => this.handleDisposedEditors(editors), 0)));
         this.mapEditorToPendingConfirmation = ( new Map());
         this.containerToolBarMenuDisposable = this._register(( new MutableDisposable()));
@@ -409,7 +410,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(3597, "Empty editor group actions")),
+            ariaLabel: ( localize(3673, "Empty editor group actions")),
             highlightToggledItems: true
         })));
         const containerToolbarMenu = this._register(
@@ -500,7 +501,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(3598, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute("aria-label", ( localize(3674, "{0} (empty)", this.ariaLabel)));
         }
         else {
             this.element.classList.remove("empty");
@@ -743,15 +744,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     get label() {
         if (this.groupsLabel) {
-            return localize(3599, "{0}: Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3675, "{0}: Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3600, "Group {0}", this._index + 1);
+        return localize(3676, "Group {0}", this._index + 1);
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return localize(3601, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3677, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3602, "Editor Group {0}", this._index + 1);
+        return localize(3678, "Editor Group {0}", this._index + 1);
     }
     get disposed() {
         return this._disposed;
@@ -1132,7 +1133,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(3603, "Try saving or reverting the editor first and then try again.")));
+                this.dialogService.error(canMoveVeto, ( localize(3679, "Try saving or reverting the editor first and then try again.")));
                 return false;
             }
         }
@@ -1661,15 +1662,25 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             available: ( new Dimension(width, height - this.editorPane.minimumHeight))
         });
         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`;
         this.editorPane.layout({
-            width,
+            width: contentWidth,
             height: editorHeight,
             top: top + titleControlSize.height,
             left
         });
     }
+    setContentRightInset(inset) {
+        const next = Math.max(0, Math.round(inset));
+        if (next === this._contentRightInset) {
+            return;
+        }
+        this._contentRightInset = next;
+        this.relayout();
+    }
     relayout() {
         if (this.lastLayout) {
             const {

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

@@ -1,6 +1,7 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
+import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 import { IWorkspaceContextService } from "../../../../platform/workspace/common/workspace.service.js";
@@ -10,16 +11,18 @@ export declare class EditorGroupWatermark extends Disposable {
     private readonly contextKeyService;
     private readonly configurationService;
     private readonly storageService;
+    private readonly instantiationService;
     private static readonly CACHED_WHEN;
     private static readonly SETTINGS_KEY;
     private static readonly MINIMUM_ENTRIES;
     private readonly cachedWhen;
     private readonly shortcuts;
+    private readonly toolbarContainer;
     private readonly transientDisposables;
     private readonly keybindingLabels;
     private enabled;
     private workbenchState;
-    constructor(container: HTMLElement, keybindingService: IKeybindingService, contextService: IWorkspaceContextService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, storageService: IStorageService);
+    constructor(container: HTMLElement, keybindingService: IKeybindingService, contextService: IWorkspaceContextService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, storageService: IStorageService, instantiationService: IInstantiationService);
     private registerListeners;
     private render;
     private filterEntries;

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

@@ -6,10 +6,13 @@ import { coalesce, shuffle } from '../../../../base/common/arrays.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isMacintosh, isWeb, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { StorageScope, WillSaveStateReason, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
@@ -20,7 +23,7 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 var EditorGroupWatermark_1;
 const showChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals("chatSetupHidden", false)), ( ContextKeyExpr.equals("chatSetupDisabledInWorkspace", false))));
 const openChat = {
-    text: ( localize(3604, "Open Chat")),
+    text: ( localize(3680, "Open Chat")),
     id: "workbench.action.chat.open",
     when: {
         native: showChatContextKey,
@@ -28,53 +31,53 @@ const openChat = {
     }
 };
 const showCommands = {
-    text: ( localize(3605, "Show All Commands")),
+    text: ( localize(3681, "Show All Commands")),
     id: "workbench.action.showCommands"
 };
 const gotoFile = {
-    text: ( localize(3606, "Go to File")),
+    text: ( localize(3682, "Go to File")),
     id: "workbench.action.quickOpen"
 };
 const openFile = {
-    text: ( localize(3607, "Open File")),
+    text: ( localize(3683, "Open File")),
     id: "workbench.action.files.openFile"
 };
 const openFolder = {
-    text: ( localize(3608, "Open Folder")),
+    text: ( localize(3684, "Open Folder")),
     id: "workbench.action.files.openFolder"
 };
 const openFileOrFolder = {
-    text: ( localize(3609, "Open File or Folder")),
+    text: ( localize(3685, "Open File or Folder")),
     id: "workbench.action.files.openFileFolder"
 };
 const openRecent = {
-    text: ( localize(3610, "Open Recent")),
+    text: ( localize(3686, "Open Recent")),
     id: "workbench.action.openRecent"
 };
 const newUntitledFile = {
-    text: ( localize(3611, "New Untitled Text File")),
+    text: ( localize(3687, "New Untitled Text File")),
     id: "workbench.action.files.newUntitledFile"
 };
 const findInFiles = {
-    text: ( localize(3612, "Find in Files")),
+    text: ( localize(3688, "Find in Files")),
     id: "workbench.action.findInFiles"
 };
 const toggleTerminal = {
-    text: ( localize(3613, "Toggle Terminal")),
+    text: ( localize(3689, "Toggle Terminal")),
     id: "workbench.action.terminal.toggleTerminal",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const startDebugging = {
-    text: ( localize(3614, "Start Debugging")),
+    text: ( localize(3690, "Start Debugging")),
     id: "workbench.action.debug.start",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const openSettings = {
-    text: ( localize(3615, "Open Settings")),
+    text: ( localize(3691, "Open Settings")),
     id: "workbench.action.openSettings"
 };
 const baseEntries = [openChat, showCommands];
@@ -105,7 +108,8 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         contextService,
         contextKeyService,
         configurationService,
-        storageService
+        storageService,
+        instantiationService
     ) {
         super();
         this.keybindingService = keybindingService;
@@ -113,6 +117,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.storageService = storageService;
+        this.instantiationService = instantiationService;
         this.transientDisposables = this._register(( new DisposableStore()));
         this.keybindingLabels = this._register(( new DisposableStore()));
         this.enabled = false;
@@ -123,11 +128,27 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         );
         this.workbenchState = this.contextService.getWorkbenchState();
         const elements = h(
-            ".editor-group-watermark",
-            [h(".watermark-container", [h(".letterpress"), h(".shortcuts@shortcuts")])]
+            ".editor-group-watermark-wrapper",
+            [h(".editor-group-watermark-toolbar-container@toolbarContainer"), h(
+                ".editor-group-watermark",
+                [h(".watermark-container", [h(".letterpress"), h(".shortcuts@shortcuts")])]
+            )]
         );
         append(container, elements.root);
         this.shortcuts = elements.shortcuts;
+        this.toolbarContainer = elements.toolbarContainer;
+        this._register(this.instantiationService.createInstance(
+            MenuWorkbenchToolBar,
+            this.toolbarContainer,
+            MenuId.EditorGroupWatermarkToolbar,
+            {
+                hiddenItemStrategy: HiddenItemStrategy.NoHide,
+                highlightToggledItems: true,
+                menuOptions: {
+                    shouldForwardArgs: true
+                }
+            }
+        ));
         this.registerListeners();
         this.render();
     }
@@ -212,6 +233,6 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         return filteredEntries;
     }
 };
-EditorGroupWatermark = EditorGroupWatermark_1 = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IWorkspaceContextService)), ( __param(3, IContextKeyService)), ( __param(4, IConfigurationService)), ( __param(5, IStorageService))], EditorGroupWatermark));
+EditorGroupWatermark = EditorGroupWatermark_1 = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IWorkspaceContextService)), ( __param(3, IContextKeyService)), ( __param(4, IConfigurationService)), ( __param(5, IStorageService)), ( __param(6, IInstantiationService))], EditorGroupWatermark));
 
 export { EditorGroupWatermark };

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

@@ -144,7 +144,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         }
         if (!message) {
-            message = ( localize(3616, "Unable to open '{0}'", editor.getName()));
+            message = ( localize(3692, "Unable to open '{0}'", editor.getName()));
         }
         const buttons = [];
         if (errorActions && errorActions.length > 0) {
@@ -156,7 +156,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         } else {
             buttons.push({
-                label: ( localize(3617, "&&OK")),
+                label: ( localize(3693, "&&OK")),
                 run: () => undefined
             });
         }

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

@@ -92,6 +92,17 @@ export declare class EditorPart extends Part<IEditorPartMemento> implements IEdi
     private left;
     private _contentDimension;
     get contentDimension(): Dimension;
+    private _contentRightInset;
+    /**
+     * Reserves an inset (px) on the right of the editor content of the group(s) at the
+     * right edge of the editor part, while the title stays full width, so a docked panel
+     * can sit beside the editor content under one full-width tab bar. Only the right-edge
+     * groups (no neighbor to the right) are inset; interior groups in a split layout keep
+     * full-width content. Recomputed when the group topology changes. `0` (default)
+     * restores full-width content for all groups.
+     */
+    setContentRightInset(inset: number): void;
+    private applyContentRightInset;
     private _activeGroup;
     get activeGroup(): IEditorGroupView;
     readonly sideGroup: IEditorSideGroup;
@@ -178,6 +189,13 @@ export declare class EditorPart extends Part<IEditorPartMemento> implements IEdi
     private get isEmpty();
     setBoundarySashes(sashes: IBoundarySashes): void;
     layout(width: number, height: number, top: number, left: number): void;
+    /**
+     * Returns the top and bottom margins (in pixels) to subtract from the editor height
+     * when the floating panels experiment is active. Accounts for panel position (a top
+     * panel pushes the editor down) and status bar visibility (hidden status bar means
+     * the editor is at the window bottom edge and gets a doubled bottom margin).
+     */
+    private getFloatingPanelHeightInsets;
     private doLayout;
     protected saveState(): void;
     protected loadState(): IEditorPartUIState | undefined;