@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { onDidChangeFullscreen } from '../../../../base/browser/browser.js';
 import { getActiveWindow, show, hide, $ } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { markAsSingleton, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { isNative } from '../../../../base/common/platform.js';
@@ -16,10 +17,10 @@ import { hasCustomTitlebar } from '../../../../platform/window/common/window.js'
 import { EditorPart } from './editorPart.js';
 import { WindowTitle } from '../titlebar/windowTitle.js';
 import { IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.service.js';
-import { GroupsOrder, GroupDirection } from '../../../services/editor/common/editorGroupsService.js';
+import { GroupsOrder, GroupActivationReason, GroupDirection } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
-import { shouldShowCustomTitleBar } from '../../../services/layout/browser/layoutService.js';
+import { shouldShowCustomTitleBar, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.service.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
@@ -36,7 +37,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.toggleCompactAuxiliaryWindow",
-            title: ( localize2(3053, "Toggle Window Compact Mode")),
+            title: ( localize2(3097, "Toggle Window Compact Mode")),
             category: Categories.View,
             f1: true,
             precondition: IsAuxiliaryWindowFocusedContext
@@ -53,7 +54,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.enableCompactAuxiliaryWindow",
-            title: ( localize(3054, "Turn On Compact Mode")),
+            title: ( localize(3098, "Turn On Compact Mode")),
             icon: Codicon.screenFull,
             menu: {
                 id: MenuId.LayoutControlMenu,
@@ -73,7 +74,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.disableCompactAuxiliaryWindow",
-            title: ( localize(3055, "Turn Off Compact Mode")),
+            title: ( localize(3099, "Turn Off Compact Mode")),
             icon: Codicon.screenNormal,
             menu: {
                 id: MenuId.LayoutControlMenu,
@@ -353,6 +354,11 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         this.optionsDisposable = this._register(( new MutableDisposable()));
         this.isCompact = false;
     }
+    handleContextKeys() {
+        const isAuxiliaryWindowContext = IsAuxiliaryWindowContext.bindTo(this.scopedContextKeyService);
+        isAuxiliaryWindowContext.set(true);
+        super.handleContextKeys();
+    }
     updateOptions(options) {
         this.isCompact = options.compact;
         if (options.compact) {
@@ -386,8 +392,11 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         const mostRecentlyActiveGroups = this.editorPartsView.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
         const nextActiveGroup = mostRecentlyActiveGroups[1];
         if (nextActiveGroup) {
-            nextActiveGroup.groupsView.activateGroup(nextActiveGroup);
-            if (restoreFocus) {
+            nextActiveGroup.groupsView.activateGroup(nextActiveGroup, undefined, GroupActivationReason.PART_CLOSE);
+        }
+        if (nextActiveGroup && restoreFocus) {
+            const nextGroupInHiddenMainPart = nextActiveGroup.groupsView === this.editorPartsView.mainPart && !this.layoutService.isVisible(Parts.EDITOR_PART, mainWindow);
+            if (!nextGroupInHiddenMainPart) {
                 nextActiveGroup.focus();
             }
         }
@@ -411,6 +420,9 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
                 });
             }
             result = this.mergeGroupsToMainPart();
+            if (!result) {
+                return false;
+            }
         }
         this._onWillClose.fire();
         return result;

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

@@ -44,7 +44,7 @@ let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySide
         const primary = this.getPrimaryEditorPane();
         const secondary = this.getSecondaryEditorPane();
         if (primary instanceof BaseBinaryResourceEditor && secondary instanceof BaseBinaryResourceEditor) {
-            return localize(3056, "{0} ↔ {1}", secondary.getMetadata(), primary.getMetadata());
+            return localize(3100, "{0} ↔ {1}", secondary.getMetadata(), primary.getMetadata());
         }
         return undefined;
     }

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

@@ -17,7 +17,7 @@ let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlac
         this.onDidOpenInPlace = this._onDidOpenInPlace.event;
     }
     getTitle() {
-        return this.input ? this.input.getName() : ( localize(3057, "Binary Viewer"));
+        return this.input ? this.input.getName() : ( localize(3101, "Binary Viewer"));
     }
     async getContents(input, options) {
         const model = await input.resolve();
@@ -29,11 +29,11 @@ let BaseBinaryResourceEditor = class BaseBinaryResourceEditor extends EditorPlac
         return {
             icon: "$(warning)",
             label: ( localize(
-                3058,
+                3102,
                 "The file is not displayed in the text editor because it is either binary or uses an unsupported text encoding."
             )),
             actions: [{
-                label: ( localize(3059, "Open Anyway")),
+                label: ( localize(3103, "Open Anyway")),
                 run: async () => {
                     await this.callbacks.openInternal(input, options);
                     this._onDidOpenInPlace.fire();

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

@@ -94,53 +94,53 @@ class BreadcrumbsConfig {
 }
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: "breadcrumbs",
-    title: ( localize(3060, "Breadcrumb Navigation")),
+    title: ( localize(3104, "Breadcrumb Navigation")),
     order: 101,
     type: "object",
     properties: {
         "breadcrumbs.enabled": {
-            description: ( localize(3061, "Enable/disable navigation breadcrumbs.")),
+            description: ( localize(3105, "Enable/disable navigation breadcrumbs.")),
             type: "boolean",
             default: true
         },
         "breadcrumbs.filePath": {
             description: ( localize(
-                3062,
+                3106,
                 "Controls whether and how file paths are shown in the breadcrumbs view."
             )),
             type: "string",
             default: "on",
             enum: ["on", "off", "last"],
-            enumDescriptions: [( localize(3063, "Show the file path in the breadcrumbs view.")), ( localize(3064, "Do not show the file path in the breadcrumbs view.")), ( localize(
-                3065,
+            enumDescriptions: [( localize(3107, "Show the file path in the breadcrumbs view.")), ( localize(3108, "Do not show the file path in the breadcrumbs view.")), ( localize(
+                3109,
                 "Only show the last element of the file path in the breadcrumbs view."
             ))]
         },
         "breadcrumbs.symbolPath": {
             description: ( localize(
-                3066,
+                3110,
                 "Controls whether and how symbols are shown in the breadcrumbs view."
             )),
             type: "string",
             default: "on",
             enum: ["on", "off", "last"],
-            enumDescriptions: [( localize(3067, "Show all symbols in the breadcrumbs view.")), ( localize(3068, "Do not show symbols in the breadcrumbs view.")), ( localize(3069, "Only show the current symbol in the breadcrumbs view."))]
+            enumDescriptions: [( localize(3111, "Show all symbols in the breadcrumbs view.")), ( localize(3112, "Do not show symbols in the breadcrumbs view.")), ( localize(3113, "Only show the current symbol in the breadcrumbs view."))]
         },
         "breadcrumbs.symbolSortOrder": {
-            description: ( localize(3070, "Controls how symbols are sorted in the breadcrumbs outline view.")),
+            description: ( localize(3114, "Controls how symbols are sorted in the breadcrumbs outline view.")),
             type: "string",
             default: "position",
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             enum: ["position", "name", "type"],
-            enumDescriptions: [( localize(3071, "Show symbol outline in file position order.")), ( localize(3072, "Show symbol outline in alphabetical order.")), ( localize(3073, "Show symbol outline in symbol type order."))]
+            enumDescriptions: [( localize(3115, "Show symbol outline in file position order.")), ( localize(3116, "Show symbol outline in alphabetical order.")), ( localize(3117, "Show symbol outline in symbol type order."))]
         },
         "breadcrumbs.icons": {
-            description: ( localize(3074, "Render breadcrumb items with icons.")),
+            description: ( localize(3118, "Render breadcrumb items with icons.")),
             type: "boolean",
             default: true
         },
         "breadcrumbs.symbolPathSeparator": {
-            description: ( localize(3075, "The separator used when copying the breadcrumb symbol path.")),
+            description: ( localize(3119, "The separator used when copying the breadcrumb symbol path.")),
             type: "string",
             default: ".",
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
@@ -149,157 +149,157 @@ class BreadcrumbsConfig {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3076, "When enabled breadcrumbs show `file`-symbols."))
+            markdownDescription: ( localize(3120, "When enabled breadcrumbs show `file`-symbols."))
         },
         "breadcrumbs.showModules": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3077, "When enabled breadcrumbs show `module`-symbols."))
+            markdownDescription: ( localize(3121, "When enabled breadcrumbs show `module`-symbols."))
         },
         "breadcrumbs.showNamespaces": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3078, "When enabled breadcrumbs show `namespace`-symbols."))
+            markdownDescription: ( localize(3122, "When enabled breadcrumbs show `namespace`-symbols."))
         },
         "breadcrumbs.showPackages": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3079, "When enabled breadcrumbs show `package`-symbols."))
+            markdownDescription: ( localize(3123, "When enabled breadcrumbs show `package`-symbols."))
         },
         "breadcrumbs.showClasses": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3080, "When enabled breadcrumbs show `class`-symbols."))
