@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -49,6 +49,12 @@ export declare const COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID = "workbench.action.
 export declare const MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID = "workbench.action.moveEditorGroupToNewWindow";
 export declare const COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID = "workbench.action.copyEditorGroupToNewWindow";
 export declare const NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID = "workbench.action.newEmptyEditorWindow";
+export declare const CLOSE_MODAL_EDITOR_COMMAND_ID = "workbench.action.closeModalEditor";
+export declare const MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID = "workbench.action.moveModalEditorToMain";
+export declare const MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID = "workbench.action.moveModalEditorToWindow";
+export declare const TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID = "workbench.action.toggleModalEditorMaximized";
+export declare const NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID = "workbench.action.navigateModalEditorPrevious";
+export declare const NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID = "workbench.action.navigateModalEditorNext";
 export declare const API_OPEN_EDITOR_COMMAND_ID = "_workbench.open";
 export declare const API_OPEN_DIFF_EDITOR_COMMAND_ID = "_workbench.diff";
 export declare const API_OPEN_WITH_EDITOR_COMMAND_ID = "_workbench.openWith";

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

@@ -4,10 +4,11 @@ import { matchesScheme, Schemas } from '../../../../base/common/network.js';
 import { isEqual, extname } from '../../../../base/common/resources.js';
 import { isObject, isString, isUndefined, isNumber } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -22,12 +23,13 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
 import { SideBySideEditor } from './sideBySideEditor.js';
 import { TextDiffEditor } from './textDiffEditor.js';
