@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -4,22 +4,19 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import * as multieditortabscontrol from './media/multieditortabscontrol.css';
 import { isWindows, isLinux, isMacintosh } from '../../../../base/common/platform.js';
 import { shorten } from '../../../../base/common/labels.js';
-import { DEFAULT_EDITOR_ASSOCIATION, EditorsOrder, preventEditorClose, EditorCloseMethod, Verbosity, EditorInputCapabilities, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, EditorsOrder, EditorInputCapabilities, preventEditorClose, EditorCloseMethod, Verbosity, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { computeEditorAriaLabel } from '../../editor.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touch.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { toAction } from '../../../../base/common/actions.js';
 import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
-import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { EditorTabsControl, EditorCommandsContextActionRunner } from './editorTabsControl.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { MutableDisposable, DisposableStore, dispose, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
@@ -43,10 +40,10 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, 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, EventHelper, DragAndDropObserver, isMouseEvent, getWindow, clearNode, scheduleAtNextAnimationFrame, findParentWithClass } from '../../../../base/browser/dom.js';
+import { Dimension, ModifierKeyEmitter, $, addDisposableListener, EventType, EventHelper, DragAndDropObserver, isMouseEvent, getWindow, clearNode, scheduleAtNextAnimationFrame, findParentWithClass } from '../../../../base/browser/dom.js';
 import { localize } from '../../../../nls.js';
 import { prepareMoveCopyEditors } from './editor.js';
-import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
+import { CloseEditorTabAction, UnpinEditorAction, CloseOtherEditorTabsInGroupAction } from './editorActions.js';
 import { assertReturnsDefined, assertReturnsAllDefined } from '../../../../base/common/types.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
@@ -67,8 +64,6 @@ import { UnstickyEditorGroupModel, StickyEditorGroupModel } from '../../../commo
 import { IHostService } from '../../../services/host/browser/host.service.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { applyDragImage } from '../../../../base/browser/ui/dnd/dnd.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
 
 var MultiEditorTabsControl_1;
 registerCss(multieditortabscontrol);
@@ -89,6 +84,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             fit: 120
         };
     }
+    static {
+        this.MODERN_UI_COMPACT_PINNED_TAB_WIDTH = 28;
+    }
     static {
         this.DRAG_OVER_OPEN_TAB_THRESHOLD = 1500;
     }
@@ -104,6 +102,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         groupsView,
         groupView,
         tabsModel,
+        menuIds,
+        breadcrumbsInHeader,
+        useModernUITabs,
         contextMenuService,
         instantiationService,
         contextKeyService,
@@ -124,6 +125,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             groupsView,
             groupView,
             tabsModel,
+            menuIds,
+            breadcrumbsInHeader,
+            useModernUITabs,
             contextMenuService,
             instantiationService,
             contextKeyService,
@@ -144,6 +148,12 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.unpinEditorAction = this._register(
             this.instantiationService.createInstance(UnpinEditorAction, UnpinEditorAction.ID, UnpinEditorAction.LABEL)
         );
+        this.closeOtherEditorTabsInGroupAction = this._register(this.instantiationService.createInstance(
+            CloseOtherEditorTabsInGroupAction,
+            CloseOtherEditorTabsInGroupAction.ID,
+            CloseOtherEditorTabsInGroupAction.LABEL
+        ));
+        this.isAltPressed = false;
         this.tabResourceLabels = this._register(
             this.instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER)
         );
@@ -163,14 +173,64 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this._register(
             this.tabResourceLabels.onDidChangeDecorations(() => this.doHandleDecorationsChange())
         );