+            markdownDescription: ( localize(3124, "When enabled breadcrumbs show `class`-symbols."))
         },
         "breadcrumbs.showMethods": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3081, "When enabled breadcrumbs show `method`-symbols."))
+            markdownDescription: ( localize(3125, "When enabled breadcrumbs show `method`-symbols."))
         },
         "breadcrumbs.showProperties": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3082, "When enabled breadcrumbs show `property`-symbols."))
+            markdownDescription: ( localize(3126, "When enabled breadcrumbs show `property`-symbols."))
         },
         "breadcrumbs.showFields": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3083, "When enabled breadcrumbs show `field`-symbols."))
+            markdownDescription: ( localize(3127, "When enabled breadcrumbs show `field`-symbols."))
         },
         "breadcrumbs.showConstructors": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3084, "When enabled breadcrumbs show `constructor`-symbols."))
+            markdownDescription: ( localize(3128, "When enabled breadcrumbs show `constructor`-symbols."))
         },
         "breadcrumbs.showEnums": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3085, "When enabled breadcrumbs show `enum`-symbols."))
+            markdownDescription: ( localize(3129, "When enabled breadcrumbs show `enum`-symbols."))
         },
         "breadcrumbs.showInterfaces": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3086, "When enabled breadcrumbs show `interface`-symbols."))
