@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -1,11 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/multieditortabscontrol.css.js';
-import { isWindows, isMacintosh } from '../../../../base/common/platform.js';
+import { isWindows, isLinux, isMacintosh } from '../../../../base/common/platform.js';
 import { shorten } from '../../../../base/common/labels.js';
-import { EditorResourceAccessor, SideBySideEditor, DEFAULT_EDITOR_ASSOCIATION, preventEditorClose, EditorCloseMethod } from '../../../common/editor.js';
+import { EditorsOrder, EditorInputCapabilities, Verbosity, EditorResourceAccessor, SideBySideEditor, DEFAULT_EDITOR_ASSOCIATION, preventEditorClose, EditorCloseMethod } from '../../../common/editor.js';
 import { computeEditorAriaLabel } from '../../editor.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { Gesture, EventType } from '../../../../base/browser/touch.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
@@ -17,16 +18,17 @@ import { EditorTabsControl, EditorCommandsContextActionRunner } from './editorTa
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { MutableDisposable, DisposableStore, dispose, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { getOrSet } from '../../../../base/common/map.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-import { EDITOR_GROUP_HEADER_TABS_BORDER, TAB_BORDER, TAB_ACTIVE_BORDER, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_LAST_PINNED_BORDER, TAB_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_INACTIVE_BACKGROUND, TAB_UNFOCUSED_INACTIVE_BACKGROUND, WORKBENCH_BACKGROUND } from '../../../common/theme.js';
+import { EDITOR_GROUP_HEADER_TABS_BORDER, TAB_BORDER, TAB_ACTIVE_BORDER, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_SELECTED_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_LAST_PINNED_BORDER, TAB_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_INACTIVE_BACKGROUND, TAB_UNFOCUSED_INACTIVE_BACKGROUND, WORKBENCH_BACKGROUND } from '../../../common/theme.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
 import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
 import '../../../../platform/theme/common/colors/inputColors.js';
-import '../../../../platform/theme/common/colors/listColors.js';
+import { listActiveSelectionForeground, listActiveSelectionBackground } from '../../../../platform/theme/common/colors/listColors.js';
 import '../../../../platform/theme/common/colors/menuColors.js';
 import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
@@ -34,9 +36,10 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { DraggedEditorIdentifier, DraggedEditorGroupIdentifier, isWindowDraggedOver, extractTreeDropData, ResourcesDropHandler } from '../../dnd.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { Dimension, addDisposableListener, EventType as EventType$1, DragAndDropObserver, clearNode, scheduleAtNextAnimationFrame, getWindow, isMouseEvent, findParentWithClass, EventHelper } from '../../../../base/browser/dom.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { CloseOneEditorAction, UnpinEditorAction } from './editorActions.js';
+import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
 import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
@@ -53,8 +56,10 @@ import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { ITreeViewsDnDService } from '../../../../editor/common/services/treeViewsDndService.js';
 import { DraggedTreeItemsIdentifier } from '../../../../editor/common/services/treeViewsDnd.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
-import { StickyEditorGroupModel, UnstickyEditorGroupModel } from '../../../common/editor/filteredEditorGroupModel.js';
+import { UnstickyEditorGroupModel, StickyEditorGroupModel } from '../../../common/editor/filteredEditorGroupModel.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { applyDragImage } from '../../../../base/browser/dnd.js';
 var MultiEditorTabsControl_1;
 const _moduleId = "vs/workbench/browser/parts/editor/multiEditorTabsControl";
 let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsControl {
@@ -76,7 +81,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.editorService = editorService;
         this.pathService = pathService;
         this.treeViewsDragAndDropService = treeViewsDragAndDropService;
-        this.closeEditorAction = this._register(this.instantiationService.createInstance(CloseOneEditorAction, CloseOneEditorAction.ID, CloseOneEditorAction.LABEL));
+        this.closeEditorAction = this._register(this.instantiationService.createInstance(CloseEditorTabAction, CloseEditorTabAction.ID, CloseEditorTabAction.LABEL));
         this.unpinEditorAction = this._register(this.instantiationService.createInstance(UnpinEditorAction, UnpinEditorAction.ID, UnpinEditorAction.LABEL));
         this.tabResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER));
         this.tabLabels = [];
