@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,9 +1,9 @@
 import { getActiveElement } from '../../../../base/browser/dom.js';
 import { List } from '../../../../base/browser/ui/list/listWidget.js';
 import { distinct, coalesce } from '../../../../base/common/arrays.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
 import { matchesScheme, Schemas } from '../../../../base/common/network.js';
-import { extname } from '../../../../base/common/resources.js';
+import { extname, isEqual } from '../../../../base/common/resources.js';
 import { isObject, isString, isUndefined, isNumber } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
@@ -17,7 +17,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { EditorResolution } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
@@ -26,11 +26,11 @@ import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAc
 import { SideBySideEditor } from './sideBySideEditor.js';
 import { TextDiffEditor } from './textDiffEditor.js';
 import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext } from '../../../common/contextkeys.js';
-import { isEditorInputWithOptionsAndGroup, isEditorIdentifier } from '../../../common/editor.js';
+import { EditorInputCapabilities, EditorsOrder, CloseDirection, isEditorInputWithOptionsAndGroup, isEditorIdentifier } from '../../../common/editor.js';
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
-import { preferredSideBySideGroupDirection, isEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { GroupsOrder, GroupLocation, preferredSideBySideGroupDirection, GroupDirection, isEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
@@ -127,7 +127,7 @@ function registerActiveEditorMoveCopyCommand() {
     };
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: MOVE_ACTIVE_EDITOR_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: EditorContextKeys.editorTextFocus,
         primary: 0,
         handler: (accessor, args) => moveCopyActiveEditor(true, args, accessor),
@@ -149,7 +149,7 @@ function registerActiveEditorMoveCopyCommand() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: COPY_ACTIVE_EDITOR_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: EditorContextKeys.editorTextFocus,
         primary: 0,
         handler: (accessor, args) => moveCopyActiveEditor(false, args, accessor),
@@ -197,16 +197,16 @@ function registerActiveEditorMoveCopyCommand() {
                 index = group.count - 1;
                 break;
             case 'left':
-                index = index - args.value;
+                index = index - (args.value ?? 1);
                 break;
             case 'right':
-                index = index + args.value;
+                index = index + (args.value ?? 1);
                 break;
             case 'center':
                 index = Math.round(group.count / 2) - 1;
                 break;
             case 'position':
-                index = args.value - 1;
+                index = (args.value ?? 1) - 1;
                 break;
         }
         index = index < 0 ? 0 : index >= group.count ? group.count - 1 : index;
@@ -219,49 +219,49 @@ function registerActiveEditorMoveCopyCommand() {
         let targetGroup;
         switch (args.to) {
             case 'left':
-                targetGroup = editorGroupService.findGroup({ direction: 2  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ direction: GroupDirection.LEFT }, sourceGroup);
                 if (!targetGroup) {
-                    targetGroup = editorGroupService.addGroup(sourceGroup, 2 );
+                    targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.LEFT);
                 }
                 break;
             case 'right':
-                targetGroup = editorGroupService.findGroup({ direction: 3  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ direction: GroupDirection.RIGHT }, sourceGroup);
                 if (!targetGroup) {
-                    targetGroup = editorGroupService.addGroup(sourceGroup, 3 );
+                    targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.RIGHT);
                 }
                 break;
             case 'up':
-                targetGroup = editorGroupService.findGroup({ direction: 0  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ direction: GroupDirection.UP }, sourceGroup);
                 if (!targetGroup) {
-                    targetGroup = editorGroupService.addGroup(sourceGroup, 0 );
+                    targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.UP);
                 }
                 break;
             case 'down':
-                targetGroup = editorGroupService.findGroup({ direction: 1  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ direction: GroupDirection.DOWN }, sourceGroup);
                 if (!targetGroup) {
-                    targetGroup = editorGroupService.addGroup(sourceGroup, 1 );
+                    targetGroup = editorGroupService.addGroup(sourceGroup, GroupDirection.DOWN);
                 }
                 break;
             case 'first':
-                targetGroup = editorGroupService.findGroup({ location: 0  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ location: GroupLocation.FIRST }, sourceGroup);
                 break;
             case 'last':
-                targetGroup = editorGroupService.findGroup({ location: 1  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ location: GroupLocation.LAST }, sourceGroup);
                 break;
             case 'previous':
-                targetGroup = editorGroupService.findGroup({ location: 3  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ location: GroupLocation.PREVIOUS }, sourceGroup);
                 break;
             case 'next':
-                targetGroup = editorGroupService.findGroup({ location: 2  }, sourceGroup);
+                targetGroup = editorGroupService.findGroup({ location: GroupLocation.NEXT }, sourceGroup);
                 if (!targetGroup) {
                     targetGroup = editorGroupService.addGroup(sourceGroup, preferredSideBySideGroupDirection(configurationService));
                 }
                 break;
             case 'center':
-                targetGroup = editorGroupService.getGroups(2 )[(editorGroupService.count / 2) - 1];
+                targetGroup = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[(editorGroupService.count / 2) - 1];
                 break;
             case 'position':
-                targetGroup = editorGroupService.getGroups(2 )[args.value - 1];
+                targetGroup = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)[(args.value ?? 1) - 1];
                 break;
         }
         if (targetGroup) {
@@ -470,25 +470,25 @@ function registerOpenEditorAtIndexCommands() {
         const visibleIndex = i + 1;
         KeybindingsRegistry.registerCommandAndKeybindingRule({
             id: OPEN_EDITOR_AT_INDEX_COMMAND_ID + visibleIndex,
-            weight: 200 ,
+            weight: KeybindingWeight.WorkbenchContrib,
             when: undefined,
-            primary: 512  | toKeyCode(visibleIndex),
-            mac: { primary: 256  | toKeyCode(visibleIndex) },
+            primary: KeyMod$1.Alt | toKeyCode(visibleIndex),
+            mac: { primary: KeyMod$1.WinCtrl | toKeyCode(visibleIndex) },
             handler: accessor => openEditorAtIndex(accessor, editorIndex)
         });
     }
     function toKeyCode(index) {
         switch (index) {
-            case 0: return 21 ;
-            case 1: return 22 ;
-            case 2: return 23 ;
-            case 3: return 24 ;
-            case 4: return 25 ;
-            case 5: return 26 ;
-            case 6: return 27 ;
-            case 7: return 28 ;
-            case 8: return 29 ;
-            case 9: return 30 ;
+            case 0: return KeyCode.Digit0;
+            case 1: return KeyCode.Digit1;
+            case 2: return KeyCode.Digit2;
+            case 3: return KeyCode.Digit3;
+            case 4: return KeyCode.Digit4;
+            case 5: return KeyCode.Digit5;
+            case 6: return KeyCode.Digit6;
+            case 7: return KeyCode.Digit7;
+            case 8: return KeyCode.Digit8;
+            case 9: return KeyCode.Digit9;
         }
         throw ( (new Error('invalid index')));
     }
@@ -497,21 +497,21 @@ function registerFocusEditorGroupAtIndexCommands() {
     for (let groupIndex = 1; groupIndex < 8; groupIndex++) {
         KeybindingsRegistry.registerCommandAndKeybindingRule({
             id: toCommandId(groupIndex),
-            weight: 200 ,
+            weight: KeybindingWeight.WorkbenchContrib,
             when: undefined,
-            primary: 2048  | toKeyCode(groupIndex),
+            primary: KeyMod$1.CtrlCmd | toKeyCode(groupIndex),
             handler: accessor => {
                 const editorGroupService = accessor.get(IEditorGroupsService);
                 const configurationService = accessor.get(IConfigurationService);
                 if (groupIndex > editorGroupService.count) {
                     return;
                 }
-                const groups = editorGroupService.getGroups(2 );
+                const groups = editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE);
                 if (groups[groupIndex]) {
                     return groups[groupIndex].focus();
                 }
                 const direction = preferredSideBySideGroupDirection(configurationService);
-                const lastGroup = editorGroupService.findGroup({ location: 1  });
+                const lastGroup = editorGroupService.findGroup({ location: GroupLocation.LAST });
                 if (!lastGroup) {
                     return;
                 }
@@ -534,50 +534,63 @@ function registerFocusEditorGroupAtIndexCommands() {
     }
     function toKeyCode(index) {
         switch (index) {
-            case 1: return 23 ;
-            case 2: return 24 ;
-            case 3: return 25 ;
-            case 4: return 26 ;
-            case 5: return 27 ;
-            case 6: return 28 ;
-            case 7: return 29 ;
+            case 1: return KeyCode.Digit2;
+            case 2: return KeyCode.Digit3;
+            case 3: return KeyCode.Digit4;
+            case 4: return KeyCode.Digit5;
+            case 5: return KeyCode.Digit6;
+            case 6: return KeyCode.Digit7;
+            case 7: return KeyCode.Digit8;
         }
         throw ( (new Error('Invalid index')));
     }
 }
-function splitEditor(editorGroupService, direction, context) {
+function splitEditor(editorGroupService, direction, contexts) {
+    let newGroup;
     let sourceGroup;
-    if (context && typeof context.groupId === 'number') {
-        sourceGroup = editorGroupService.getGroup(context.groupId);
-    }
-    else {
-        sourceGroup = editorGroupService.activeGroup;
-    }
-    if (!sourceGroup) {
-        return;
-    }
-    const newGroup = editorGroupService.addGroup(sourceGroup, direction);
-    let editorToCopy;
-    if (context && typeof context.editorIndex === 'number') {
-        editorToCopy = sourceGroup.getEditorByIndex(context.editorIndex);
-    }
-    else {
-        editorToCopy = sourceGroup.activeEditor ?? undefined;
-    }
-    if (editorToCopy && !editorToCopy.hasCapability(8 )) {
-        sourceGroup.copyEditor(editorToCopy, newGroup, { preserveFocus: context?.preserveFocus });
+    for (const context of contexts ?? [undefined]) {
+        let currentGroup;
+        if (context) {
+            currentGroup = editorGroupService.getGroup(context.groupId);
+        }
+        else {
+            currentGroup = editorGroupService.activeGroup;
+        }
+        if (!currentGroup) {
+            continue;
+        }
+        if (!sourceGroup) {
+            sourceGroup = currentGroup;
+        }
+        else if (sourceGroup.id !== currentGroup.id) {
+            continue;
+        }
+        if (!newGroup) {
+            newGroup = editorGroupService.addGroup(currentGroup, direction);
+        }
+        let editorToCopy;
+        if (context && typeof context.editorIndex === 'number') {
+            editorToCopy = currentGroup.getEditorByIndex(context.editorIndex);
+        }
+        else {
+            editorToCopy = currentGroup.activeEditor ?? undefined;
+        }
+        if (editorToCopy && !editorToCopy.hasCapability(EditorInputCapabilities.Singleton)) {
+            currentGroup.copyEditor(editorToCopy, newGroup, { preserveFocus: context?.preserveFocus });
+        }
     }
-    newGroup.focus();
+    newGroup?.focus();
 }
 function registerSplitEditorCommands() {
     [
-        { id: SPLIT_EDITOR_UP, direction: 0  },
-        { id: SPLIT_EDITOR_DOWN, direction: 1  },
-        { id: SPLIT_EDITOR_LEFT, direction: 2  },
-        { id: SPLIT_EDITOR_RIGHT, direction: 3  }
+        { id: SPLIT_EDITOR_UP, direction: GroupDirection.UP },
+        { id: SPLIT_EDITOR_DOWN, direction: GroupDirection.DOWN },
+        { id: SPLIT_EDITOR_LEFT, direction: GroupDirection.LEFT },
+        { id: SPLIT_EDITOR_RIGHT, direction: GroupDirection.RIGHT }
     ].forEach(({ id, direction }) => {
         CommandsRegistry.registerCommand(id, function (accessor, resourceOrContext, context) {
-            splitEditor(accessor.get(IEditorGroupsService), direction, getCommandsContext(resourceOrContext, context));
+            const { editors } = getEditorsContext(accessor, resourceOrContext, context);
+            splitEditor(accessor.get(IEditorGroupsService), direction, editors);
         });
     });
 }
@@ -599,11 +612,11 @@ function registerCloseEditorCommands() {
             const activeGroup = editorGroupsService.activeGroup;
             const activeEditor = activeGroup.activeEditor;
             if (activeEditor && activeGroup.isSticky(activeEditor)) {
-                const nextNonStickyEditorInGroup = activeGroup.getEditors(0 , { excludeSticky: true })[0];
+                const nextNonStickyEditorInGroup = activeGroup.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true })[0];
                 if (nextNonStickyEditorInGroup) {
                     return activeGroup.openEditor(nextNonStickyEditorInGroup);
                 }
-                const nextNonStickyEditorInAllGroups = editorService.getEditors(0 , { excludeSticky: true })[0];
+                const nextNonStickyEditorInAllGroups = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true })[0];
                 if (nextNonStickyEditorInAllGroups) {
                     return Promise.resolve(editorGroupsService.getGroup(nextNonStickyEditorInAllGroups.groupId)?.openEditor(nextNonStickyEditorInAllGroups.editor));
                 }
@@ -624,10 +637,10 @@ function registerCloseEditorCommands() {
     }
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLOSE_EDITOR_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
-        primary: 2048  | 53 ,
-        win: { primary: 2048  | 62 , secondary: [2048  | 53 ] },
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyW,
+        win: { primary: KeyMod$1.CtrlCmd | KeyCode.F4, secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyW] },
         handler: (accessor, resourceOrContext, context) => {
             return closeEditorHandler(accessor, false, resourceOrContext, context);
         }
@@ -637,9 +650,9 @@ function registerCloseEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
-        primary: KeyChord(2048  | 41 , 53 ),
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyW),
         handler: (accessor, resourceOrContext, context) => {
             return Promise.all(( (getEditorsContext(accessor, resourceOrContext, context).groups.map(async (group) => {
                 if (group) {
@@ -651,13 +664,13 @@ function registerCloseEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLOSE_EDITOR_GROUP_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.and(ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext))),
-        primary: 2048  | 53 ,
-        win: { primary: 2048  | 62 , secondary: [2048  | 53 ] },
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyW,
+        win: { primary: KeyMod$1.CtrlCmd | KeyCode.F4, secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyW] },
         handler: (accessor, resourceOrContext, context) => {
             const editorGroupService = accessor.get(IEditorGroupsService);
-            const commandsContext = getCommandsContext(resourceOrContext, context);
+            const commandsContext = getCommandsContext(accessor, resourceOrContext, context);
             let group;
             if (commandsContext && typeof commandsContext.groupId === 'number') {
                 group = editorGroupService.getGroup(commandsContext.groupId);
@@ -672,9 +685,9 @@ function registerCloseEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLOSE_SAVED_EDITORS_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
-        primary: KeyChord(2048  | 41 , 51 ),
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyU),
         handler: (accessor, resourceOrContext, context) => {
             return Promise.all(( (getEditorsContext(accessor, resourceOrContext, context).groups.map(async (group) => {
                 if (group) {
@@ -685,10 +698,10 @@ function registerCloseEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        mac: { primary: 2048  | 512  | 50  },
+        mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyT },
         handler: (accessor, resourceOrContext, context) => {
             const { editors, groups } = getEditorsContext(accessor, resourceOrContext, context);
             return Promise.all(( (groups.map(async (group) => {
@@ -698,7 +711,7 @@ function registerCloseEditorCommands() {
                         .map(
                         editor => typeof editor.editorIndex === 'number' ? group.getEditorByIndex(editor.editorIndex) : group.activeEditor
                     )));
-                    const editorsToClose = group.getEditors(1 , { excludeSticky: true }).filter(editor => !editorsToKeep.includes(editor));
+                    const editorsToClose = group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).filter(editor => !editorsToKeep.includes(editor));
                     for (const editorToKeep of editorsToKeep) {
                         if (editorToKeep) {
                             group.pinEditor(editorToKeep);
@@ -711,63 +724,68 @@ function registerCloseEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
         handler: async (accessor, resourceOrContext, context) => {
             const editorGroupService = accessor.get(IEditorGroupsService);
-            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
             if (group && editor) {
                 if (group.activeEditor) {
                     group.pinEditor(group.activeEditor);
                 }
-                await group.closeEditors({ direction: 1 , except: editor, excludeSticky: true }, { preserveFocus: context?.preserveFocus });
+                await group.closeEditors({ direction: CloseDirection.RIGHT, except: editor, excludeSticky: true }, { preserveFocus: context?.preserveFocus });
             }
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: REOPEN_WITH_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
         handler: async (accessor, resourceOrContext, context) => {
-            const editorGroupService = accessor.get(IEditorGroupsService);
             const editorService = accessor.get(IEditorService);
             const editorResolverService = accessor.get(IEditorResolverService);
             const telemetryService = accessor.get(ITelemetryService);
-            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
-            if (!editor) {
-                return;
-            }
-            const untypedEditor = editor.toUntyped();
-            if (!untypedEditor) {
-                return;
-            }
-            untypedEditor.options = { ...editorService.activeEditorPane?.options, override: EditorResolution.PICK };
-            const resolvedEditor = await editorResolverService.resolveEditor(untypedEditor, group);
-            if (!isEditorInputWithOptionsAndGroup(resolvedEditor)) {
-                return;
-            }
-            await resolvedEditor.group.replaceEditors([
-                {
+            const editorsAndGroup = resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context));
+            const editorReplacements = ( (new Map()));
+            for (const { editor, group } of editorsAndGroup) {
+                const untypedEditor = editor.toUntyped();
+                if (!untypedEditor) {
+                    return;
+                }
+                untypedEditor.options = { ...editorService.activeEditorPane?.options, override: EditorResolution.PICK };
+                const resolvedEditor = await editorResolverService.resolveEditor(untypedEditor, group);
+                if (!isEditorInputWithOptionsAndGroup(resolvedEditor)) {
+                    return;
+                }
+                let editorReplacementsInGroup = editorReplacements.get(group);
+                if (!editorReplacementsInGroup) {
+                    editorReplacementsInGroup = [];
+                    editorReplacements.set(group, editorReplacementsInGroup);
+                }
+                editorReplacementsInGroup.push({
                     editor: editor,
                     replacement: resolvedEditor.editor,
                     forceReplaceDirty: editor.resource?.scheme === Schemas.untitled,
                     options: resolvedEditor.options
-                }
-            ]);
-            telemetryService.publicLog2('workbenchEditorReopen', {
-                scheme: editor.resource?.scheme ?? '',
-                ext: editor.resource ? extname(editor.resource) : '',
-                from: editor.editorId ?? '',
-                to: resolvedEditor.editor.editorId ?? ''
-            });
-            await resolvedEditor.group.openEditor(resolvedEditor.editor);
+                });
+                telemetryService.publicLog2('workbenchEditorReopen', {
+                    scheme: editor.resource?.scheme ?? '',
+                    ext: editor.resource ? extname(editor.resource) : '',
+                    from: editor.editorId ?? '',
+                    to: resolvedEditor.editor.editorId ?? ''
+                });
+            }
+            for (const [group, replacements] of editorReplacements) {
+                await group.replaceEditors(replacements);
+                await group.openEditor(replacements[0].replacement);
+            }
         }
     });
     CommandsRegistry.registerCommand(CLOSE_EDITORS_AND_GROUP_COMMAND_ID, async (accessor, resourceOrContext, context) => {
         const editorGroupService = accessor.get(IEditorGroupsService);
-        const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+        const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
         if (group) {
             await group.closeAllEditors();
             if (group.count === 0 && editorGroupService.getGroup(group.id) ) {
@@ -780,19 +798,19 @@ function registerFocusEditorGroupWihoutWrapCommands() {
     const commands = [
         {
             id: FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID,
-            direction: 2
+            direction: GroupDirection.LEFT
         },
         {
             id: FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID,
-            direction: 3
+            direction: GroupDirection.RIGHT
         },
         {
             id: FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID,
-            direction: 0 ,
+            direction: GroupDirection.UP,
         },
         {
             id: FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID,
-            direction: 1
+            direction: GroupDirection.DOWN
         }
     ];
     for (const command of commands) {
@@ -807,7 +825,7 @@ function registerSplitEditorInGroupCommands() {
     async function splitEditorInGroup(accessor, resourceOrContext, context) {
         const editorGroupService = accessor.get(IEditorGroupsService);
         const instantiationService = accessor.get(IInstantiationService);
-        const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+        const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
         if (!editor) {
             return;
         }
@@ -826,9 +844,9 @@ function registerSplitEditorInGroupCommands() {
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
                 keybinding: {
-                    weight: 200 ,
+                    weight: KeybindingWeight.WorkbenchContrib,
                     when: ActiveEditorCanSplitInGroupContext,
-                    primary: KeyChord(2048  | 41 , 2048  | 1024  | 93 )
+                    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Backslash)
                 }
             });
         }
@@ -838,7 +856,7 @@ function registerSplitEditorInGroupCommands() {
     });
     async function joinEditorInGroup(accessor, resourceOrContext, context) {
         const editorGroupService = accessor.get(IEditorGroupsService);
-        const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+        const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
         if (!(editor instanceof SideBySideEditorInput)) {
             return;
         }
@@ -867,9 +885,9 @@ function registerSplitEditorInGroupCommands() {
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
                 keybinding: {
-                    weight: 200 ,
+                    weight: KeybindingWeight.WorkbenchContrib,
                     when: SideBySideEditorActiveContext,
-                    primary: KeyChord(2048  | 41 , 2048  | 1024  | 93 )
+                    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Backslash)
                 }
             });
         }
@@ -889,7 +907,7 @@ function registerSplitEditorInGroupCommands() {
         }
         async run(accessor, resourceOrContext, context) {
             const editorGroupService = accessor.get(IEditorGroupsService);
-            const { editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+            const { editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
             if (editor instanceof SideBySideEditorInput) {
                 await joinEditorInGroup(accessor, resourceOrContext, context);
             }
@@ -998,12 +1016,12 @@ function registerFocusSideEditorsCommands() {
 function registerOtherEditorCommands() {
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: KEEP_EDITOR_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
-        primary: KeyChord(2048  | 41 , 3 ),
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.Enter),
         handler: async (accessor, resourceOrContext, context) => {
             const editorGroupService = accessor.get(IEditorGroupsService);
-            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
             if (group && editor) {
                 return group.pinEditor(editor);
             }
@@ -1020,7 +1038,7 @@ function registerOtherEditorCommands() {
     });
     function setEditorGroupLock(accessor, resourceOrContext, context, locked) {
         const editorGroupService = accessor.get(IEditorGroupsService);
-        const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
+        const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
         group?.lock(locked ?? !group.isLocked);
     }
     registerAction2(class extends Action2 {
@@ -1066,22 +1084,20 @@ function registerOtherEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: PIN_EDITOR_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ActiveEditorStickyContext.toNegated())),
-        primary: KeyChord(2048  | 41 , 1024  | 3 ),
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.Shift | KeyCode.Enter),
         handler: async (accessor, resourceOrContext, context) => {
-            const editorGroupService = accessor.get(IEditorGroupsService);
-            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
-            if (group && editor) {
-                return group.stickEditor(editor);
+            for (const { editor, group } of resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context))) {
+                group.stickEditor(editor);
             }
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: DIFF_OPEN_SIDE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: EditorContextKeys.inDiffEditor,
-        primary: KeyChord(2048  | 41 , 1024  | 45 ),
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.Shift | KeyCode.KeyO),
         handler: async (accessor) => {
             const editorService = accessor.get(IEditorService);
             const editorGroupService = accessor.get(IEditorGroupsService);
@@ -1103,26 +1119,24 @@ function registerOtherEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: UNPIN_EDITOR_COMMAND_ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ActiveEditorStickyContext,
-        primary: KeyChord(2048  | 41 , 1024  | 3 ),
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.Shift | KeyCode.Enter),
         handler: async (accessor, resourceOrContext, context) => {
-            const editorGroupService = accessor.get(IEditorGroupsService);
-            const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
-            if (group && editor) {
-                return group.unstickEditor(editor);
+            for (const { editor, group } of resolveEditorsContext(getEditorsContext(accessor, resourceOrContext, context))) {
+                group.unstickEditor(editor);
             }
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: SHOW_EDITORS_IN_GROUP,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
         handler: (accessor, resourceOrContext, context) => {
             const editorGroupService = accessor.get(IEditorGroupsService);
             const quickInputService = accessor.get(IQuickInputService);
-            const commandsContext = getCommandsContext(resourceOrContext, context);
+            const commandsContext = getCommandsContext(accessor, resourceOrContext, context);
             if (commandsContext && typeof commandsContext.groupId === 'number') {
                 const group = editorGroupService.getGroup(commandsContext.groupId);
                 if (group) {
@@ -1136,7 +1150,7 @@ function registerOtherEditorCommands() {
 function getEditorsContext(accessor, resourceOrContext, context) {
     const editorGroupService = accessor.get(IEditorGroupsService);
     const listService = accessor.get(IListService);
-    const editorContext = getMultiSelectedEditorContexts(getCommandsContext(resourceOrContext, context), listService, editorGroupService);
+    const editorContext = getMultiSelectedEditorContexts(getCommandsContext(accessor, resourceOrContext, context), listService, editorGroupService);
     const activeGroup = editorGroupService.activeGroup;
     if (editorContext.length === 0 && activeGroup.activeEditor) {
         editorContext.push({
@@ -1149,15 +1163,33 @@ function getEditorsContext(accessor, resourceOrContext, context) {
         groups: ( (distinct(( (editorContext.map(context => context.groupId)))).map(groupId => editorGroupService.getGroup(groupId))))
     };
 }
-function getCommandsContext(resourceOrContext, context) {
-    if (URI.isUri(resourceOrContext)) {
-        return context;
-    }
-    if (resourceOrContext && typeof resourceOrContext.groupId === 'number') {
-        return resourceOrContext;
+function resolveEditorsContext(context) {
+    const { editors, groups } = context;
+    const editorsAndGroup = ( (editors.map(e => {
+        if (e.editorIndex === undefined) {
+            return undefined;
+        }
+        const group = groups.find(group => group && group.id === e.groupId);
+        const editor = group?.getEditorByIndex(e.editorIndex);
+        if (!editor || !group) {
+            return undefined;
+        }
+        return { editor, group };
+    })));
+    return coalesce(editorsAndGroup);
+}
+function getCommandsContext(accessor, resourceOrContext, context) {
+    const isUri = URI.isUri(resourceOrContext);
+    const editorCommandsContext = isUri ? context : resourceOrContext ? resourceOrContext : context;
+    if (editorCommandsContext) {
+        return editorCommandsContext;
     }
-    if (context && typeof context.groupId === 'number') {
-        return context;
+    if (isUri) {
+        const editorGroupService = accessor.get(IEditorGroupsService);
+        const editorGroup = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => isEqual(group.activeEditor?.resource, resourceOrContext));
+        if (editorGroup) {
+            return { groupId: editorGroup.index, editorIndex: editorGroup.getIndexOfEditor(editorGroup.activeEditor) };
+        }
     }
     return undefined;
 }
@@ -1195,6 +1227,17 @@ function getMultiSelectedEditorContexts(editorContext, listService, editorGroupS
             return [focus];
         }
     }
+    else {
+        const group = editorContext ? editorGroupService.getGroup(editorContext.groupId) : editorGroupService.activeGroup;
+        const editor = editorContext && editorContext.editorIndex !== undefined ? group?.getEditorByIndex(editorContext.editorIndex) : group?.activeEditor;
+        if (group && editor) {
+            if (group.isSelected(editor)) {
+                return (
+                     (group.selectedEditors.map(se => ({ groupId: group.id, editorIndex: group.getIndexOfEditor(se) })))
+                );
+            }
+        }
+    }
     return !!editorContext ? [editorContext] : [];
 }
 function setup() {
@@ -1211,4 +1254,4 @@ function setup() {
     registerSplitEditorCommands();
     registerFocusEditorGroupWihoutWrapCommands();
 }
-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_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_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, getCommandsContext, getMultiSelectedEditorContexts, resolveCommandsContext, 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_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_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_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, getCommandsContext, getEditorsContext, getMultiSelectedEditorContexts, resolveCommandsContext, resolveEditorsContext, setup, splitEditor };