+            markdownDescription: ( localize(3130, "When enabled breadcrumbs show `interface`-symbols."))
         },
         "breadcrumbs.showFunctions": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3087, "When enabled breadcrumbs show `function`-symbols."))
+            markdownDescription: ( localize(3131, "When enabled breadcrumbs show `function`-symbols."))
         },
         "breadcrumbs.showVariables": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3088, "When enabled breadcrumbs show `variable`-symbols."))
+            markdownDescription: ( localize(3132, "When enabled breadcrumbs show `variable`-symbols."))
         },
         "breadcrumbs.showConstants": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3089, "When enabled breadcrumbs show `constant`-symbols."))
+            markdownDescription: ( localize(3133, "When enabled breadcrumbs show `constant`-symbols."))
         },
         "breadcrumbs.showStrings": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3090, "When enabled breadcrumbs show `string`-symbols."))
+            markdownDescription: ( localize(3134, "When enabled breadcrumbs show `string`-symbols."))
         },
         "breadcrumbs.showNumbers": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3091, "When enabled breadcrumbs show `number`-symbols."))
+            markdownDescription: ( localize(3135, "When enabled breadcrumbs show `number`-symbols."))
         },
         "breadcrumbs.showBooleans": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3092, "When enabled breadcrumbs show `boolean`-symbols."))
+            markdownDescription: ( localize(3136, "When enabled breadcrumbs show `boolean`-symbols."))
         },
         "breadcrumbs.showArrays": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3093, "When enabled breadcrumbs show `array`-symbols."))