+        this._register(ModifierKeyEmitter.getInstance().event(e => this.setAltPressed(e.altKey)));
+        this._register(hostService.onDidChangeFocus(hasFocus => {
+            if (!hasFocus) {
+                this.setAltPressed(false);
+                this.setHoveredTab(undefined);
+            }
+        }));
+    }
+    setAltPressed(isAltPressed) {
+        if (this.isAltPressed === isAltPressed) {
+            return;
+        }
+        this.isAltPressed = isAltPressed;
+        this.updateTabActionForHoveredTab();
+    }
+    updateTabActionForHoveredTab() {
+        if (typeof this.hoveredTabIndex !== "number") {
+            return;
+        }
+        this.redrawTabActionAtIndex(this.hoveredTabIndex);
+    }
+    redrawTabActionAtIndex(tabIndex) {
+        const editor = this.tabsModel.getEditorByIndex(tabIndex);
+        if (editor) {
+            this.doWithTab(
+                tabIndex,
+                editor,
+                (editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) => this.redrawTabAction(editor, tabIndex, tabContainer, tabActionBar)
+            );
+        }
+    }
+    setHoveredTab(tabIndex) {
+        if (this.hoveredTabIndex === tabIndex) {
+            return;
+        }
+        const previousHoveredTabIndex = this.hoveredTabIndex;
+        this.hoveredTabIndex = tabIndex;
+        if (!this.isAltPressed) {
+            return;
+        }
+        if (typeof previousHoveredTabIndex === "number") {
+            this.redrawTabActionAtIndex(previousHoveredTabIndex);
+        }
+        if (typeof tabIndex === "number") {
+            this.redrawTabActionAtIndex(tabIndex);
+        }
     }
     create(parent) {
         super.create(parent);
         this.titleContainer = parent;
         this.tabsAndActionsContainer = $(".tabs-and-actions-container");
         this.titleContainer.appendChild(this.tabsAndActionsContainer);
+        this.stickyTabsBackground = $(".sticky-tabs-background", {
+            "aria-hidden": true
+        });
         this.tabsContainer = $(".tabs-container", {
             role: "tablist",
+            "aria-multiselectable": "true",
             draggable: true
         });
         this._register(Gesture.addTarget(this.tabsContainer));
@@ -178,39 +238,15 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.updateTabSizing(false);
         this.tabsScrollbar = this.createTabsScrollbar(this.tabsContainer);
         this.tabsAndActionsContainer.appendChild(this.tabsScrollbar.getDomNode());
+        this.tabsScrollbar.getDomNode().appendChild(this.stickyTabsBackground);
         this.registerTabsContainerListeners(this.tabsContainer, this.tabsScrollbar);
-        this.createAddTabControl();
+        if (this.menuIds?.tabsBarAddTab) {
+            this.addTabContainer = this.createAddTabControl(this.tabsContainer, this.menuIds.tabsBarAddTab);
+        }
         this.createEditorActionsToolBar(this.tabsAndActionsContainer, ["editor-actions"]);
         this.updateTabsControlVisibility();
         return this.tabsAndActionsContainer;
     }
-    createAddTabControl() {
-        const tabsContainer = assertReturnsDefined(this.tabsContainer);
-        const container = $(".tabs-bar-add-tab");
-        tabsContainer.appendChild(container);
-        this.addTabContainer = container;
-        const menu = this._register(
-            this.menuService.createMenu(MenuId.EditorTabsBarAddTab, this.contextKeyService)
-        );
-        const getActions = () => getFlatActionBarActions(menu.getActions({
-            shouldForwardArgs: true
-        }));
-        const addTabAction = toAction({
-            id: "editor.tabs.addTab",
-            label: ( localize(3778, "Add Tab")),
-            class: ThemeIcon.asClassName(Codicon.add),
-            run: () => {}
-        });
-        const dropdown = this._register(( new DropdownMenuActionViewItem(addTabAction, {
-            getActions
-        }, this.contextMenuService, {
-            classNames: ThemeIcon.asClassNameArray(Codicon.add)
-        })));
-        dropdown.render(container);
-        const updateVisibility = () => this.addTabContainer?.classList.toggle("hidden", getActions().length === 0);
-        updateVisibility();
-        this._register(menu.onDidChange(() => updateVisibility()));
-    }
     get tabCount() {
         const tabsContainer = assertReturnsDefined(this.tabsContainer);
         return this.addTabContainer ? tabsContainer.children.length - 1 : tabsContainer.children.length;
@@ -340,6 +376,14 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                 e.preventDefault();
             }
         }));
