@codingame/monaco-vscode-api 31.0.0 → 32.0.0

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

@@ -24,7 +24,7 @@ import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAc
 import { SideBySideEditor } from './sideBySideEditor.js';
 import { TextDiffEditor } from './textDiffEditor.js';
 import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, IsSessionsWindowContext, EditorPartModalContext, EditorPartModalSidebarContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext } from '../../../common/contextkeys.js';
-import { EditorInputCapabilities, EditorsOrder, CloseDirection, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
+import { EditorInputCapabilities, EditorsOrder, CloseDirection, isDiffEditorInput, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
 import { GroupsOrder, GroupLocation, preferredSideBySideGroupDirection, GroupDirection } from '../../../services/editor/common/editorGroupsService.js';
@@ -34,7 +34,10 @@ import { IEditorResolverService } from '../../../services/editor/common/editorRe
 import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IPathService } from '../../../services/path/common/pathService.service.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.service.js';
+import { IWorkingCopyEditorService } from '../../../services/workingCopy/common/workingCopyEditorService.service.js';
+import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.service.js';
 import { DIFF_FOCUS_SECONDARY_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_OTHER_SIDE, registerDiffEditorCommands } from './diffEditorCommands.js';
 import { resolveCommandsContext } from './editorCommandsContext.js';
 import { prepareMoveCopyEditors } from './editor.js';
@@ -144,11 +147,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(true, args, accessor),
         metadata: {
-            description: ( localize(3438, "Move the active editor by tabs or groups")),
+            description: ( localize(3480, "Move the active editor by tabs or groups")),
             args: [{
-                name: ( localize(3439, "Active editor move argument")),
+                name: ( localize(3481, "Active editor move argument")),
                 description: ( localize(
-                    3440,
+                    3482,
                     "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,
@@ -163,11 +166,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(false, args, accessor),
         metadata: {
-            description: ( localize(3441, "Copy the active editor by groups")),
+            description: ( localize(3483, "Copy the active editor by groups")),
             args: [{
-                name: ( localize(3442, "Active editor copy argument")),
+                name: ( localize(3484, "Active editor copy argument")),
                 description: ( localize(
-                    3443,
+                    3485,
                     "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,
@@ -377,7 +380,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(3444, "Horizontal")), ( localize(3445, "Vertical"))]
+                            "enumDescriptions": [( localize(3486, "Horizontal")), ( localize(3487, "Vertical"))]
                         },
                         "groups": {
                             "$ref": "#/definitions/editorGroupsSchema",
@@ -1005,6 +1008,9 @@ function registerCloseEditorCommands() {
         const editorService = accessor.get(IEditorService);
         const editorResolverService = accessor.get(IEditorResolverService);
         const telemetryService = accessor.get(ITelemetryService);
+        const textFileService = accessor.get(ITextFileService);
+        const workingCopyService = accessor.get(IWorkingCopyService);
+        const workingCopyEditorService = accessor.get(IWorkingCopyEditorService);
         const resolvedContext = resolveCommandsContext(
             args,
             editorService,
@@ -1017,7 +1023,8 @@ function registerCloseEditorCommands() {
             editors
         } of resolvedContext.groupedEditors) {
             for (const editor of editors) {
-                const untypedEditor = editor.toUntyped();
+                const editorToResolve = isDiffEditorInput(editor) ? editor.modified : editor;
+                const untypedEditor = editorToResolve.toUntyped();
                 if (!untypedEditor) {
                     return;
                 }
@@ -1034,15 +1041,28 @@ function registerCloseEditorCommands() {
                     editorReplacementsInGroup = [];
                     editorReplacements.set(group, editorReplacementsInGroup);
                 }
+                const resource = editorToResolve.resource;
+                let forceReplaceDirty = !!resource && (resource.scheme === Schemas.untitled || textFileService.isDirty(resource));
+                if (forceReplaceDirty && editorToResolve.isDirty()) {
+                    for (const workingCopy of workingCopyService.dirtyWorkingCopies) {
+                        if (isEqual(workingCopy.resource, resource)) {
+                            continue;
+                        }
+                        if (workingCopyEditorService.findEditor(workingCopy)?.editor === editorToResolve) {
+                            forceReplaceDirty = false;
+                            break;
+                        }
+                    }
+                }
                 editorReplacementsInGroup.push({
                     editor: editor,
                     replacement: resolvedEditor.editor,
-                    forceReplaceDirty: editor.resource?.scheme === Schemas.untitled,
+                    forceReplaceDirty,
                     options: resolvedEditor.options
                 });
                 telemetryService.publicLog2("workbenchEditorReopen", {
-                    scheme: editor.resource?.scheme ?? "",
-                    ext: editor.resource ? extname(editor.resource) : "",
+                    scheme: editorToResolve.resource?.scheme ?? "",
+                    ext: editorToResolve.resource ? extname(editorToResolve.resource) : "",
                     from: editor.editorId ?? "",
                     to: resolvedEditor.editor.editorId ?? ""
                 });
@@ -1120,7 +1140,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3446, "Split Editor in Group")),
+                title: ( localize2(3488, "Split Editor in Group")),
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -1183,7 +1203,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: ( localize2(3447, "Join Editor in Group")),
+                title: ( localize2(3489, "Join Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -1210,7 +1230,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3448, "Toggle Split Editor in Group")),
+                title: ( localize2(3490, "Toggle Split Editor in Group")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -1240,7 +1260,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: ( localize2(3449, "Toggle Layout of Split Editor in Group")),
+                title: ( localize2(3491, "Toggle Layout of Split Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1264,7 +1284,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: ( localize2(3450, "Focus First Side in Active Editor")),
+                title: ( localize2(3492, "Focus First Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1285,7 +1305,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: ( localize2(3451, "Focus Second Side in Active Editor")),
+                title: ( localize2(3493, "Focus Second Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1306,7 +1326,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: ( localize2(3452, "Focus Other Side in Active Editor")),
+                title: ( localize2(3494, "Focus Other Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1374,7 +1394,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3453, "Toggle Editor Group Lock")),
+                title: ( localize2(3495, "Toggle Editor Group Lock")),
                 category: Categories.View,
                 f1: true
             });
@@ -1387,7 +1407,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3454, "Lock Editor Group")),
+                title: ( localize2(3496, "Lock Editor Group")),
                 category: Categories.View,
                 precondition: ( ActiveEditorGroupLockedContext.toNegated()),
                 f1: true
@@ -1401,7 +1421,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3455, "Unlock Editor Group")),
+                title: ( localize2(3497, "Unlock Editor Group")),
                 precondition: ActiveEditorGroupLockedContext,
                 category: Categories.View,
                 f1: true
@@ -1482,7 +1502,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID,
-                title: ( localize2(3456, "Open Modal Editor in Main Window")),
+                title: ( localize2(3498, "Open Modal Editor in Main Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.openInProduct,
@@ -1511,17 +1531,17 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID,
-                title: ( localize2(3457, "Open Modal Editor in New Window")),
+                title: ( localize2(3499, "Open Modal Editor in New Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.emptyWindow,
                 precondition: EditorPartModalContext,
-                menu: {
-                    id: MenuId.ModalEditorTitle,
-                    group: "navigation",
+                menu: [{
+                    id: MenuId.ModalEditorTitleContext,
+                    group: "1_window",
                     order: 0,
                     when: IsSessionsWindowContext
-                }
+                }]
             });
         }
         async run(accessor) {
@@ -1548,7 +1568,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID,
-                title: ( localize2(3458, "Toggle Modal Editor Sidebar")),
+                title: ( localize2(3500, "Toggle Modal Editor Sidebar")),
                 category: Categories.View,
                 f1: true,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalSidebarContext))
@@ -1568,19 +1588,19 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID,
-                title: ( localize2(3459, "Maximize Modal Editor")),
+                title: ( localize2(3501, "Maximize Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 precondition: EditorPartModalContext,
                 icon: Codicon.screenFull,
                 toggled: {
                     condition: EditorPartModalMaximizedContext,
-                    title: ( localize(3460, "Restore Modal Editor"))
+                    title: ( localize(3502, "Restore Modal Editor"))
                 },
                 menu: {
                     id: MenuId.ModalEditorTitle,
                     group: "navigation",
-                    order: 1
+                    order: 99
                 }
             });
         }
@@ -1598,7 +1618,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: CLOSE_MODAL_EDITOR_COMMAND_ID,
-                title: ( localize2(3461, "Close Modal Editor")),
+                title: ( localize2(3503, "Close Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.close,
@@ -1615,7 +1635,7 @@ function registerModalEditorCommands() {
                 menu: {
                     id: MenuId.ModalEditorTitle,
                     group: "navigation",
-                    order: 2
+                    order: 100
                 }
             });
         }
@@ -1633,7 +1653,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID,
-                title: ( localize2(3462, "Navigate to Previous Item in Modal Editor")),
+                title: ( localize2(3504, "Navigate to Previous Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {
@@ -1660,7 +1680,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID,
-                title: ( localize2(3463, "Navigate to Next Item in Modal Editor")),
+                title: ( localize2(3505, "Navigate to Next Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {

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

@@ -46,7 +46,8 @@ function getCommandsContext(commandArgs, editorService, editorGroupsService, lis
     let isListAction = list instanceof List && list.getHTMLElement() === getActiveElement();
     let editorContext = getEditorContextFromCommandArgs(commandArgs, isListAction, editorService, editorGroupsService, listService);
     if (!editorContext) {
-        const activeGroup = editorGroupsService.activeGroup;
+        const modalEditorPart = editorGroupsService.activeModalEditorPart;
+        const activeGroup = modalEditorPart?.activeGroup ?? editorGroupsService.activeGroup;
         const activeEditor = activeGroup.activeEditor;
         editorContext = {
             groupId: activeGroup.id,

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(3472, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
+            this.dropIntoPromptElement = renderFormattedText(( localize(3515, "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.js

@@ -409,7 +409,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(3473, "Empty editor group actions")),
+            ariaLabel: ( localize(3516, "Empty editor group actions")),
             highlightToggledItems: true
         })));
         const containerToolbarMenu = this._register(
@@ -500,7 +500,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(3474, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute("aria-label", ( localize(3517, "{0} (empty)", this.ariaLabel)));
         }
         else {
             this.element.classList.remove("empty");
@@ -743,15 +743,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     get label() {
         if (this.groupsLabel) {
-            return localize(3475, "{0}: Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3518, "{0}: Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3476, "Group {0}", this._index + 1);
+        return localize(3519, "Group {0}", this._index + 1);
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return localize(3477, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3520, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3478, "Editor Group {0}", this._index + 1);
+        return localize(3521, "Editor Group {0}", this._index + 1);
     }
     get disposed() {
         return this._disposed;
@@ -1005,7 +1005,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 }
                 if (changed) {
                     this._onDidActiveEditorChange.fire({
-                        editor
+                        editor,
+                        isExplicit: options?.isExplicit
                     });
                 }
                 if (error) {
@@ -1131,7 +1132,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(3479, "Try saving or reverting the editor first and then try again.")));
+                this.dialogService.error(canMoveVeto, ( localize(3522, "Try saving or reverting the editor first and then try again.")));
                 return false;
             }
         }

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

@@ -20,7 +20,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(3480, "Open Chat")),
+    text: ( localize(3523, "Open Chat")),
     id: "workbench.action.chat.open",
     when: {
         native: showChatContextKey,
@@ -28,53 +28,53 @@ const openChat = {
     }
 };
 const showCommands = {
-    text: ( localize(3481, "Show All Commands")),
+    text: ( localize(3524, "Show All Commands")),
     id: "workbench.action.showCommands"
 };
 const gotoFile = {
-    text: ( localize(3482, "Go to File")),
+    text: ( localize(3525, "Go to File")),
     id: "workbench.action.quickOpen"
 };
 const openFile = {
-    text: ( localize(3483, "Open File")),
+    text: ( localize(3526, "Open File")),
     id: "workbench.action.files.openFile"
 };
 const openFolder = {
-    text: ( localize(3484, "Open Folder")),
+    text: ( localize(3527, "Open Folder")),
     id: "workbench.action.files.openFolder"
 };
 const openFileOrFolder = {
-    text: ( localize(3485, "Open File or Folder")),
+    text: ( localize(3528, "Open File or Folder")),
     id: "workbench.action.files.openFileFolder"
 };
 const openRecent = {
-    text: ( localize(3486, "Open Recent")),
+    text: ( localize(3529, "Open Recent")),
     id: "workbench.action.openRecent"
 };
 const newUntitledFile = {
-    text: ( localize(3487, "New Untitled Text File")),
+    text: ( localize(3530, "New Untitled Text File")),
     id: "workbench.action.files.newUntitledFile"
 };
 const findInFiles = {
-    text: ( localize(3488, "Find in Files")),
+    text: ( localize(3531, "Find in Files")),
     id: "workbench.action.findInFiles"
 };
 const toggleTerminal = {
-    text: ( localize(3489, "Toggle Terminal")),
+    text: ( localize(3532, "Toggle Terminal")),
     id: "workbench.action.terminal.toggleTerminal",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const startDebugging = {
-    text: ( localize(3490, "Start Debugging")),
+    text: ( localize(3533, "Start Debugging")),
     id: "workbench.action.debug.start",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const openSettings = {
-    text: ( localize(3491, "Open Settings")),
+    text: ( localize(3534, "Open Settings")),
     id: "workbench.action.openSettings"
 };
 const baseEntries = [openChat, showCommands];

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

@@ -144,7 +144,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         }
         if (!message) {
-            message = ( localize(3492, "Unable to open '{0}'", editor.getName()));
+            message = ( localize(3535, "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(3493, "&&OK")),
+                label: ( localize(3536, "&&OK")),
                 run: () => undefined
             });
         }

package/vscode/src/vs/workbench/browser/parts/editor/editorPart.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 { EditorPartMultipleEditorGroupsContext, EditorPartMaximizedEditorGroupContext, EditorTabsVisibleContext } from '../../../common/contextkeys.js';
+import { EditorPartMultipleEditorGroupsContext, EditorPartMaximizedEditorGroupContext, EditorTabsVisibleContext, IsTopRightEditorGroupContext } 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';
@@ -863,12 +863,37 @@ let EditorPart = class EditorPart extends Part {
         const updateEditorTabsVisibleContext = () => {
             editorTabsVisibleContext.set(this.partOptions.showTabs === "multiple");
         };
+        const updateTopRightGroupContextKey = () => {
+            if (!this.gridWidget || !this._contentDimension) {
+                return;
+            }
+            let topRightGroup;
+            for (const group of this.groups) {
+                if (this.gridWidget.getNeighborViews(group, Direction.Up).length === 0 && this.gridWidget.getNeighborViews(group, Direction.Right).length === 0) {
+                    topRightGroup = group;
+                    break;
+                }
+            }
+            for (const group of this.groups) {
+                const contextKey = this.editorPartsView.bind(IsTopRightEditorGroupContext, group);
+                contextKey.set(group === topRightGroup);
+            }
+        };
         updateContextKeys();
         updateEditorTabsVisibleContext();
-        this._register(this.onDidAddGroup(() => updateContextKeys()));
-        this._register(this.onDidRemoveGroup(() => updateContextKeys()));
+        updateTopRightGroupContextKey();
+        this._register(this.onDidAddGroup(() => {
+            updateContextKeys();
+            updateTopRightGroupContextKey();
+        }));
+        this._register(this.onDidRemoveGroup(() => {
+            updateContextKeys();
+            updateTopRightGroupContextKey();
+        }));
         this._register(this.onDidChangeGroupMaximized(() => updateContextKeys()));
         this._register(this.onDidChangeEditorPartOptions(() => updateEditorTabsVisibleContext()));
+        this._register(this.onDidMoveGroup(() => updateTopRightGroupContextKey()));
+        this._register(this.onDidLayout(() => updateTopRightGroupContextKey()));
     }
     setupDragAndDropSupport(parent, container) {
         this._register(this.createEditorDropTarget(container, Object.create(null)));

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

@@ -236,7 +236,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return localize(3494, "Window {0}", index + 1);
+        return localize(3537, "Window {0}", index + 1);
     }
     getPartByDocument(document) {
         if (this._parts.size > 1) {

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(3495, "Workspace Trust Required"));
+        this.LABEL = ( localize(3538, "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(
-                3496,
+                3539,
                 "The file is not displayed in the editor because trust has not been granted to the folder."
             )) : ( localize(
-                3497,
+                3540,
                 "The file is not displayed in the editor because trust has not been granted to the workspace."
             )),
             actions: [{
-                label: ( localize(3498, "Manage Workspace Trust")),
+                label: ( localize(3541, "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(3499, "Error Editor"));
+        this.LABEL = ( localize(3542, "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(3500, "The editor could not be opened because the file was not found."));
+            label = ( localize(3543, "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(
-                3501,
+                3544,
                 "The editor could not be opened due to an unexpected error. Please consult the log for more details."
             ));
         } else {
-            label = ( localize(3502, "The editor could not be opened due to an unexpected error."));
+            label = ( localize(3545, "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(3503, "Try Again")),
+                label: ( localize(3546, "Try Again")),
                 run: () => this.group.openEditor(input, {
                     ...options,
                     source: EditorOpenSource.USER
                 })
             }, {
-                label: ( localize(3504, "Show Logs")),
+                label: ( localize(3547, "Show Logs")),
                 run: () => this.commandService.executeCommand(showWindowLogActionId)
             }];
         }

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

@@ -24,7 +24,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
         super(prefix, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localize(3505, "No matching editors")),
+                label: ( localize(3548, "No matching editors")),
                 groupId: -1
             }
         });
@@ -141,18 +141,18 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 ariaLabel: (() => {
                     if (mapGroupIdToGroupAriaLabel.size > 1) {
                         return isDirty ? ( localize(
-                            3506,
+                            3549,
                             "{0}, unsaved changes, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         )) : ( localize(
-                            3507,
+                            3550,
                             "{0}, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         ));
                     }
-                    return isDirty ? ( localize(3508, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
+                    return isDirty ? ( localize(3551, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
                 })(),
                 description,
                 iconPath: URI.isUri(icon) ? {
@@ -163,7 +163,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 buttons: (() => {
                     return [{
                         iconClass: isDirty ? ("dirty-editor " + ThemeIcon.asClassName(Codicon.closeDirty)) : ThemeIcon.asClassName(Codicon.close),
-                        tooltip: ( localize(3509, "Close Editor")),
+                        tooltip: ( localize(3552, "Close Editor")),
                         alwaysVisible: isDirty
                     }];
                 })(),