+            markdownDescription: ( localize(3137, "When enabled breadcrumbs show `array`-symbols."))
         },
         "breadcrumbs.showObjects": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3094, "When enabled breadcrumbs show `object`-symbols."))
+            markdownDescription: ( localize(3138, "When enabled breadcrumbs show `object`-symbols."))
         },
         "breadcrumbs.showKeys": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3095, "When enabled breadcrumbs show `key`-symbols."))
+            markdownDescription: ( localize(3139, "When enabled breadcrumbs show `key`-symbols."))
         },
         "breadcrumbs.showNull": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3096, "When enabled breadcrumbs show `null`-symbols."))
+            markdownDescription: ( localize(3140, "When enabled breadcrumbs show `null`-symbols."))
         },
         "breadcrumbs.showEnumMembers": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3097, "When enabled breadcrumbs show `enumMember`-symbols."))
+            markdownDescription: ( localize(3141, "When enabled breadcrumbs show `enumMember`-symbols."))
         },
         "breadcrumbs.showStructs": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3098, "When enabled breadcrumbs show `struct`-symbols."))
+            markdownDescription: ( localize(3142, "When enabled breadcrumbs show `struct`-symbols."))
         },
         "breadcrumbs.showEvents": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3099, "When enabled breadcrumbs show `event`-symbols."))
+            markdownDescription: ( localize(3143, "When enabled breadcrumbs show `event`-symbols."))
         },
         "breadcrumbs.showOperators": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3100, "When enabled breadcrumbs show `operator`-symbols."))
+            markdownDescription: ( localize(3144, "When enabled breadcrumbs show `operator`-symbols."))
         },
         "breadcrumbs.showTypeParameters": {
             type: "boolean",
             default: true,
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            markdownDescription: ( localize(3101, "When enabled breadcrumbs show `typeParameter`-symbols."))
+            markdownDescription: ( localize(3145, "When enabled breadcrumbs show `typeParameter`-symbols."))
         }
     }
 });

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

@@ -199,7 +199,7 @@ function createBreadcrumbDndObserver(accessor, container, label, item, model, dr
         }
     });
 }
