@codingame/monaco-vscode-api 34.1.3 → 35.0.1

package/vscode/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css

@@ -83,6 +83,22 @@
 	overflow: scroll !important;
 }
 
+/* Add tab control */
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tabs-bar-add-tab {
+	display: flex;
+	align-items: center;
+	flex: 0 0 auto;
+	height: var(--editor-group-tab-height);
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tabs-bar-add-tab.hidden {
+	display: none;
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tabs-bar-add-tab .action-label {
+	margin: 0 4px;
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container {
 
 	/* Enable wrapping via flex layout and dynamic height */

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

@@ -29,7 +29,8 @@ export declare class ModalEditorPart {
     private readonly hostService;
     private readonly configurationService;
     private readonly contextMenuService;
-    constructor(editorPartsView: IEditorPartsView, instantiationService: IInstantiationService, editorService: IEditorService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hostService: IHostService, configurationService: IConfigurationService, contextMenuService: IContextMenuService);
+    private readonly contextKeyService;
+    constructor(editorPartsView: IEditorPartsView, instantiationService: IInstantiationService, editorService: IEditorService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hostService: IHostService, configurationService: IConfigurationService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService);
     create(options?: IModalEditorPartOptions): Promise<ICreateModalEditorPartResult>;
     private createSidebar;
 }
@@ -39,6 +40,7 @@ interface IPosition {
 }
 declare class ModalEditorPartImpl extends EditorPart implements IModalEditorPart {
     readonly modalElement: HTMLElement;
+    private readonly modalContextKeyService;
     private static COUNTER;
     private readonly _onWillClose;
     readonly onWillClose: Event<void>;
@@ -73,7 +75,7 @@ declare class ModalEditorPartImpl extends EditorPart implements IModalEditorPart
     get navigation(): IModalEditorNavigation | undefined;
     private readonly optionsDisposable;
     private previousMainWindowActiveElement;
-    constructor(windowId: number, editorPartsView: IEditorPartsView, modalElement: HTMLElement, options: IModalEditorPartOptions | undefined, instantiationService: IInstantiationService, themeService: IThemeService, configurationService: IConfigurationService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, hostService: IHostService, contextKeyService: IContextKeyService);
+    constructor(windowId: number, editorPartsView: IEditorPartsView, modalElement: HTMLElement, options: IModalEditorPartOptions | undefined, instantiationService: IInstantiationService, themeService: IThemeService, configurationService: IConfigurationService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, hostService: IHostService, modalContextKeyService: IContextKeyService);
     create(parent: HTMLElement, options?: object): void;
     enforceModalPartOptions(): void;
     updateOptions(options?: IModalEditorPartOptions): void;

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

@@ -26,6 +26,7 @@ import { IStorageService } from '../../../../platform/storage/common/storage.ser
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { EditorPart } from './editorPart.js';
 import { GroupActivationReason, GroupsOrder, GroupDirection } from '../../../services/editor/common/editorGroupsService.js';
+import { USE_MODAL_EDITOR_SETTING } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext, EditorPartModalSidebarContext, EditorPartModalSidebarVisibleContext } from '../../../common/contextkeys.js';
 import { Verbosity, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
@@ -63,7 +64,6 @@ const defaultModalEditorAllowableCommands = ( new Set([
 "workbench.action.openSettings", "workbench.action.openSettings2", "workbench.action.openSettingsJson", "workbench.action.openGlobalSettings", "workbench.action.openApplicationSettingsJson", "workbench.action.openRawDefaultSettings", "workbench.action.openWorkspaceSettings", "workbench.action.openWorkspaceSettingsFile", "workbench.action.openFolderSettings", "workbench.action.openFolderSettingsFile", "workbench.action.openRemoteSettings", "workbench.action.openRemoteSettingsFile", "workbench.action.openAccessibilitySettings", "workbench.action.configureLanguageBasedSettings",
 "workbench.action.openGlobalKeybindings", "workbench.action.openDefaultKeybindingsFile", "workbench.action.openGlobalKeybindingsFile", "workbench.action.openKeyboardLayoutPicker",
 CLOSE_MODAL_EDITOR_COMMAND_ID, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID]));
-const USE_MODAL_EDITOR_SETTING = "workbench.editor.useModal";
 let ModalEditorPart = class ModalEditorPart {
     constructor(
         editorPartsView,
@@ -73,7 +73,8 @@ let ModalEditorPart = class ModalEditorPart {
         keybindingService,
         hostService,
         configurationService,
-        contextMenuService
+        contextMenuService,
+        contextKeyService
     ) {
         this.editorPartsView = editorPartsView;
         this.instantiationService = instantiationService;
@@ -83,12 +84,14 @@ let ModalEditorPart = class ModalEditorPart {
         this.hostService = hostService;
         this.configurationService = configurationService;
         this.contextMenuService = contextMenuService;
+        this.contextKeyService = contextKeyService;
     }
     async create(options) {
         const disposables = ( new DisposableStore());
         const modalElement = $(".monaco-modal-editor-block");
         this.layoutService.mainContainer.appendChild(modalElement);
         disposables.add(toDisposable(() => modalElement.remove()));
+        const modalContextKeyService = disposables.add(this.contextKeyService.createScoped(modalElement));
         disposables.add(addDisposableListener(modalElement, EventType.MOUSE_DOWN, e => {
             if (e.target === modalElement) {
                 EventHelper.stop(e, true);
@@ -132,7 +135,7 @@ let ModalEditorPart = class ModalEditorPart {
             hide(sidebarToggleContainer);
         }
         const sidebarToggleIcon = options?.sidebar?.sidebarHidden ? Codicon.layoutSidebarLeftOff : Codicon.layoutSidebarLeft;
-        const sidebarToggleAction = disposables.add(( new Action(TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID, ( localize(3697, "Toggle Sidebar")), ThemeIcon.asClassName(sidebarToggleIcon), true)));
+        const sidebarToggleAction = disposables.add(( new Action(TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID, ( localize(3773, "Toggle Sidebar")), ThemeIcon.asClassName(sidebarToggleIcon), true)));
         const sidebarToggleActionBar = disposables.add(( new ActionBar(sidebarToggleContainer)));
         sidebarToggleActionBar.push(sidebarToggleAction, {
             icon: true,
@@ -147,7 +150,7 @@ let ModalEditorPart = class ModalEditorPart {
             addDisposableListener(navigationContainer, EventType.DBLCLICK, e => EventHelper.stop(e, true))
         );
         const previousButton = disposables.add(( new Button(navigationContainer, {
-            title: ( localize(3698, "Previous"))
+            title: ( localize(3774, "Previous"))
         })));
         previousButton.icon = Codicon.chevronLeft;
         previousButton.element.classList.add("modal-editor-nav-button");
@@ -160,7 +163,7 @@ let ModalEditorPart = class ModalEditorPart {
         const navigationLabel = append(navigationContainer, $("span.modal-editor-nav-label"));
         navigationLabel.setAttribute("aria-live", "polite");
         const nextButton = disposables.add(( new Button(navigationContainer, {
-            title: ( localize(3699, "Next"))
+            title: ( localize(3775, "Next"))
         })));
         nextButton.icon = Codicon.chevronRight;
         nextButton.element.classList.add("modal-editor-nav-button");
@@ -171,14 +174,21 @@ let ModalEditorPart = class ModalEditorPart {
             }
         }));
         const actionBarContainer = append(headerElement, $("div.modal-editor-action-container"));
-        const sidebarResult = this.createSidebar(editorPartContainer, headerElement, options?.sidebar, disposables);
+        const sidebarResult = this.createSidebar(
+            editorPartContainer,
+            headerElement,
+            options?.sidebar,
+            modalContextKeyService,
+            disposables
+        );
         if (sidebarResult) {
             if (sidebarResult.isVisible()) {
                 editorPartContainer.classList.add("has-sidebar");
             }
             disposables.add(sidebarResult.onDidResize(() => layoutModal()));
         }
-        const editorPart = disposables.add(this.instantiationService.createInstance(
+        const modalInstantiationService = disposables.add(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, modalContextKeyService]))));
+        const editorPart = disposables.add(modalInstantiationService.createInstance(
             ModalEditorPartImpl,
             mainWindow.vscodeWindowId,
             this.editorPartsView,
@@ -191,7 +201,7 @@ let ModalEditorPart = class ModalEditorPart {
         disposables.add(Event.runAndSubscribe(editorPart.onDidChangeNavigation, (navigation => {
             if (navigation && navigation.total > 1) {
                 show(navigationContainer);
-                navigationLabel.textContent = ( localize(3700, "{0} of {1}", navigation.current + 1, navigation.total));
+                navigationLabel.textContent = ( localize(3776, "{0} of {1}", navigation.current + 1, navigation.total));
                 previousButton.enabled = navigation.current > 0;
                 nextButton.enabled = navigation.current < navigation.total - 1;
             } else {
@@ -269,6 +279,7 @@ let ModalEditorPart = class ModalEditorPart {
                         labelFormat === "short" ? Verbosity.SHORT : labelFormat === "long" ? Verbosity.LONG : Verbosity.MEDIUM
                     ) || ""
                 }, {
+                    title: activeEditor.getTitle(Verbosity.LONG),
                     icon: activeEditor.getIcon(),
                     extraClasses: activeEditor.getLabelExtraClasses()
                 });
@@ -566,7 +577,7 @@ let ModalEditorPart = class ModalEditorPart {
             disposables
         };
     }
-    createSidebar(container, headerElement, content, disposables) {
+    createSidebar(container, headerElement, content, modalContextKeyService, disposables) {
         if (!content) {
             return undefined;
         }
@@ -576,9 +587,10 @@ let ModalEditorPart = class ModalEditorPart {
         const sidebarContainer = append(container, $("div.modal-editor-sidebar.show-file-icons"));
         sidebarContainer.style.width = `${sidebarWidth}px`;
         setVisibility(visible, sidebarContainer);
+        const sidebarContextKeyService = disposables.add(modalContextKeyService.createScoped(sidebarContainer));
         const onDidLayoutEmitter = disposables.add(( new Emitter()));
         const contentDisposable = disposables.add(( new MutableDisposable()));
-        contentDisposable.value = content.render(sidebarContainer, onDidLayoutEmitter.event);
+        contentDisposable.value = content.render(sidebarContainer, onDidLayoutEmitter.event, sidebarContextKeyService);
         const getHeaderHeight = () => (headerElement.offsetHeight || MODAL_HEADER_HEIGHT);
         const sash = disposables.add(( new Sash(container, {
             getVerticalSashLeft: () => sidebarWidth,
@@ -650,12 +662,12 @@ let ModalEditorPart = class ModalEditorPart {
             updateContent: newContent => {
                 contentDisposable.clear();
                 sidebarContainer.textContent = "";
-                contentDisposable.value = newContent.render(sidebarContainer, onDidLayoutEmitter.event);
+                contentDisposable.value = newContent.render(sidebarContainer, onDidLayoutEmitter.event, sidebarContextKeyService);
             }
         };
     }
 };
-ModalEditorPart = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IEditorService)), ( __param(3, IWorkbenchLayoutService)), ( __param(4, IKeybindingService)), ( __param(5, IHostService)), ( __param(6, IConfigurationService)), ( __param(7, IContextMenuService))], ModalEditorPart));
+ModalEditorPart = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IEditorService)), ( __param(3, IWorkbenchLayoutService)), ( __param(4, IKeybindingService)), ( __param(5, IHostService)), ( __param(6, IConfigurationService)), ( __param(7, IContextMenuService)), ( __param(8, IContextKeyService))], ModalEditorPart));
 let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
     static {
         ModalEditorPartImpl_1 = this;
@@ -710,11 +722,12 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
         storageService,
         layoutService,
         hostService,
-        contextKeyService
+        modalContextKeyService
     ) {
         const id = ModalEditorPartImpl_1.COUNTER++;
-        super(editorPartsView, `workbench.parts.modalEditor.${id}`, ( localize(3701, "Modal Editor Area")), windowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
+        super(editorPartsView, `workbench.parts.modalEditor.${id}`, ( localize(3777, "Modal Editor Area")), windowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, modalContextKeyService);
         this.modalElement = modalElement;
+        this.modalContextKeyService = modalContextKeyService;
         this._onWillClose = this._register(( new Emitter()));
         this.onWillClose = this._onWillClose.event;
         this._onDidChangeMaximized = this._register(( new Emitter()));
@@ -804,19 +817,19 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
         }
     }
     handleContextKeys() {
-        const isModalEditorPartContext = EditorPartModalContext.bindTo(this.scopedContextKeyService);
+        const isModalEditorPartContext = EditorPartModalContext.bindTo(this.modalContextKeyService);
         isModalEditorPartContext.set(true);
-        const isMaximizedContext = EditorPartModalMaximizedContext.bindTo(this.scopedContextKeyService);
+        const isMaximizedContext = EditorPartModalMaximizedContext.bindTo(this.modalContextKeyService);
         isMaximizedContext.set(this._maximized);
         this._register(this.onDidChangeMaximized(maximized => isMaximizedContext.set(maximized)));
-        const hasNavigationContext = EditorPartModalNavigationContext.bindTo(this.scopedContextKeyService);
+        const hasNavigationContext = EditorPartModalNavigationContext.bindTo(this.modalContextKeyService);
         hasNavigationContext.set(!!this._navigation && this._navigation.total > 1);
         this._register(this.onDidChangeNavigation(
             navigation => hasNavigationContext.set(!!navigation && navigation.total > 1)
         ));
-        const sidebarContext = EditorPartModalSidebarContext.bindTo(this.scopedContextKeyService);
+        const sidebarContext = EditorPartModalSidebarContext.bindTo(this.modalContextKeyService);
         sidebarContext.set(this._hasSidebar);
-        const sidebarVisibleContext = EditorPartModalSidebarVisibleContext.bindTo(this.scopedContextKeyService);
+        const sidebarVisibleContext = EditorPartModalSidebarVisibleContext.bindTo(this.modalContextKeyService);
         sidebarVisibleContext.set(this._hasSidebar && !this._sidebarHidden);
         this._register(
             this.onDidToggleSidebar(() => sidebarVisibleContext.set(this._hasSidebar && !this._sidebarHidden))

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

@@ -4,6 +4,7 @@ import { IContextMenuService } from "../../../../platform/contextview/browser/co
 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 { IMenuService } from "../../../../platform/actions/common/actions.service.js";
 import { EditorTabsControl } from "./editorTabsControl.js";
 import { IQuickInputService } from "../../../../platform/quickinput/common/quickInput.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
@@ -37,6 +38,7 @@ export declare class MultiEditorTabsControl extends EditorTabsControl {
     private tabsAndActionsContainer;
     private tabsContainer;
     private tabsScrollbar;
+    private addTabContainer;
     private tabSizingFixedDisposables;
     private readonly closeEditorAction;
     private readonly unpinEditorAction;
@@ -51,8 +53,12 @@ export declare class MultiEditorTabsControl extends EditorTabsControl {
     private path;
     private lastMouseWheelEventTime;
     private isMouseOverTabs;
-    constructor(parent: HTMLElement, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupView: IEditorGroupView, tabsModel: IReadonlyEditorGroupModel, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, notificationService: INotificationService, quickInputService: IQuickInputService, themeService: IThemeService, editorService: EditorServiceImpl, pathService: IPathService, treeViewsDragAndDropService: ITreeViewsDnDService, editorResolverService: IEditorResolverService, hostService: IHostService);
+    constructor(parent: HTMLElement, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupView: IEditorGroupView, tabsModel: IReadonlyEditorGroupModel, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, notificationService: INotificationService, quickInputService: IQuickInputService, themeService: IThemeService, editorService: EditorServiceImpl, pathService: IPathService, treeViewsDragAndDropService: ITreeViewsDnDService, editorResolverService: IEditorResolverService, hostService: IHostService, menuService: IMenuService);
     protected create(parent: HTMLElement): HTMLElement;
+    private createAddTabControl;
+    private get tabCount();
+    private appendTab;
+    private removeLastTab;
     private createTabsScrollbar;
     private updateTabsScrollbarSizing;
     private updateTabsScrollbarVisibility;

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

@@ -9,13 +9,17 @@ 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,7 +47,7 @@ import { Dimension, $, addDisposableListener, EventType, EventHelper, DragAndDro
 import { localize } from '../../../../nls.js';
 import { prepareMoveCopyEditors } from './editor.js';
 import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
-import { assertReturnsAllDefined, assertReturnsDefined } from '../../../../base/common/types.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';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
@@ -63,6 +67,8 @@ 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);
@@ -109,7 +115,8 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         pathService,
         treeViewsDragAndDropService,
         editorResolverService,
-        hostService
+        hostService,
+        menuService
     ) {
         super(
             parent,
@@ -125,7 +132,8 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             quickInputService,
             themeService,
             editorResolverService,
-            hostService
+            hostService,
+            menuService
         );
         this.editorService = editorService;
         this.pathService = pathService;
@@ -171,10 +179,56 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.tabsScrollbar = this.createTabsScrollbar(this.tabsContainer);
         this.tabsAndActionsContainer.appendChild(this.tabsScrollbar.getDomNode());
         this.registerTabsContainerListeners(this.tabsContainer, this.tabsScrollbar);
+        this.createAddTabControl();
         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;
+    }
+    appendTab(tab, tabsContainer) {
+        if (this.addTabContainer) {
+            tabsContainer.insertBefore(tab, this.addTabContainer);
+        } else {
+            tabsContainer.appendChild(tab);
+        }
+    }
+    removeLastTab(tabsContainer) {
+        if (this.addTabContainer) {
+            this.addTabContainer.previousElementSibling?.remove();
+        } else {
+            tabsContainer.lastChild?.remove();
+        }
+    }
     createTabsScrollbar(scrollable) {
         const tabsScrollbar = this._register(( new ScrollableElement(scrollable, {
             horizontal: this.getTabsScrollbarVisibility(),
@@ -423,8 +477,8 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     handleOpenedEditors() {
         this.updateTabsControlVisibility();
         const [tabsContainer, tabsScrollbar] = assertReturnsAllDefined(this.tabsContainer, this.tabsScrollbar);
-        for (let i = tabsContainer.children.length; i < this.tabsModel.count; i++) {
-            tabsContainer.appendChild(this.createTab(i, tabsContainer, tabsScrollbar));
+        for (let i = this.tabCount; i < this.tabsModel.count; i++) {
+            this.appendTab(this.createTab(i, tabsContainer, tabsScrollbar), tabsContainer);
         }
         const activeEditorChanged = this.didActiveEditorChange();
         const oldTabLabels = this.tabLabels;
@@ -477,8 +531,8 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     handleClosedEditors() {
         if (this.tabsModel.count) {
             const tabsContainer = assertReturnsDefined(this.tabsContainer);
-            while (tabsContainer.children.length > this.tabsModel.count) {
-                tabsContainer.lastChild?.remove();
+            while (this.tabCount > this.tabsModel.count) {
+                this.removeLastTab(tabsContainer);
                 dispose(this.tabDisposables.pop());
             }
             this.computeTabLabels();
@@ -489,6 +543,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         else {
             if (this.tabsContainer) {
                 clearNode(this.tabsContainer);
+                if (this.addTabContainer) {
+                    this.tabsContainer.appendChild(this.addTabContainer);
+                }
             }
             this.tabDisposables = dispose(this.tabDisposables);
             this.tabResourceLabels.clear();
@@ -651,7 +708,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             }
         }));
         const tabActionBar = ( new ActionBar(tabActionsContainer, {
-            ariaLabel: ( localize(3702, "Tab actions")),
+            ariaLabel: ( localize(3779, "Tab actions")),
             actionRunner: tabActionRunner
         }));
         const tabActionListener = tabActionBar.onWillRun(e => {
@@ -1559,6 +1616,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             let currentTabsPosY = undefined;
             let lastTab = undefined;
             for (const child of tabsContainer.children) {
+                if (child === this.addTabContainer) {
+                    continue;
+                }
                 const tab = child;
                 const tabPosY = tab.offsetTop;
                 if (tabPosY !== currentTabsPosY) {
@@ -1782,7 +1842,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))], MultiEditorTabsControl));
+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));
 registerThemingParticipant((theme, collector) => {
     const borderColor = theme.getColor(TAB_BORDER);
     if (borderColor) {

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(3703, "Side by Side Editor");
+        return localize(3780, "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

@@ -38,7 +38,7 @@ export declare class SingleEditorTabsControl extends EditorTabsControl {
     private redraw;
     private getVerbosity;
     protected prepareEditorActions(editorActions: IToolbarActions): IToolbarActions;
-    protected prepareEditorLayoutActions(): IToolbarActions;
+    protected prepareEditorLayoutActions(editorActions: IToolbarActions): IToolbarActions;
     getHeight(): number;
     layout(dimensions: IEditorTitleControlDimensions): Dimension;
 }

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

@@ -284,11 +284,8 @@ class SingleEditorTabsControl extends EditorTabsControl {
             };
         }
     }
-    prepareEditorLayoutActions() {
-        return {
-            primary: [],
-            secondary: []
-        };
+    prepareEditorLayoutActions(editorActions) {
+        return editorActions;
     }
     getHeight() {
         return this.tabHeight;

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

@@ -20,7 +20,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(3704, "Text Editor");
+        return localize(3781, "Text Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.editorControl = this._register(this.instantiationService.createInstance(

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

@@ -78,7 +78,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(3705, "Text Diff Editor");
+        return localize(3782, "Text Diff Editor");
     }
     createEditorControl(parent, configuration) {
         this.diffEditorControl = this._register(
@@ -142,13 +142,13 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localize(
-                    3706,
+                    3783,
                     "At least one file is not displayed in the text compare editor because it is very large ({0}).",
                     ByteSize.formatSize(error.size)
                 ));
             } else {
                 message = ( localize(
-                    3707,
+                    3784,
                     "At least one file is not displayed in the text compare editor because it is very large."
                 ));
             }

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

@@ -103,7 +103,7 @@ let AbstractTextEditor = class AbstractTextEditor extends AbstractEditorWithView
         return editorConfiguration;
     }
     computeAriaLabel() {
-        return this.input ? computeEditorAriaLabel(this.input, undefined, this.group, this.editorGroupService.count) : ( localize(3708, "Editor"));
+        return this.input ? computeEditorAriaLabel(this.input, undefined, this.group, this.editorGroupService.count) : ( localize(3785, "Editor"));
     }
     onDidChangeFileSystemProvider(scheme) {
         if (!this.input) {