-import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext } from '../../../common/contextkeys.js';
+import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, IsSessionsWindowContext, EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext } from '../../../common/contextkeys.js';
 import { EditorInputCapabilities, EditorsOrder, CloseDirection, 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';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
@@ -85,6 +87,12 @@ const COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID = "workbench.action.copyEditorToNew
 const MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID = "workbench.action.moveEditorGroupToNewWindow";
 const COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID = "workbench.action.copyEditorGroupToNewWindow";
 const NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID = "workbench.action.newEmptyEditorWindow";
+const CLOSE_MODAL_EDITOR_COMMAND_ID = "workbench.action.closeModalEditor";
+const MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID = "workbench.action.moveModalEditorToMain";
+const MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID = "workbench.action.moveModalEditorToWindow";
+const TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID = "workbench.action.toggleModalEditorMaximized";
+const NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID = "workbench.action.navigateModalEditorPrevious";
+const NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID = "workbench.action.navigateModalEditorNext";
 const API_OPEN_EDITOR_COMMAND_ID = "_workbench.open";
 const API_OPEN_DIFF_EDITOR_COMMAND_ID = "_workbench.diff";
 const API_OPEN_WITH_EDITOR_COMMAND_ID = "_workbench.openWith";
@@ -135,11 +143,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(true, args, accessor),
         metadata: {
-            description: ( localize(3384, "Move the active editor by tabs or groups")),
+            description: ( localize(3428, "Move the active editor by tabs or groups")),
             args: [{
-                name: ( localize(3385, "Active editor move argument")),
+                name: ( localize(3429, "Active editor move argument")),
                 description: ( localize(
-                    3386,
+                    3430,
                     "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,
@@ -154,11 +162,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(false, args, accessor),
         metadata: {
-            description: ( localize(3387, "Copy the active editor by groups")),
+            description: ( localize(3431, "Copy the active editor by groups")),
             args: [{
-                name: ( localize(3388, "Active editor copy argument")),
+                name: ( localize(3432, "Active editor copy argument")),
                 description: ( localize(
-                    3389,
+                    3433,
                     "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,
@@ -368,7 +376,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(3390, "Horizontal")), ( localize(3391, "Vertical"))]
+                            "enumDescriptions": [( localize(3434, "Horizontal")), ( localize(3435, "Vertical"))]
                         },
                         "groups": {
                             "$ref": "#/definitions/editorGroupsSchema",
@@ -1111,7 +1119,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3392, "Split Editor in Group")),
+                title: ( localize2(3436, "Split Editor in Group")),
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -1174,7 +1182,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: ( localize2(3393, "Join Editor in Group")),
+                title: ( localize2(3437, "Join Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -1201,7 +1209,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3394, "Toggle Split Editor in Group")),
+                title: ( localize2(3438, "Toggle Split Editor in Group")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -1231,7 +1239,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: ( localize2(3395, "Toggle Layout of Split Editor in Group")),
+                title: ( localize2(3439, "Toggle Layout of Split Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1255,7 +1263,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: ( localize2(3396, "Focus First Side in Active Editor")),
+                title: ( localize2(3440, "Focus First Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1276,7 +1284,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: ( localize2(3397, "Focus Second Side in Active Editor")),
+                title: ( localize2(3441, "Focus Second Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1297,7 +1305,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: ( localize2(3398, "Focus Other Side in Active Editor")),
+                title: ( localize2(3442, "Focus Other Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1365,7 +1373,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3399, "Toggle Editor Group Lock")),
+                title: ( localize2(3443, "Toggle Editor Group Lock")),
                 category: Categories.View,
                 f1: true
             });
@@ -1378,7 +1386,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3400, "Lock Editor Group")),
+                title: ( localize2(3444, "Lock Editor Group")),
                 category: Categories.View,
                 precondition: ( ActiveEditorGroupLockedContext.toNegated()),
                 f1: true
@@ -1392,7 +1400,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3401, "Unlock Editor Group")),
+                title: ( localize2(3445, "Unlock Editor Group")),
                 precondition: ActiveEditorGroupLockedContext,
                 category: Categories.View,
                 f1: true
@@ -1468,6 +1476,193 @@ function registerOtherEditorCommands() {
         }
     });
 }
+function registerModalEditorCommands() {
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID,
+                title: ( localize2(3446, "Open Modal Editor in Main Window")),
+                category: Categories.View,
+                f1: true,
+                icon: Codicon.openInProduct,
+                precondition: EditorPartModalContext,
+                menu: {
+                    id: MenuId.ModalEditorTitle,
+                    group: "navigation",
+                    order: 0,
+                    when: ( IsSessionsWindowContext.negate())
+                }
+            });
+        }
+        run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    part.close({
+                        mergeAllEditorsToMainPart: true
+                    });
+                    break;
+                }
+            }
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID,
+                title: ( localize2(3447, "Open Modal Editor in New Window")),
+                category: Categories.View,
+                f1: true,
+                icon: Codicon.emptyWindow,
+                precondition: EditorPartModalContext,
+                menu: {
+                    id: MenuId.ModalEditorTitle,
+                    group: "navigation",
+                    order: 0,
+                    when: IsSessionsWindowContext
+                }
+            });
+        }
+        async run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    const auxiliaryEditorPart = await editorGroupsService.createAuxiliaryEditorPart();
+                    for (const group of part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
+                        group.moveEditors(( group.editors.map(editor => ({
+                            editor,
+                            options: {
+                                preserveFocus: true
+                            }
+                        }))), auxiliaryEditorPart.activeGroup);
+                    }
+                    auxiliaryEditorPart.activeGroup.focus();
+                    part.close();
+                    break;
+                }
+            }
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID,
+                title: ( localize2(3448, "Maximize Modal Editor")),
+                category: Categories.View,
+                f1: true,
+                precondition: EditorPartModalContext,
+                icon: Codicon.screenFull,
+                toggled: {
+                    condition: EditorPartModalMaximizedContext,
+                    title: ( localize(3449, "Restore Modal Editor"))
+                },
+                menu: {
+                    id: MenuId.ModalEditorTitle,
+                    group: "navigation",
+                    order: 1
+                }
+            });
+        }
+        run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    part.toggleMaximized();
+                    break;
+                }
+            }
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: CLOSE_MODAL_EDITOR_COMMAND_ID,
+                title: ( localize2(3450, "Close Modal Editor")),
+                category: Categories.View,
+                f1: true,
+                icon: Codicon.close,
+                precondition: EditorPartModalContext,
+                keybinding: {
+                    primary: KeyCode.Escape,
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    when: EditorPartModalContext
+                },
+                menu: {
+                    id: MenuId.ModalEditorTitle,
+                    group: "navigation",
+                    order: 2
+                }
+            });
+        }
+        async run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    part.close();
+                    break;
+                }
+            }
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID,
+                title: ( localize2(3451, "Navigate to Previous Item in Modal Editor")),
+                category: Categories.View,
+                precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
+                keybinding: {
+                    primary: KeyMod$1.Alt | KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    when: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext))
+                }
+            });
+        }
+        run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    const nav = part.navigation;
+                    if (nav && nav.current > 0) {
+                        nav.navigate(nav.current - 1);
+                    }
+                    break;
+                }
+            }
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID,
+                title: ( localize2(3452, "Navigate to Next Item in Modal Editor")),
+                category: Categories.View,
+                precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
+                keybinding: {
+                    primary: KeyMod$1.Alt | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    when: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext))
+                }
+            });
+        }
+        run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    const nav = part.navigation;
+                    if (nav && nav.current < nav.total - 1) {
+                        nav.navigate(nav.current + 1);
+                    }
+                    break;
+                }
+            }
+        }
+    });
+}
+function isModalEditorPart(obj) {
+    const part = obj;
+    return !!part && typeof part.close === "function" && typeof part.onWillClose === "function" && typeof part.toggleMaximized === "function" && typeof part.maximized === "boolean" && typeof part.updateOptions === "function" && !!part.modalElement && part.windowId === mainWindow.vscodeWindowId;
+}
 function setup() {
     registerEditorMoveCopyCommand();
     registerEditorGroupsLayoutCommands();
@@ -1481,6 +1676,7 @@ function setup() {
     registerFocusEditorGroupAtIndexCommands();
     registerSplitEditorCommands();
     registerFocusEditorGroupWihoutWrapCommands();
+    registerModalEditorCommands();
 }
 
-export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_ABOVE_GROUP, MOVE_EDITOR_INTO_BELOW_GROUP, MOVE_EDITOR_INTO_LEFT_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_RIGHT_GROUP, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_ACTIVE_EDITOR_WITH_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, setup, splitEditor };
+export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_MODAL_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_ABOVE_GROUP, MOVE_EDITOR_INTO_BELOW_GROUP, MOVE_EDITOR_INTO_LEFT_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_RIGHT_GROUP, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_ACTIVE_EDITOR_WITH_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, setup, splitEditor };

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