@@ -115,9 +120,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     }
     createTabsScrollbar(scrollable) {
         const tabsScrollbar = this._register(( (new ScrollableElement(scrollable, {
-            horizontal: 1 ,
+            horizontal: ScrollbarVisibility.Auto,
             horizontalScrollbarSize: this.getTabsScrollbarSizing(),
-            vertical: 2 ,
+            vertical: ScrollbarVisibility.Hidden,
             scrollYToX: true,
             useShadows: false
         }))));
@@ -210,6 +215,13 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                 e.preventDefault();
             }
         }));
+        if (isLinux) {
+            this._register(addDisposableListener(tabsContainer, EventType$1.MOUSE_UP, e => {
+                if (e.button === 1) {
+                    e.preventDefault();
+                }
+            }));
+        }
         let lastDragEvent = undefined;
         let isNewWindowOperation = false;
         this._register(( (new DragAndDropObserver(tabsContainer, {
@@ -437,11 +449,16 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     }
     setActive(isGroupActive) {
         this.forEachTab((editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) => {
-            this.redrawTabActiveAndDirty(isGroupActive, editor, tabContainer, tabActionBar);
+            this.redrawTabSelectedActiveAndDirty(isGroupActive, editor, tabContainer, tabActionBar);
         });
         this.updateEditorActionsToolbar();
         this.layout(this.dimensions, { forceRevealActiveTab: true });
     }
+    updateEditorSelections() {
+        this.forEachTab((editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) => {
+            this.redrawTabSelectedActiveAndDirty(this.groupsView.activeGroup === this.groupView, editor, tabContainer, tabActionBar);
+        });
+    }
     updateEditorLabel(editor) {
         this.updateEditorLabelScheduler.schedule();
     }
@@ -453,7 +470,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.layout(this.dimensions);
     }
     updateEditorDirty(editor) {
-        this.withTab(editor, (editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) => this.redrawTabActiveAndDirty(this.groupsView.activeGroup === this.groupView, editor, tabContainer, tabActionBar));
+        this.withTab(editor, (editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) => this.redrawTabSelectedActiveAndDirty(this.groupsView.activeGroup === this.groupView, editor, tabContainer, tabActionBar));
     }
     updateOptions(oldOptions, newOptions) {
         super.updateOptions(oldOptions, newOptions);
@@ -463,6 +480,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         if (oldOptions.titleScrollbarSizing !== newOptions.titleScrollbarSizing) {
             this.updateTabsScrollbarSizing();
         }
+        if (oldOptions.alwaysShowEditorActions !== newOptions.alwaysShowEditorActions) {
+            this.updateEditorActionsToolbar();
+        }
         if (oldOptions.tabSizingFixedMinWidth !== newOptions.tabSizingFixedMinWidth ||
             oldOptions.tabSizingFixedMaxWidth !== newOptions.tabSizingFixedMaxWidth ||
             oldOptions.tabSizing !== newOptions.tabSizing) {
@@ -486,7 +506,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.redraw();
     }
     forEachTab(fn, fromTabIndex, toTabIndex) {
-        this.tabsModel.getEditors(1 ).forEach((editor, tabIndex) => {
+        this.tabsModel.getEditors(EditorsOrder.SEQUENTIAL).forEach((editor, tabIndex) => {
             if (typeof fromTabIndex === 'number' && fromTabIndex > tabIndex) {
                 return;
             }
@@ -550,22 +570,45 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     }
     registerTabListeners(tab, tabIndex, tabsContainer, tabsScrollbar) {
         const disposables = ( (new DisposableStore()));
-        const handleClickOrTouch = (e, preserveFocus) => {
+        const handleClickOrTouch = async (e, preserveFocus) => {
             tab.blur();
             if (isMouseEvent(e) && (e.button !== 0  || ((isMacintosh && e.ctrlKey) ))) {
                 if (e.button === 1) {
                     e.preventDefault();
                 }
-                return undefined;
+                return;
             }
             if (this.originatesFromTabActionBar(e)) {
                 return;
             }
             const editor = this.tabsModel.getEditorByIndex(tabIndex);
             if (editor) {
-                this.groupView.openEditor(editor, { preserveFocus, activation: EditorActivation.ACTIVATE });
+                if (e.shiftKey) {
+                    let anchor;
+                    if (this.lastSingleSelectSelectedEditor && this.tabsModel.isSelected(this.lastSingleSelectSelectedEditor)) {
+                        anchor = this.lastSingleSelectSelectedEditor;
+                    }
+                    else {
+                        const activeEditor = assertIsDefined(this.groupView.activeEditor);
+                        this.lastSingleSelectSelectedEditor = activeEditor;
+                        anchor = activeEditor;
+                    }
+                    await this.selectEditorsBetween(editor, anchor);
+                }
+                else if ((e.ctrlKey && !isMacintosh) || (e.metaKey && isMacintosh)) {
+                    if (this.tabsModel.isSelected(editor)) {
+                        await this.unselectEditor(editor);
+                    }
+                    else {
+                        await this.selectEditor(editor);
+                        this.lastSingleSelectSelectedEditor = editor;
+                    }
+                }
+                else {
+                    const inactiveSelection = this.tabsModel.isSelected(editor) ? this.groupView.selectedEditors.filter(e => !e.matches(editor)) : [];
+                    await this.groupView.openEditor(editor, { preserveFocus, activation: EditorActivation.ACTIVATE }, { inactiveSelection, focusTabControl: true });
+                }
             }
-            return undefined;
         };
         const showContextMenu = (e) => {
             EventHelper.stop(e);
@@ -579,9 +622,19 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         disposables.add(addDisposableListener(tab, EventType.Change, (e) => {
             tabsScrollbar.setScrollPosition({ scrollLeft: tabsScrollbar.getScrollPosition().scrollLeft - e.translationX });
         }));
-        disposables.add(addDisposableListener(tab, EventType$1.MOUSE_UP, e => {
+        disposables.add(addDisposableListener(tab, EventType$1.MOUSE_UP, async (e) => {
             EventHelper.stop(e);
             tab.blur();
+            if (isMouseEvent(e) && (e.button !== 0  || ((isMacintosh && e.ctrlKey) ))) {
+                return;
+            }
+            if (this.originatesFromTabActionBar(e)) {
+                return;
+            }
+            const isCtrlCmd = (e.ctrlKey && !isMacintosh) || (e.metaKey && isMacintosh);
+            if (!isCtrlCmd && !e.shiftKey && this.groupView.selectedEditors.length > 1) {
+                await this.unselectAllEditors();
+            }
         }));
         disposables.add(addDisposableListener(tab, EventType$1.AUXCLICK, e => {
             if (e.button === 1 ) {
@@ -598,7 +651,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         }));
         disposables.add(addDisposableListener(tab, EventType$1.KEY_DOWN, e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.shiftKey && event.keyCode === 68 ) {
+            if (event.shiftKey && event.keyCode === KeyCode.F10) {
                 showContextMenu(e);
             }
         }));
@@ -608,22 +661,22 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         disposables.add(addDisposableListener(tab, EventType$1.KEY_UP, e => {
             const event = ( (new StandardKeyboardEvent(e)));
             let handled = false;
-            if (event.equals(3 ) || event.equals(10 )) {
+            if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
                 handled = true;
                 const editor = this.tabsModel.getEditorByIndex(tabIndex);
                 if (editor) {
                     this.groupView.openEditor(editor);
                 }
             }
-            else if (( ([15 , 17 , 16 , 18 , 14 , 13 ].some(kb => event.equals(kb))))) {
+            else if (( ([KeyCode.LeftArrow, KeyCode.RightArrow, KeyCode.UpArrow, KeyCode.DownArrow, KeyCode.Home, KeyCode.End].some(kb => event.equals(kb))))) {
                 let editorIndex = this.toEditorIndex(tabIndex);
-                if (event.equals(15 ) || event.equals(16 )) {
+                if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.UpArrow)) {
                     editorIndex = editorIndex - 1;
                 }
-                else if (event.equals(17 ) || event.equals(18 )) {
+                else if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.DownArrow)) {
                     editorIndex = editorIndex + 1;
                 }
-                else if (event.equals(14 )) {
+                else if (event.equals(KeyCode.Home)) {
                     editorIndex = 0;
                 }
                 else {
@@ -682,10 +735,19 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                     return;
                 }
                 isNewWindowOperation = this.isNewWindowOperation(e);
-                this.editorTransfer.setData([( (new DraggedEditorIdentifier({ editor, groupId: this.groupView.id })))], DraggedEditorIdentifier.prototype);
+                const selectedEditors = this.groupView.selectedEditors;
+                this.editorTransfer.setData(( (selectedEditors.map(
+                    e => ( (new DraggedEditorIdentifier({ editor: e, groupId: this.groupView.id })))
+                ))), DraggedEditorIdentifier.prototype);
                 if (e.dataTransfer) {
                     e.dataTransfer.effectAllowed = 'copyMove';
-                    e.dataTransfer.setDragImage(tab, 0, 0);
+                    if (selectedEditors.length > 1) {
+                        const label = `${editor.getName()} + ${selectedEditors.length - 1}`;
+                        applyDragImage(e, label, 'monaco-editor-group-drag-image', this.getColor(listActiveSelectionBackground), this.getColor(listActiveSelectionForeground));
+                    }
+                    else {
+                        e.dataTransfer.setDragImage(tab, 0, 0);
+                    }
                 }
                 this.doFillResourceDataTransfers([editor], e, isNewWindowOperation);
                 scheduleAtNextAnimationFrame(getWindow(this.parent), () => this.updateDropFeedback(tab, false, e, tabIndex));
@@ -718,11 +780,12 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             },
             onDragEnd: async (e) => {
                 this.updateDropFeedback(tab, false, e, tabIndex);
+                const draggedEditors = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
                 this.editorTransfer.clearData(DraggedEditorIdentifier.prototype);
-                const editor = this.tabsModel.getEditorByIndex(tabIndex);
                 if (!isNewWindowOperation ||
                     isWindowDraggedOver() ||
-                    !editor) {
+                    !draggedEditors ||
+                    draggedEditors.length === 0) {
                     return;
                 }
                 const auxiliaryEditorPart = await this.maybeCreateAuxiliaryEditorPartAt(e, tab);
@@ -730,11 +793,12 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                     return;
                 }
                 const targetGroup = auxiliaryEditorPart.activeGroup;
-                if (this.isMoveOperation(lastDragEvent ?? e, targetGroup.id, editor)) {
-                    this.groupView.moveEditor(editor, targetGroup);
+                const editors = ( (draggedEditors.map(de => ({ editor: de.identifier.editor }))));
+                if (this.isMoveOperation(lastDragEvent ?? e, targetGroup.id, draggedEditors[0].identifier.editor)) {
+                    this.groupView.moveEditors(editors, targetGroup);
                 }
                 else {
-                    this.groupView.copyEditor(editor, targetGroup);
+                    this.groupView.copyEditors(editors, targetGroup);
                 }
                 targetGroup.focus();
             },
@@ -744,17 +808,6 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                 if (this.getTabDragOverLocation(e, tab) === 'right') {
                     targetIndex++;
                 }
-                const editorIdentifiers = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
-                if (editorIdentifiers !== undefined) {
-                    const draggedEditorIdentifier = editorIdentifiers[0].identifier;
-                    const sourceGroup = this.editorPartsView.getGroup(draggedEditorIdentifier.groupId);
-                    if (sourceGroup?.id === this.groupView.id) {
-                        const editorIndex = sourceGroup.getIndexOfEditor(draggedEditorIdentifier.editor);
-                        if (editorIndex < targetIndex) {
-                            targetIndex--;
-                        }
-                    }
-                }
                 this.onDrop(e, targetIndex, tabsContainer);
             }
         }))));
@@ -763,7 +816,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     isSupportedDropTransfer(e) {
         if (this.groupTransfer.hasData(DraggedEditorGroupIdentifier.prototype)) {
             const data = this.groupTransfer.getData(DraggedEditorGroupIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 const group = data[0];
                 if (group.identifier === this.groupView.id) {
                     return false;
@@ -831,18 +884,82 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         const tabAfter = isLeftSideOfTab ? targetTab : targetTab.nextElementSibling;
         return { leftElement: tabBefore, rightElement: tabAfter };
     }
+    async selectEditor(editor) {
+        if (this.groupView.isActive(editor)) {
+            return;
+        }
+        await this.groupView.setSelection(editor, this.groupView.selectedEditors);
+    }
+    async selectEditorsBetween(target, anchor) {
+        const editorIndex = this.groupView.getIndexOfEditor(target);
+        if (editorIndex === -1) {
+            throw ( (new BugIndicatingError()));
+        }
+        const anchorIndex = this.groupView.getIndexOfEditor(anchor);
+        if (anchorIndex === -1) {
+            throw ( (new BugIndicatingError()));
+        }
+        let selection = this.groupView.selectedEditors;
+        let currentIndex = anchorIndex;
+        while (currentIndex >= 0 && currentIndex <= this.groupView.count - 1) {
+            currentIndex = anchorIndex < editorIndex ? currentIndex - 1 : currentIndex + 1;
+            if (!this.tabsModel.isSelected(currentIndex)) {
+                break;
+            }
+            const currentEditor = this.groupView.getEditorByIndex(currentIndex);
+            if (!currentEditor) {
+                break;
+            }
+            selection = selection.filter(editor => !editor.matches(currentEditor));
+        }
+        const fromIndex = anchorIndex < editorIndex ? anchorIndex : editorIndex;
+        const toIndex = anchorIndex < editorIndex ? editorIndex : anchorIndex;
+        const editorsToSelect = this.groupView.getEditors(EditorsOrder.SEQUENTIAL).slice(fromIndex, toIndex + 1);
+        for (const editor of editorsToSelect) {
+            if (!this.tabsModel.isSelected(editor)) {
+                selection.push(editor);
+            }
+        }
+        const inactiveSelectedEditors = selection.filter(editor => !editor.matches(target));
+        await this.groupView.setSelection(target, inactiveSelectedEditors);
+    }
+    async unselectEditor(editor) {
+        const isUnselectingActiveEditor = this.groupView.isActive(editor);
+        if (isUnselectingActiveEditor && this.groupView.selectedEditors.length === 1) {
+            return;
+        }
+        let newActiveEditor = assertIsDefined(this.groupView.activeEditor);
+        if (isUnselectingActiveEditor) {
+            const recentEditors = this.groupView.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
+            for (let i = 1; i < recentEditors.length; i++) {
+                const recentEditor = recentEditors[i];
+                if (this.tabsModel.isSelected(recentEditor)) {
+                    newActiveEditor = recentEditor;
+                    break;
+                }
+            }
+        }
+        const inactiveSelectedEditors = this.groupView.selectedEditors.filter(e => !e.matches(editor) && !e.matches(newActiveEditor));
+        await this.groupView.setSelection(newActiveEditor, inactiveSelectedEditors);
+    }
+    async unselectAllEditors() {
+        if (this.groupView.selectedEditors.length > 1) {
+            const activeEditor = assertIsDefined(this.groupView.activeEditor);
+            await this.groupView.setSelection(activeEditor, []);
+        }
+    }
     computeTabLabels() {
         const { labelFormat } = this.groupsView.partOptions;
         const { verbosity, shortenDuplicates } = this.getLabelConfigFlags(labelFormat);
         const labels = [];
         let activeEditorTabIndex = -1;
-        this.tabsModel.getEditors(1 ).forEach((editor, tabIndex) => {
+        this.tabsModel.getEditors(EditorsOrder.SEQUENTIAL).forEach((editor, tabIndex) => {
             labels.push({
                 editor,
                 name: editor.getName(),
                 description: editor.getDescription(verbosity),
-                forceDescription: editor.hasCapability(64 ),
-                title: editor.getTitle(2 ),
+                forceDescription: editor.hasCapability(EditorInputCapabilities.ForceDescription),
+                title: editor.getTitle(Verbosity.LONG),
                 ariaLabel: computeEditorAriaLabel(editor, tabIndex, this.groupView, this.editorPartsView.count)
             });
             if (editor === this.tabsModel.activeEditor) {
@@ -877,14 +994,14 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             let useLongDescriptions = false;
             for (const [, duplicateLabels] of mapDescriptionToDuplicates) {
                 if (!useLongDescriptions && duplicateLabels.length > 1) {
-                    const [first, ...rest] = ( (duplicateLabels.map(({ editor }) => editor.getDescription(2 ))));
+                    const [first, ...rest] = ( (duplicateLabels.map(({ editor }) => editor.getDescription(Verbosity.LONG))));
                     useLongDescriptions = ( (rest.some(description => description !== first)));
                 }
             }
             if (useLongDescriptions) {
                 mapDescriptionToDuplicates.clear();
                 for (const duplicateLabel of duplicateLabels) {
-                    duplicateLabel.description = duplicateLabel.editor.getDescription(2 );
+                    duplicateLabel.description = duplicateLabel.editor.getDescription(Verbosity.LONG);
                     getOrSet(mapDescriptionToDuplicates, duplicateLabel.description, []).push(duplicateLabel);
                 }
             }
@@ -911,13 +1028,13 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     getLabelConfigFlags(value) {
         switch (value) {
             case 'short':
-                return { verbosity: 0 , shortenDuplicates: false };
+                return { verbosity: Verbosity.SHORT, shortenDuplicates: false };
             case 'medium':
-                return { verbosity: 1 , shortenDuplicates: false };
+                return { verbosity: Verbosity.MEDIUM, shortenDuplicates: false };
             case 'long':
-                return { verbosity: 2 , shortenDuplicates: false };
+                return { verbosity: Verbosity.LONG, shortenDuplicates: false };
             default:
-                return { verbosity: 1 , shortenDuplicates: true };
+                return { verbosity: Verbosity.MEDIUM, shortenDuplicates: true };
         }
     }
     redraw(options) {
@@ -991,7 +1108,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             tabContainer.style.left = 'auto';
         }
         this.redrawTabBorders(tabIndex, tabContainer);
-        this.redrawTabActiveAndDirty(this.groupsView.activeGroup === this.groupView, editor, tabContainer, tabActionBar);
+        this.redrawTabSelectedActiveAndDirty(this.groupsView.activeGroup === this.groupView, editor, tabContainer, tabActionBar);
     }
     redrawTabLabel(editor, tabIndex, tabContainer, tabLabelWidget, tabLabel) {
         const options = this.groupsView.partOptions;
@@ -1035,25 +1152,35 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             tabContainer.removeAttribute('data-resource-name');
         }
     }
-    redrawTabActiveAndDirty(isGroupActive, editor, tabContainer, tabActionBar) {
+    redrawTabSelectedActiveAndDirty(isGroupActive, editor, tabContainer, tabActionBar) {
         const isTabActive = this.tabsModel.isActive(editor);
         const hasModifiedBorderTop = this.doRedrawTabDirty(isGroupActive, isTabActive, editor, tabContainer);
         this.doRedrawTabActive(isGroupActive, !hasModifiedBorderTop, editor, tabContainer, tabActionBar);
     }
     doRedrawTabActive(isGroupActive, allowBorderTop, editor, tabContainer, tabActionBar) {
         const isActive = this.tabsModel.isActive(editor);
+        const isSelected = this.tabsModel.isSelected(editor);
         tabContainer.classList.toggle('active', isActive);
+        tabContainer.classList.toggle('selected', isSelected);
         tabContainer.setAttribute('aria-selected', isActive ? 'true' : 'false');
         tabContainer.tabIndex = isActive ? 0 : -1;
         tabActionBar.setFocusable(isActive);
         if (isActive) {
             const activeTabBorderColorBottom = this.getColor(isGroupActive ? TAB_ACTIVE_BORDER : TAB_UNFOCUSED_ACTIVE_BORDER);
             tabContainer.classList.toggle('tab-border-bottom', !!activeTabBorderColorBottom);
-            tabContainer.style.setProperty('--tab-border-bottom-color', activeTabBorderColorBottom?.toString() ?? '');
-            const activeTabBorderColorTop = allowBorderTop ? this.getColor(isGroupActive ? TAB_ACTIVE_BORDER_TOP : TAB_UNFOCUSED_ACTIVE_BORDER_TOP) : undefined;
-            tabContainer.classList.toggle('tab-border-top', !!activeTabBorderColorTop);
-            tabContainer.style.setProperty('--tab-border-top-color', activeTabBorderColorTop?.toString() ?? '');
+            tabContainer.style.setProperty('--tab-border-bottom-color', activeTabBorderColorBottom ?? '');
         }
+        let tabBorderColorTop = null;
+        if (allowBorderTop) {
+            if (isActive) {
+                tabBorderColorTop = this.getColor(isGroupActive ? TAB_ACTIVE_BORDER_TOP : TAB_UNFOCUSED_ACTIVE_BORDER_TOP);
+            }
+            if (tabBorderColorTop === null && isSelected) {
+                tabBorderColorTop = this.getColor(TAB_SELECTED_BORDER_TOP);
+            }
+        }
+        tabContainer.classList.toggle('tab-border-top', !!tabBorderColorTop);
+        tabContainer.style.setProperty('--tab-border-top-color', tabBorderColorTop ?? '');
     }
     doRedrawTabDirty(isGroupActive, isTabActive, editor, tabContainer) {
         let hasModifiedBorderColor = false;
@@ -1105,7 +1232,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         }
         else {
             return {
-                primary: editorActions.primary.filter(action => action.id === UNLOCK_GROUP_COMMAND_ID),
+                primary: this.groupsView.partOptions.alwaysShowEditorActions ? editorActions.primary : editorActions.primary.filter(action => action.id === UNLOCK_GROUP_COMMAND_ID),
                 secondary: editorActions.secondary
             };
         }
@@ -1352,19 +1479,19 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         EventHelper.stop(e, true);
         this.updateDropFeedback(tabsContainer, false, e, targetTabIndex);
         tabsContainer.classList.remove('scroll');
-        const targetEditorIndex = this.tabsModel instanceof UnstickyEditorGroupModel ? targetTabIndex + this.groupView.stickyCount : targetTabIndex;
+        let targetEditorIndex = this.tabsModel instanceof UnstickyEditorGroupModel ? targetTabIndex + this.groupView.stickyCount : targetTabIndex;
         const options = {
             sticky: this.tabsModel instanceof StickyEditorGroupModel && this.tabsModel.stickyCount === targetEditorIndex,
             index: targetEditorIndex
         };
         if (this.groupTransfer.hasData(DraggedEditorGroupIdentifier.prototype)) {
             const data = this.groupTransfer.getData(DraggedEditorGroupIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 const sourceGroup = this.editorPartsView.getGroup(data[0].identifier);
                 if (sourceGroup) {
                     const mergeGroupOptions = { index: targetEditorIndex };
                     if (!this.isMoveOperation(e, sourceGroup.id)) {
-                        mergeGroupOptions.mode = 0 ;
+                        mergeGroupOptions.mode = MergeGroupMode.COPY_EDITORS;
                     }
                     this.groupsView.mergeGroup(sourceGroup, this.groupView, mergeGroupOptions);
                 }
@@ -1374,24 +1501,34 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         }
         else if (this.editorTransfer.hasData(DraggedEditorIdentifier.prototype)) {
             const data = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
-            if (Array.isArray(data)) {
-                const draggedEditor = data[0].identifier;
-                const sourceGroup = this.editorPartsView.getGroup(draggedEditor.groupId);
+            if (Array.isArray(data) && data.length > 0) {
+                const sourceGroup = this.editorPartsView.getGroup(data[0].identifier.groupId);
                 if (sourceGroup) {
-                    if (this.isMoveOperation(e, draggedEditor.groupId, draggedEditor.editor)) {
-                        sourceGroup.moveEditor(draggedEditor.editor, this.groupView, options);
-                    }
-                    else {
-                        sourceGroup.copyEditor(draggedEditor.editor, this.groupView, options);
+                    for (const de of data) {
+                        const editor = de.identifier.editor;
+                        if (sourceGroup.id !== de.identifier.groupId) {
+                            continue;
+                        }
+                        const sourceEditorIndex = sourceGroup.getIndexOfEditor(editor);
+                        if (sourceGroup === this.groupView && sourceEditorIndex < targetEditorIndex) {
+                            targetEditorIndex--;
+                        }
+                        if (this.isMoveOperation(e, de.identifier.groupId, editor)) {
+                            sourceGroup.moveEditor(editor, this.groupView, { ...options, index: targetEditorIndex });
+                        }
+                        else {
+                            sourceGroup.copyEditor(editor, this.groupView, { ...options, index: targetEditorIndex });
+                        }
+                        targetEditorIndex++;
                     }
                 }
-                this.groupView.focus();
-                this.editorTransfer.clearData(DraggedEditorIdentifier.prototype);
             }
+            this.groupView.focus();
+            this.editorTransfer.clearData(DraggedEditorIdentifier.prototype);
         }
         else if (this.treeItemsTransfer.hasData(DraggedTreeItemsIdentifier.prototype)) {
             const data = this.treeItemsTransfer.getData(DraggedTreeItemsIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 const editors = [];
                 for (const id of data) {
                     const dataTransferItem = await this.treeViewsDragAndDropService.removeDragOperationTransfer(id.identifier);
@@ -1448,6 +1585,11 @@ registerThemingParticipant((theme, collector) => {
 				outline-offset: -5px;
 			}
 
+			.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.selected:not(.active):not(:hover)  {
+				outline: 1px dotted;
+				outline-offset: -5px;
+			}
+
 			.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab.active:focus {
 				outline-style: dashed;
 			}
@@ -1482,7 +1624,7 @@ registerThemingParticipant((theme, collector) => {
     const tabHoverBackground = theme.getColor(TAB_HOVER_BACKGROUND);
     if (tabHoverBackground) {
         collector.addRule(`
-			.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab:hover  {
+			.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab:not(.selected):hover {
 				background-color: ${tabHoverBackground} !important;
 			}
 		`);
@@ -1490,7 +1632,7 @@ registerThemingParticipant((theme, collector) => {
     const tabUnfocusedHoverBackground = theme.getColor(TAB_UNFOCUSED_HOVER_BACKGROUND);
     if (tabUnfocusedHoverBackground) {
         collector.addRule(`
-			.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab:hover  {
+			.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab:not(.selected):hover  {
 				background-color: ${tabUnfocusedHoverBackground} !important;
 			}
 		`);
@@ -1498,7 +1640,7 @@ registerThemingParticipant((theme, collector) => {
     const tabHoverForeground = theme.getColor(TAB_HOVER_FOREGROUND);
     if (tabHoverForeground) {
         collector.addRule(`
-			.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab:hover  {
+			.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab:not(.selected):hover  {
 				color: ${tabHoverForeground} !important;
 			}
 		`);
@@ -1506,7 +1648,7 @@ registerThemingParticipant((theme, collector) => {
     const tabUnfocusedHoverForeground = theme.getColor(TAB_UNFOCUSED_HOVER_FOREGROUND);
     if (tabUnfocusedHoverForeground) {
         collector.addRule(`
-			.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab:hover  {
+			.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab:not(.selected):hover  {
 				color: ${tabUnfocusedHoverForeground} !important;
 			}
 		`);

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

@@ -111,6 +111,10 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         this.stickyEditorTabsControl.setActive(isActive);
         this.unstickyEditorTabsControl.setActive(isActive);
     }
+    updateEditorSelections() {
+        this.stickyEditorTabsControl.updateEditorSelections();
+        this.unstickyEditorTabsControl.updateEditorSelections();
+    }
     updateEditorLabel(editor) {
         this.getEditorTabsController(editor).updateEditorLabel(editor);
     }

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

@@ -40,6 +40,7 @@ class NoEditorTabsControl extends EditorTabsControl {
     stickEditor(editor) { }
     unstickEditor(editor) { }
     setActive(isActive) { }
+    updateEditorSelections() { }
     updateEditorLabel(editor) { }
     updateEditorDirty(editor) { }
     getHeight() {