-const separatorIcon = registerIcon("breadcrumb-separator", Codicon.chevronRight, ( localize(3102, "Icon for the separator in the breadcrumbs.")));
+const separatorIcon = registerIcon("breadcrumb-separator", Codicon.chevronRight, ( localize(3146, "Icon for the separator in the breadcrumbs.")));
 let BreadcrumbsControl = class BreadcrumbsControl {
     static {
         BreadcrumbsControl_1 = this;
@@ -230,13 +230,13 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this.Payload_Pick = {};
     }
     static {
-        this.CK_BreadcrumbsPossible = ( new RawContextKey("breadcrumbsPossible", false, ( localize(3103, "Whether the editor can show breadcrumbs"))));
+        this.CK_BreadcrumbsPossible = ( new RawContextKey("breadcrumbsPossible", false, ( localize(3147, "Whether the editor can show breadcrumbs"))));
     }
     static {
-        this.CK_BreadcrumbsVisible = ( new RawContextKey("breadcrumbsVisible", false, ( localize(3104, "Whether breadcrumbs are currently visible"))));
+        this.CK_BreadcrumbsVisible = ( new RawContextKey("breadcrumbsVisible", false, ( localize(3148, "Whether breadcrumbs are currently visible"))));
     }
     static {
-        this.CK_BreadcrumbsActive = ( new RawContextKey("breadcrumbsActive", false, ( localize(3105, "Whether breadcrumbs have focus"))));
+        this.CK_BreadcrumbsActive = ( new RawContextKey("breadcrumbsActive", false, ( localize(3149, "Whether breadcrumbs have focus"))));
     }
     get onDidVisibilityChange() {
         return this._onDidVisibilityChange.event;
@@ -382,7 +382,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
                 this._widget.setEnabled(false);
                 this._widget.setItems([new (class extends BreadcrumbsItem {
                     render(container) {
-                        container.textContent = ( localize(3106, "no elements"));
+                        container.textContent = ( localize(3150, "no elements"));
                     }
                     equals(other) {
                         return other === this;
@@ -644,13 +644,13 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.toggle",
-            title: ( localize2(3107, "Toggle Breadcrumbs")),
-            shortTitle: ( localize2(3108, "Breadcrumbs")),
+            title: ( localize2(3151, "Toggle Breadcrumbs")),
+            shortTitle: ( localize2(3152, "Breadcrumbs")),
             category: Categories.View,
             toggled: {
                 condition: ( ContextKeyExpr.equals("config.breadcrumbs.enabled", true)),
-                title: ( localize(3109, "Breadcrumbs")),
-                mnemonicTitle: ( localize(3110, "&&Breadcrumbs"))
+                title: ( localize(3153, "Breadcrumbs")),
+                mnemonicTitle: ( localize(3154, "&&Breadcrumbs"))
             },
             menu: [{
                 id: MenuId.CommandPalette
@@ -699,7 +699,7 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.focusAndSelect",
-            title: ( localize2(3111, "Focus and Select Breadcrumbs")),
+            title: ( localize2(3155, "Focus and Select Breadcrumbs")),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -717,7 +717,7 @@ registerAction2(class FocusBreadcrumbs extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.focus",
-            title: ( localize2(3112, "Focus Breadcrumbs")),
+            title: ( localize2(3156, "Focus Breadcrumbs")),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -934,7 +934,7 @@ registerAction2(class CopyBreadcrumbPath extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.copyPath",
-            title: ( localize2(3113, "Copy Breadcrumbs Path")),
+            title: ( localize2(3157, "Copy Breadcrumbs Path")),
             category: Categories.View,
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             f1: true,

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

@@ -223,7 +223,7 @@ class FileNavigationLabelProvider {
 }
 class FileAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(3114, "Breadcrumbs");
+        return localize(3158, "Breadcrumbs");
     }
     getAriaLabel(element) {
         return element.name;

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

@@ -12,7 +12,6 @@ import { TextCompareEditorVisibleContext, TextCompareEditorActiveContext, Active
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
 
 const TOGGLE_DIFF_SIDE_BY_SIDE = "toggle.diff.renderSideBySide";
@@ -32,7 +31,6 @@ function registerDiffEditorCommands() {
         primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.Shift | KeyCode.KeyO),
         handler: async accessor => {
             const editorService = accessor.get(IEditorService);
-            const editorGroupsService = accessor.get(IEditorGroupsService);
             const activeEditor = editorService.activeEditor;
             const activeTextEditorControl = editorService.activeTextEditorControl;
             if (!isDiffEditor(activeTextEditorControl) || !(activeEditor instanceof DiffEditorInput)) {
@@ -45,13 +43,13 @@ function registerDiffEditorCommands() {
             } else {
                 editor = activeEditor.modified;
             }
-            return editorGroupsService.activeGroup.openEditor(editor);
+            return editorService.openEditor(editor);
         }
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: DIFF_OPEN_SIDE,
-            title: ( localize2(3115, "Open Active Diff Side"))
+            title: ( localize2(3159, "Open Active Diff Side"))
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -64,7 +62,7 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: GOTO_NEXT_CHANGE,
-            title: ( localize2(3116, "Go to Next Change"))
+            title: ( localize2(3160, "Go to Next Change"))
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -77,7 +75,7 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: GOTO_PREVIOUS_CHANGE,
-            title: ( localize2(3117, "Go to Previous Change"))
+            title: ( localize2(3161, "Go to Previous Change"))
         }
     });
     function getActiveTextDiffEditor(accessor, args) {
@@ -231,16 +229,16 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: TOGGLE_DIFF_SIDE_BY_SIDE,
-            title: ( localize2(3118, "Toggle Inline View")),
-            category: ( localize(3119, "Compare"))
+            title: ( localize2(3162, "Toggle Inline View")),
+            category: ( localize(3163, "Compare"))
         },
         when: TextCompareEditorActiveContext
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: DIFF_SWAP_SIDES,
-            title: ( localize2(3120, "Swap Left and Right Editor Side")),
-            category: ( localize(3119, "Compare"))
+            title: ( localize2(3164, "Swap Left and Right Editor Side")),
+            category: ( localize(3163, "Compare"))
         },
         when: ( ContextKeyExpr.and(TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext))
     });

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

@@ -1,6 +1,6 @@
 import { GroupIdentifier, IEditorIdentifier, IEditorCloseEvent, IEditorPartOptions, IEditorPartOptionsChangeEvent, SideBySideEditor, EditorCloseContext, IEditorPane, IEditorWillOpenEvent, EditorInputWithOptions } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
-import { IEditorGroup, GroupDirection, IMergeGroupOptions, GroupsOrder, GroupsArrangement, IAuxiliaryEditorPart, IEditorPart } from "../../../services/editor/common/editorGroupsService.js";
+import { IEditorGroup, GroupDirection, IMergeGroupOptions, GroupsOrder, GroupsArrangement, IAuxiliaryEditorPart, IEditorPart, IModalEditorPart, GroupActivationReason } from "../../../services/editor/common/editorGroupsService.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { Dimension } from "../../../../base/browser/dom.js";
 import { Event } from "../../../../base/common/event.js";
@@ -32,6 +32,7 @@ export interface IEditorPartsView {
     getGroups(order?: GroupsOrder): IEditorGroupView[];
     readonly count: number;
     createAuxiliaryEditorPart(options?: IAuxiliaryWindowOpenOptions): Promise<IAuxiliaryEditorPart>;
+    createModalEditorPart(): Promise<IModalEditorPart>;
     bind<T extends ContextKeyValue>(contextKey: RawContextKey<T>, group: IEditorGroupView): IContextKey<T>;
 }
 /**
@@ -46,7 +47,7 @@ export interface IEditorGroupsView {
     readonly onDidVisibilityChange: Event<boolean>;
     getGroup(identifier: GroupIdentifier): IEditorGroupView | undefined;
     getGroups(order: GroupsOrder): IEditorGroupView[];
-    activateGroup(identifier: IEditorGroupView | GroupIdentifier, preserveWindowOrder?: boolean): IEditorGroupView;
+    activateGroup(identifier: IEditorGroupView | GroupIdentifier, preserveWindowOrder?: boolean, reason?: GroupActivationReason): IEditorGroupView;
     restoreGroup(identifier: IEditorGroupView | GroupIdentifier): IEditorGroupView;
     addGroup(location: IEditorGroupView | GroupIdentifier, direction: GroupDirection, groupToCopy?: IEditorGroupView): IEditorGroupView;
     mergeGroup(group: IEditorGroupView | GroupIdentifier, target: IEditorGroupView | GroupIdentifier, options?: IMergeGroupOptions): boolean;

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

@@ -33,6 +33,7 @@ const DEFAULT_EDITOR_PART_OPTIONS = {
     labelFormat: "default",
     splitSizing: "auto",
     splitOnDragAndDrop: true,
+    allowDropIntoGroup: true,
     dragToOpenWindow: true,
     centeredLayoutFixedWidth: false,
     doubleClickTabToToggleEditorGroupSizes: "expand",
@@ -118,6 +119,7 @@ function validateEditorPartOptions(options) {
         "mouseBackForwardToNavigate": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["mouseBackForwardToNavigate"])),
         "restoreViewState": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["restoreViewState"])),
         "splitOnDragAndDrop": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["splitOnDragAndDrop"])),
+        "allowDropIntoGroup": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["allowDropIntoGroup"])),
         "dragToOpenWindow": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["dragToOpenWindow"])),
         "centeredLayoutFixedWidth": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["centeredLayoutFixedWidth"])),
         "hasIcons": ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS["hasIcons"])),