@@ -2,9 +2,11 @@ import { IConfigurationService } from "../../../../platform/configuration/common
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { Themable } from "../../../../platform/theme/common/themeService.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
+import { IEditorGroupsView } from "./editor.js";
 import { IEditorDropTargetDelegate } from "../../../services/editor/common/editorGroupsService.js";
 import { IEditorGroupsService } from "../../../services/editor/common/editorGroupsService.service.js";
 export declare class EditorDropTarget extends Themable {
+    private readonly groupsView;
     private readonly container;
     private readonly delegate;
     private readonly editorGroupService;
@@ -14,7 +16,7 @@ export declare class EditorDropTarget extends Themable {
     private counter;
     private readonly editorTransfer;
     private readonly groupTransfer;
-    constructor(container: HTMLElement, delegate: IEditorDropTargetDelegate, editorGroupService: IEditorGroupsService, themeService: IThemeService, configurationService: IConfigurationService, instantiationService: IInstantiationService);
+    constructor(groupsView: IEditorGroupsView, container: HTMLElement, delegate: IEditorDropTargetDelegate, editorGroupService: IEditorGroupsService, themeService: IThemeService, configurationService: IConfigurationService, instantiationService: IInstantiationService);
     private get overlay();
     private registerListeners;
     private onDragEnter;

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(3410, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
+            this.dropIntoPromptElement = renderFormattedText(( localize(3461, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
             this.dropIntoPromptElement.classList.add("editor-group-overlay-drop-into-prompt");
             this.overlay.appendChild(this.dropIntoPromptElement);
         }
@@ -155,7 +155,7 @@ let DropOverlay = class DropOverlay extends Themable {
                         }
                     }
                 }
-                let splitOnDragAndDrop = !!this.editorGroupService.partOptions.splitOnDragAndDrop;
+                let splitOnDragAndDrop = !!this.groupView.groupsView.partOptions.splitOnDragAndDrop;
                 if (this.isToggleSplitOperation(e)) {
                     splitOnDragAndDrop = !splitOnDragAndDrop;
                 }
@@ -249,7 +249,7 @@ let DropOverlay = class DropOverlay extends Themable {
                 if (sourceGroup) {
                     const copyEditor = this.isCopyOperation(event, firstDraggedEditor);
                     let targetGroup = undefined;
-                    if (this.editorGroupService.partOptions.closeEmptyGroups && sourceGroup.count === 1 && typeof splitDirection === "number" && !copyEditor) {
+                    if (this.groupView.groupsView.partOptions.closeEmptyGroups && sourceGroup.count === 1 && typeof splitDirection === "number" && !copyEditor) {
                         targetGroup = this.editorGroupService.moveGroup(sourceGroup, this.groupView, splitDirection);
                     }
                     else {
@@ -316,7 +316,7 @@ let DropOverlay = class DropOverlay extends Themable {
         return (e.altKey && !isMacintosh) || (e.shiftKey && isMacintosh);
     }
     positionOverlay(mousePosX, mousePosY, isDraggingGroup, enableSplitting) {
-        const preferSplitVertically = this.editorGroupService.partOptions.openSideBySideDirection === "right";
+        const preferSplitVertically = this.groupView.groupsView.partOptions.openSideBySideDirection === "right";
         const editorControlWidth = this.groupView.element.clientWidth;
         const editorControlHeight = this.groupView.element.clientHeight - this.getOverlayOffsetHeight();
         let edgeWidthThresholdFactor;
@@ -435,7 +435,7 @@ let DropOverlay = class DropOverlay extends Themable {
         overlay.style.height = options.height;
     }
     getOverlayOffsetHeight() {
-        if (!this.groupView.isEmpty && this.editorGroupService.partOptions.showTabs === "multiple") {
+        if (!this.groupView.isEmpty && this.groupView.groupsView.partOptions.showTabs === "multiple") {
             return this.groupView.titleHeight.offset;
         }
         return 0;
@@ -469,6 +469,7 @@ let DropOverlay = class DropOverlay extends Themable {
 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));
 let EditorDropTarget = class EditorDropTarget extends Themable {
     constructor(
+        groupsView,
         container,
         delegate,
         editorGroupService,
@@ -477,6 +478,7 @@ let EditorDropTarget = class EditorDropTarget extends Themable {
         instantiationService
     ) {
         super(themeService);
+        this.groupsView = groupsView;
         this.container = container;
         this.delegate = delegate;
         this.editorGroupService = editorGroupService;
@@ -524,6 +526,12 @@ let EditorDropTarget = class EditorDropTarget extends Themable {
                 return;
             }
         }
+        if (!this.groupsView.partOptions.allowDropIntoGroup) {
+            if (event.dataTransfer) {
+                event.dataTransfer.dropEffect = "none";
+            }
+            return;
+        }
         this.updateContainer(true);
         const target = event.target;
         if (target) {
@@ -569,6 +577,6 @@ let EditorDropTarget = class EditorDropTarget extends Themable {
         }
     }
 };
-EditorDropTarget = ( __decorate([( __param(2, IEditorGroupsService)), ( __param(3, IThemeService)), ( __param(4, IConfigurationService)), ( __param(5, IInstantiationService))], EditorDropTarget));
+EditorDropTarget = ( __decorate([( __param(3, IEditorGroupsService)), ( __param(4, IThemeService)), ( __param(5, IConfigurationService)), ( __param(6, IInstantiationService))], EditorDropTarget));
 
 export { EditorDropTarget };

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(3411, "Empty editor group actions")),
+            ariaLabel: ( localize(3462, "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(3412, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute("aria-label", ( localize(3463, "{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(3413, "{0}: Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3464, "{0}: Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3414, "Group {0}", this._index + 1);
+        return localize(3465, "Group {0}", this._index + 1);
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return localize(3415, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3466, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3416, "Editor Group {0}", this._index + 1);
+        return localize(3467, "Editor Group {0}", this._index + 1);
     }
     get disposed() {
         return this._disposed;
@@ -1131,7 +1131,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(3417, "Try saving or reverting the editor first and then try again.")));
+                this.dialogService.error(canMoveVeto, ( localize(3468, "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("chatSetupDisabled", false))));
 const openChat = {
-    text: ( localize(3418, "Open Chat")),
+    text: ( localize(3469, "Open Chat")),
     id: "workbench.action.chat.open",
     when: {
         native: showChatContextKey,
@@ -28,60 +28,60 @@ const openChat = {
     }
 };
 const showCommands = {
-    text: ( localize(3419, "Show All Commands")),
+    text: ( localize(3470, "Show All Commands")),
     id: "workbench.action.showCommands"
 };
 const gotoFile = {
-    text: ( localize(3420, "Go to File")),
+    text: ( localize(3471, "Go to File")),
     id: "workbench.action.quickOpen"
 };
 const openFile = {
-    text: ( localize(3421, "Open File")),
+    text: ( localize(3472, "Open File")),
     id: "workbench.action.files.openFile"
 };
 const openFolder = {
-    text: ( localize(3422, "Open Folder")),
+    text: ( localize(3473, "Open Folder")),
     id: "workbench.action.files.openFolder"
 };
 const openFileOrFolder = {
-    text: ( localize(3423, "Open File or Folder")),
+    text: ( localize(3474, "Open File or Folder")),
     id: "workbench.action.files.openFileFolder"
 };
 const openRecent = {
-    text: ( localize(3424, "Open Recent")),
+    text: ( localize(3475, "Open Recent")),
     id: "workbench.action.openRecent"
 };
 const newUntitledFile = {
-    text: ( localize(3425, "New Untitled Text File")),
+    text: ( localize(3476, "New Untitled Text File")),
     id: "workbench.action.files.newUntitledFile"
 };
 const findInFiles = {
-    text: ( localize(3426, "Find in Files")),
+    text: ( localize(3477, "Find in Files")),
     id: "workbench.action.findInFiles"
 };
 const toggleTerminal = {
-    text: ( localize(3427, "Toggle Terminal")),
+    text: ( localize(3478, "Toggle Terminal")),
     id: "workbench.action.terminal.toggleTerminal",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const startDebugging = {
-    text: ( localize(3428, "Start Debugging")),
+    text: ( localize(3479, "Start Debugging")),
     id: "workbench.action.debug.start",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const openSettings = {
-    text: ( localize(3429, "Open Settings")),
+    text: ( localize(3480, "Open Settings")),
     id: "workbench.action.openSettings"
 };
 const baseEntries = [openChat, showCommands];
 const emptyWindowEntries = coalesce([
     ...baseEntries,
-    ...(isMacintosh && !isWeb ? [openFileOrFolder] : [openFile, openFolder]),
     openRecent,
+    ...(isMacintosh && !isWeb ? [openFileOrFolder] : [openFile, openFolder]),
     isMacintosh && !isWeb ? newUntitledFile : undefined
 ]);
 const workspaceEntries = [...baseEntries];

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

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