+        this._register(addDisposableListener(tabsContainer, EventType.MOUSE_LEAVE, () => {
+            this.setHoveredTab(undefined);
+        }));
+        for (const eventType of [EventType.MOUSE_MOVE, EventType.MOUSE_DOWN]) {
+            this._register(addDisposableListener(tabsContainer, eventType, e => {
+                this.setAltPressed(e.altKey);
+            }, true));
+        }
         if (isLinux) {
             this._register(addDisposableListener(tabsContainer, EventType.MOUSE_UP, e => {
                 if (e.button === 1) {
@@ -438,7 +482,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             }
             this.contextMenuService.showContextMenu({
                 getAnchor: () => anchor,
-                menuId: MenuId.EditorTabsBarContext,
+                menuId: this.menuIds?.tabsBarContext ?? MenuId.EditorTabsBarContext,
                 contextKeyService: this.contextKeyService,
                 menuActionOptions: {
                     shouldForwardArgs: true
@@ -529,6 +573,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.handleClosedEditors();
     }
     handleClosedEditors() {
+        if (typeof this.hoveredTabIndex === "number" && this.hoveredTabIndex >= this.tabsModel.count) {
+            this.setHoveredTab(undefined);
+        }
         if (this.tabsModel.count) {
             const tabsContainer = assertReturnsDefined(this.tabsContainer);
             while (this.tabCount > this.tabsModel.count) {
@@ -639,6 +686,12 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             )
         );
     }
+    updateEditorCapabilities(editor) {
+        this.withTab(
+            editor,
+            (editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) => this.redrawTab(editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar)
+        );
+    }
     updateOptions(oldOptions, newOptions) {
         super.updateOptions(oldOptions, newOptions);
         if (oldOptions.labelFormat !== newOptions.labelFormat) {
@@ -693,6 +746,10 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             role: "tab"
         });
         const gestureDisposable = Gesture.addTarget(tabContainer);
+        const tabFillContainer = $(".tab-fill", {
+            "aria-hidden": true
+        });
+        tabContainer.appendChild(tabFillContainer);
         const tabBorderTopContainer = $(".tab-border-top-container");
         tabContainer.appendChild(tabBorderTopContainer);
         const editorLabel = this.tabResourceLabels.create(tabContainer, {
@@ -708,11 +765,11 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             }
         }));
         const tabActionBar = ( new ActionBar(tabActionsContainer, {
-            ariaLabel: ( localize(3779, "Tab actions")),
+            ariaLabel: ( localize(4021, "Tab actions")),
             actionRunner: tabActionRunner
         }));
         const tabActionListener = tabActionBar.onWillRun(e => {
-            if (e.action.id === this.closeEditorAction.id) {
+            if (e.action.id === this.closeEditorAction.id || e.action.id === this.closeOtherEditorTabsInGroupAction.id) {
                 this.blockRevealActiveTabOnce();
             }
         });
@@ -793,6 +850,14 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         disposables.add(
             addDisposableListener(tab, EventType$1.Tap, e => handleClickOrTouch(e, true))
         );
+        disposables.add(addDisposableListener(tab, EventType.MOUSE_ENTER, () => {
+            this.setHoveredTab(tabIndex);
+        }));
+        disposables.add(addDisposableListener(tab, EventType.MOUSE_LEAVE, () => {
+            if (this.hoveredTabIndex === tabIndex) {
+                this.setHoveredTab(undefined);
+            }
+        }));
         disposables.add(addDisposableListener(tab, EventType$1.Change, e => {
             tabsScrollbar.setScrollPosition({
                 scrollLeft: tabsScrollbar.getScrollPosition().scrollLeft - e.translationX
@@ -817,7 +882,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                 EventHelper.stop(e, true );
                 const editor = this.tabsModel.getEditorByIndex(tabIndex);
                 if (editor) {
-                    if (preventEditorClose(
+                    if (editor.hasCapability(EditorInputCapabilities.CannotClose) || preventEditorClose(
                         this.tabsModel,
                         editor,
                         EditorCloseMethod.MOUSE,
@@ -1287,16 +1352,18 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.updateEditorActionsToolbar();
         this.layout(this.dimensions, options);
     }
-    redrawTab(editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) {
+    redrawTabAction(editor, tabIndex, tabContainer, tabActionBar) {
         const isTabSticky = this.tabsModel.isSticky(tabIndex);
+        const isCloseable = !editor.hasCapability(EditorInputCapabilities.CannotClose);
         const options = this.groupsView.partOptions;
-        this.redrawTabLabel(editor, tabIndex, tabContainer, tabLabelWidget, tabLabel);
         const hasUnpinAction = isTabSticky && options.tabActionUnpinVisibility;
-        const hasCloseAction = !hasUnpinAction && options.tabActionCloseVisibility;
+        const hasCloseAction = isCloseable && !hasUnpinAction && options.tabActionCloseVisibility;
         const hasAction = hasUnpinAction || hasCloseAction;
+        const wantsCloseOthersAction = hasCloseAction && this.isAltPressed && tabIndex === this.hoveredTabIndex;
+        this.closeOtherEditorTabsInGroupAction.enabled = this.groupView.count > 1;
         let tabAction;
         if (hasAction) {
-            tabAction = hasUnpinAction ? this.unpinEditorAction : this.closeEditorAction;
+            tabAction = hasUnpinAction ? this.unpinEditorAction : wantsCloseOthersAction ? this.closeOtherEditorTabsInGroupAction : this.closeEditorAction;
         } else {
             tabAction = isTabSticky ? this.unpinEditorAction : this.closeEditorAction;
         }
@@ -1304,17 +1371,25 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             if (!tabActionBar.isEmpty()) {
                 tabActionBar.clear();
             }
+            const keybinding = tabAction === this.closeOtherEditorTabsInGroupAction ? (isMacintosh ? ( localize(4022, "⌥+Click")) : ( localize(4023, "Alt+Click"))) : this.getKeybindingLabel(tabAction);
             tabActionBar.push(tabAction, {
                 icon: true,
                 label: false,
-                keybinding: this.getKeybindingLabel(tabAction)
+                keybinding
             });
         }
         tabContainer.classList.toggle(`pinned-action-off`, isTabSticky && !hasUnpinAction);
         tabContainer.classList.toggle(`close-action-off`, !hasUnpinAction && !hasCloseAction);
+        tabContainer.classList.toggle("cannot-close", !isCloseable);
         for (const option of ["left", "right"]) {
             tabContainer.classList.toggle(`tab-actions-${option}`, hasAction && options.tabActionLocation === option);
         }
+    }
+    redrawTab(editor, tabIndex, tabContainer, tabLabelWidget, tabLabel, tabActionBar) {
+        const isTabSticky = this.tabsModel.isSticky(tabIndex);
+        const options = this.groupsView.partOptions;
+        this.redrawTabLabel(editor, tabIndex, tabContainer, tabLabelWidget, tabLabel);
+        this.redrawTabAction(editor, tabIndex, tabContainer, tabActionBar);
         const tabSizing = isTabSticky && options.pinnedTabSizing === "shrink" ? "shrink"  : options.tabSizing;
         for (const option of ["fit", "shrink", "fixed"]) {
             tabContainer.classList.toggle(`sizing-${option}`, tabSizing === option);
@@ -1325,16 +1400,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             tabContainer.classList.toggle(`sticky-${option}`, isTabSticky && options.pinnedTabSizing === option);
         }
         if (!options.wrapTabs && isTabSticky && options.pinnedTabSizing !== "normal") {
-            let stickyTabWidth = 0;
-            switch (options.pinnedTabSizing) {
-            case "compact":
-                stickyTabWidth = MultiEditorTabsControl_1.TAB_WIDTH.compact;
-                break;
-            case "shrink":
-                stickyTabWidth = MultiEditorTabsControl_1.TAB_WIDTH.shrink;
-                break;
-            }
-            tabContainer.style.left = `${tabIndex * stickyTabWidth}px`;
+            tabContainer.style.left = `${tabIndex * this.getStickyTabWidth(options.pinnedTabSizing)}px`;
         } else {
             tabContainer.style.left = "auto";
         }
@@ -1409,7 +1475,8 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         const isSelected = this.tabsModel.isSelected(editor);
         tabContainer.classList.toggle("active", isActive);
         tabContainer.classList.toggle("selected", isSelected);
-        tabContainer.setAttribute("aria-selected", isActive ? "true" : "false");
+        tabContainer.classList.toggle("multi-selected", isSelected && this.groupView.selectedEditors.length > 1);
+        tabContainer.setAttribute("aria-selected", isSelected ? "true" : "false");
         tabContainer.tabIndex = isActive ? 0 : -1;
         tabActionBar.setFocusable(isActive);
         if (isActive) {
@@ -1544,6 +1611,8 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         const tabsWrapMultiLine = this.doLayoutTabsWrapping(dimensions);
         if (!tabsWrapMultiLine) {
             this.doLayoutTabsNonWrapping(options);
+        } else {
+            assertReturnsDefined(this.stickyTabsBackground).style.width = "0px";
         }
     }
     doLayoutTabsWrapping(dimensions) {
@@ -1645,16 +1714,14 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         const allTabsWidth = tabsContainer.scrollWidth;
         let stickyTabsWidth = 0;
         if (this.tabsModel.stickyCount > 0) {
-            let stickyTabWidth = 0;
-            switch (this.groupsView.partOptions.pinnedTabSizing) {
-            case "compact":
-                stickyTabWidth = MultiEditorTabsControl_1.TAB_WIDTH.compact;
-                break;
-            case "shrink":
-                stickyTabWidth = MultiEditorTabsControl_1.TAB_WIDTH.shrink;
-                break;
-            }
+            const stickyTabWidth = this.getStickyTabWidth(this.groupsView.partOptions.pinnedTabSizing);
             stickyTabsWidth = this.tabsModel.stickyCount * stickyTabWidth;
+            for (let tabIndex = 0; tabIndex < this.tabsModel.stickyCount; tabIndex++) {
+                const tab = this.getTabAtIndex(tabIndex);
+                if (tab) {
+                    tab.style.left = `${tabIndex * stickyTabWidth}px`;
+                }
+            }
         }
         const activeTabAndIndex = this.tabsModel.activeEditor ? this.getTabAndIndex(this.tabsModel.activeEditor) : undefined;
         const [activeTab, activeTabIndex] = activeTabAndIndex ?? [undefined, undefined];
@@ -1668,6 +1735,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         } else {
             tabsContainer.classList.remove("disable-sticky-tabs");
         }
+        assertReturnsDefined(this.stickyTabsBackground).style.width = `${stickyTabsWidth}px`;
         let activeTabPosX;
         let activeTabWidth;
         if (!this.blockRevealActiveTab && activeTab) {
@@ -1702,6 +1770,17 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             });
         }
     }
+    getStickyTabWidth(pinnedTabSizing) {
+        const hasModernUITabs = Boolean(this.parent.closest(".modern-ui-tabs"));
+        switch (pinnedTabSizing) {
+        case "compact":
+            return hasModernUITabs ? MultiEditorTabsControl_1.MODERN_UI_COMPACT_PINNED_TAB_WIDTH : MultiEditorTabsControl_1.TAB_WIDTH.compact;
+        case "shrink":
+            return MultiEditorTabsControl_1.TAB_WIDTH.shrink;
+        default:
+            return 0;
+        }
+    }
     updateTabsControlVisibility() {
         const tabsAndActionsContainer = assertReturnsDefined(this.tabsAndActionsContainer);
         tabsAndActionsContainer.classList.toggle("empty", !this.visible);
@@ -1787,6 +1866,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                                 ...options,
                                 index: targetEditorIndex
                             });
+                            if (this.tabsModel instanceof UnstickyEditorGroupModel && this.groupView.isSticky(editor)) {
+                                this.groupView.unstickEditor(editor);
+                            }
                         } else {
                             sourceGroup.copyEditor(editor, this.groupView, {
                                 ...options,
@@ -1842,7 +1924,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.tabDisposables = dispose(this.tabDisposables);
     }
 };
-MultiEditorTabsControl = MultiEditorTabsControl_1 = ( __decorate([( __param(5, IContextMenuService)), ( __param(6, IInstantiationService)), ( __param(7, IContextKeyService)), ( __param(8, IKeybindingService)), ( __param(9, INotificationService)), ( __param(10, IQuickInputService)), ( __param(11, IThemeService)), ( __param(12, IEditorService)), ( __param(13, IPathService)), ( __param(14, ITreeViewsDnDService)), ( __param(15, IEditorResolverService)), ( __param(16, IHostService)), ( __param(17, IMenuService))], MultiEditorTabsControl));
+MultiEditorTabsControl = MultiEditorTabsControl_1 = ( __decorate([( __param(8, IContextMenuService)), ( __param(9, IInstantiationService)), ( __param(10, IContextKeyService)), ( __param(11, IKeybindingService)), ( __param(12, INotificationService)), ( __param(13, IQuickInputService)), ( __param(14, IThemeService)), ( __param(15, IEditorService)), ( __param(16, IPathService)), ( __param(17, ITreeViewsDnDService)), ( __param(18, IEditorResolverService)), ( __param(19, IHostService)), ( __param(20, IMenuService))], MultiEditorTabsControl));
 registerThemingParticipant((theme, collector) => {
     const borderColor = theme.getColor(TAB_BORDER);
     if (borderColor) {
@@ -1871,7 +1953,7 @@ registerThemingParticipant((theme, collector) => {
             }
 
             .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active {
-                outline: 1px dotted;
+                outline: 1px dashed;
                 outline-offset: -5px;
             }
 
@@ -1880,11 +1962,11 @@ registerThemingParticipant((theme, collector) => {
                 outline-offset: -5px;
             }
 
-            .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active > .tab-actions .action-label,
-            .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active:hover > .tab-actions .action-label,
-            .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-actions .action-label,
-            .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sticky > .tab-actions .action-label,
-            .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab:hover > .tab-actions .action-label {
+            .monaco-workbench:not(.modern-ui-tabs) .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active > .tab-actions .action-label,
+            .monaco-workbench:not(.modern-ui-tabs) .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active:hover > .tab-actions .action-label,
+            .monaco-workbench:not(.modern-ui-tabs) .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-actions .action-label,
+            .monaco-workbench:not(.modern-ui-tabs) .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sticky > .tab-actions .action-label,
+            .monaco-workbench:not(.modern-ui-tabs) .part.editor > .content .editor-group-container > .title .tabs-container > .tab:hover > .tab-actions .action-label {
                 opacity: 1 !important;
             }
         `);

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

@@ -1,6 +1,6 @@
 import { Dimension } from "../../../../base/browser/dom.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
-import { IEditorGroupsView, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from "./editor.js";
+import { IEditorGroupMenuIds, IEditorGroupsView, IEditorGroupView, IEditorPartsView, IInternalEditorOpenOptions } from "./editor.js";
 import { IEditorTabsControl } from "./editorTabsControl.js";
 import { IEditorPartOptions } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
@@ -12,11 +12,14 @@ export declare class MultiRowEditorControl extends Disposable implements IEditor
     private readonly groupsView;
     private readonly groupView;
     private readonly model;
+    private readonly menuIds;
+    private readonly breadcrumbsInHeader;
+    private readonly useModernUITabs;
     private readonly instantiationService;
     private readonly stickyEditorTabsControl;
     private readonly unstickyEditorTabsControl;
     private activeControl;
-    constructor(parent: HTMLElement, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupView: IEditorGroupView, model: IReadonlyEditorGroupModel, instantiationService: IInstantiationService);
+    constructor(parent: HTMLElement, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupView: IEditorGroupView, model: IReadonlyEditorGroupModel, menuIds: IEditorGroupMenuIds | undefined, breadcrumbsInHeader: boolean, useModernUITabs: boolean, instantiationService: IInstantiationService);
     private handleTabBarsStateChange;
     private handleTabBarsLayoutChange;
     private didActiveControlChange;
@@ -35,6 +38,7 @@ export declare class MultiRowEditorControl extends Disposable implements IEditor
     setActive(isActive: boolean): void;
     updateEditorSelections(): void;
     updateEditorLabel(editor: EditorInput): void;
+    updateEditorCapabilities(editor: EditorInput): void;
     updateEditorDirty(editor: EditorInput): void;
     updateOptions(oldOptions: IEditorPartOptions, newOptions: IEditorPartOptions): void;
     layout(dimensions: IEditorTitleControlDimensions): Dimension;

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

@@ -13,6 +13,9 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         groupsView,
         groupView,
         model,
+        menuIds,
+        breadcrumbsInHeader,
+        useModernUITabs,
         instantiationService
     ) {
         super();
@@ -20,6 +23,9 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         this.groupsView = groupsView;
         this.groupView = groupView;
         this.model = model;
+        this.menuIds = menuIds;
+        this.breadcrumbsInHeader = breadcrumbsInHeader;
+        this.useModernUITabs = useModernUITabs;
         this.instantiationService = instantiationService;
         const stickyModel = this._register(( new StickyEditorGroupModel(this.model)));
         const unstickyModel = this._register(( new UnstickyEditorGroupModel(this.model)));
@@ -29,7 +35,10 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
             editorPartsView,
             this.groupsView,
             this.groupView,
-            stickyModel
+            stickyModel,
+            this.menuIds,
+            this.breadcrumbsInHeader,
+            this.useModernUITabs
         ));
         this.unstickyEditorTabsControl = this._register(this.instantiationService.createInstance(
             MultiEditorTabsControl,
@@ -37,7 +46,10 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
             editorPartsView,
             this.groupsView,
             this.groupView,
-            unstickyModel
+            unstickyModel,
+            this.menuIds,
+            this.breadcrumbsInHeader,
+            this.useModernUITabs
         ));
         this.handleTabBarsStateChange();
     }
@@ -151,6 +163,9 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
     updateEditorLabel(editor) {
         this.getEditorTabsController(editor).updateEditorLabel(editor);
     }
+    updateEditorCapabilities(editor) {
+        this.getEditorTabsController(editor).updateEditorCapabilities(editor);
+    }
     updateEditorDirty(editor) {
         this.getEditorTabsController(editor).updateEditorDirty(editor);
     }
@@ -181,6 +196,6 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         super.dispose();
     }
 };
-MultiRowEditorControl = ( __decorate([( __param(5, IInstantiationService))], MultiRowEditorControl));
+MultiRowEditorControl = ( __decorate([( __param(8, IInstantiationService))], MultiRowEditorControl));
 
 export { MultiRowEditorControl };

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

@@ -22,6 +22,7 @@ export declare class NoEditorTabsControl extends EditorTabsControl {
     setActive(isActive: boolean): void;
     updateEditorSelections(): void;
     updateEditorLabel(editor: EditorInput): void;
+    updateEditorCapabilities(editor: EditorInput): void;
     updateEditorDirty(editor: EditorInput): void;
     getHeight(): number;
     layout(dimensions: IEditorTitleControlDimensions): Dimension;

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

@@ -57,6 +57,7 @@ class NoEditorTabsControl extends EditorTabsControl {
     setActive(isActive) {}
     updateEditorSelections() {}
     updateEditorLabel(editor) {}
+    updateEditorCapabilities(editor) {}
     updateEditorDirty(editor) {}
     getHeight() {
         return 0;

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

@@ -208,7 +208,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         if (this.input) {
             return this.input.getName();
         }
-        return localize(3780, "Side by Side Editor");
+        return localize(4024, "Side by Side Editor");
     }
     async setInput(input, options, context, token) {
         const oldInput = this.input;

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

@@ -28,6 +28,7 @@ export declare class SingleEditorTabsControl extends EditorTabsControl {
     setActive(isActive: boolean): void;
     updateEditorSelections(): void;
     updateEditorLabel(editor: EditorInput): void;
+    updateEditorCapabilities(editor: EditorInput): void;
     updateEditorDirty(editor: EditorInput): void;
     updateOptions(oldOptions: IEditorPartOptions, newOptions: IEditorPartOptions): void;
     updateStyles(): void;