@codingame/monaco-vscode-views-service-override 1.82.6 → 1.83.1

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

@@ -34,9 +34,9 @@ let DropOverlay = class DropOverlay extends Themable {
     static { DropOverlay_1 = this; }
     static { this.OVERLAY_ID = 'monaco-workbench-editor-drop-overlay'; }
     get disposed() { return !!this._disposed; }
-    constructor(accessor, groupView, themeService, configurationService, instantiationService, editorService, editorGroupService, treeViewsDragAndDropService, contextService) {
+    constructor(groupsView, groupView, themeService, configurationService, instantiationService, editorService, editorGroupService, treeViewsDragAndDropService, contextService) {
         super(themeService);
-        this.accessor = accessor;
+        this.groupsView = groupsView;
         this.groupView = groupView;
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
@@ -163,13 +163,13 @@ let DropOverlay = class DropOverlay extends Themable {
         if (this.groupTransfer.hasData(DraggedEditorGroupIdentifier.prototype)) {
             const data = this.groupTransfer.getData(DraggedEditorGroupIdentifier.prototype);
             if (Array.isArray(data)) {
-                return this.accessor.getGroup(data[0].identifier);
+                return this.groupsView.getGroup(data[0].identifier);
             }
         }
         else if (this.editorTransfer.hasData(DraggedEditorIdentifier.prototype)) {
             const data = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
             if (Array.isArray(data)) {
-                return this.accessor.getGroup(data[0].identifier.groupId);
+                return this.groupsView.getGroup(data[0].identifier.groupId);
             }
         }
         return undefined;
@@ -178,7 +178,7 @@ let DropOverlay = class DropOverlay extends Themable {
         const ensureTargetGroup = () => {
             let targetGroup;
             if (typeof splitDirection === 'number') {
-                targetGroup = this.accessor.addGroup(this.groupView, splitDirection);
+                targetGroup = this.groupsView.addGroup(this.groupView, splitDirection);
             }
             else {
                 targetGroup = this.groupView;
@@ -188,7 +188,7 @@ let DropOverlay = class DropOverlay extends Themable {
         if (this.groupTransfer.hasData(DraggedEditorGroupIdentifier.prototype)) {
             const data = this.groupTransfer.getData(DraggedEditorGroupIdentifier.prototype);
             if (Array.isArray(data)) {
-                const sourceGroup = this.accessor.getGroup(data[0].identifier);
+                const sourceGroup = this.groupsView.getGroup(data[0].identifier);
                 if (sourceGroup) {
                     if (typeof splitDirection !== 'number' && sourceGroup === this.groupView) {
                         return;
@@ -196,10 +196,10 @@ let DropOverlay = class DropOverlay extends Themable {
                     let targetGroup;
                     if (typeof splitDirection === 'number') {
                         if (this.isCopyOperation(event)) {
-                            targetGroup = this.accessor.copyGroup(sourceGroup, this.groupView, splitDirection);
+                            targetGroup = this.groupsView.copyGroup(sourceGroup, this.groupView, splitDirection);
                         }
                         else {
-                            targetGroup = this.accessor.moveGroup(sourceGroup, this.groupView, splitDirection);
+                            targetGroup = this.groupsView.moveGroup(sourceGroup, this.groupView, splitDirection);
                         }
                     }
                     else {
@@ -207,10 +207,10 @@ let DropOverlay = class DropOverlay extends Themable {
                         if (this.isCopyOperation(event)) {
                             mergeGroupOptions = { mode: 0  };
                         }
-                        this.accessor.mergeGroup(sourceGroup, this.groupView, mergeGroupOptions);
+                        this.groupsView.mergeGroup(sourceGroup, this.groupView, mergeGroupOptions);
                     }
                     if (targetGroup) {
-                        this.accessor.activateGroup(targetGroup);
+                        this.groupsView.activateGroup(targetGroup);
                     }
                 }
                 this.groupTransfer.clearData(DraggedEditorGroupIdentifier.prototype);
@@ -220,12 +220,12 @@ let DropOverlay = class DropOverlay extends Themable {
             const data = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
             if (Array.isArray(data)) {
                 const draggedEditor = data[0].identifier;
-                const sourceGroup = this.accessor.getGroup(draggedEditor.groupId);
+                const sourceGroup = this.groupsView.getGroup(draggedEditor.groupId);
                 if (sourceGroup) {
                     const copyEditor = this.isCopyOperation(event, draggedEditor);
                     let targetGroup = undefined;
                     if (this.editorGroupService.partOptions.closeEmptyGroups && sourceGroup.count === 1 && typeof splitDirection === 'number' && !copyEditor) {
-                        targetGroup = this.accessor.moveGroup(sourceGroup, this.groupView, splitDirection);
+                        targetGroup = this.groupsView.moveGroup(sourceGroup, this.groupView, splitDirection);
                     }
                     else {
                         targetGroup = ensureTargetGroup();
@@ -280,7 +280,7 @@ let DropOverlay = class DropOverlay extends Themable {
         return (e.altKey && !isMacintosh) || (e.shiftKey && isMacintosh);
     }
     positionOverlay(mousePosX, mousePosY, isDraggingGroup, enableSplitting) {
-        const preferSplitVertically = this.accessor.partOptions.openSideBySideDirection === 'right';
+        const preferSplitVertically = this.groupsView.partOptions.openSideBySideDirection === 'right';
         const editorControlWidth = this.groupView.element.clientWidth;
         const editorControlHeight = this.groupView.element.clientHeight - this.getOverlayOffsetHeight();
         let edgeWidthThresholdFactor;
@@ -383,7 +383,7 @@ let DropOverlay = class DropOverlay extends Themable {
         overlay.style.height = options.height;
     }
     getOverlayOffsetHeight() {
-        if (!this.groupView.isEmpty && this.accessor.partOptions.showTabs) {
+        if (!this.groupView.isEmpty && this.groupsView.partOptions.showTabs) {
             return this.groupView.titleHeight.offset;
         }
         return 0;
@@ -419,9 +419,9 @@ DropOverlay = DropOverlay_1 = ( __decorate([
     ( __param(8, IWorkspaceContextService))
 ], DropOverlay));
 let EditorDropTarget = class EditorDropTarget extends Themable {
-    constructor(accessor, container, delegate, themeService, configurationService, instantiationService) {
+    constructor(groupsView, container, delegate, themeService, configurationService, instantiationService) {
         super(themeService);
-        this.accessor = accessor;
+        this.groupsView = groupsView;
         this.container = container;
         this.delegate = delegate;
         this.configurationService = configurationService;
@@ -466,7 +466,7 @@ let EditorDropTarget = class EditorDropTarget extends Themable {
             if (!this.overlay) {
                 const targetGroupView = this.findTargetGroupView(target);
                 if (targetGroupView) {
-                    this._overlay = this.instantiationService.createInstance(DropOverlay, this.accessor, targetGroupView);
+                    this._overlay = this.instantiationService.createInstance(DropOverlay, this.groupsView, targetGroupView);
                 }
             }
         }
@@ -483,7 +483,7 @@ let EditorDropTarget = class EditorDropTarget extends Themable {
         this.disposeOverlay();
     }
     findTargetGroupView(child) {
-        const groups = this.accessor.groups;
+        const groups = this.groupsView.groups;
         return groups.find(groupView => isAncestor(child, groupView.element) || this.delegate.containsGroup?.(groupView));
     }
     updateContainer(isDraggedOver) {

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

@@ -2,18 +2,17 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/editorgroupview.css.js';
 import { isSerializedEditorGroupModel, EditorGroupModel, isGroupEditorCloseEvent, isGroupEditorOpenEvent } from 'vscode/vscode/vs/workbench/common/editor/editorGroupModel';
 import { DEFAULT_EDITOR_ASSOCIATION, SideBySideEditor, EditorResourceAccessor, EditorCloseContext } from 'vscode/vscode/vs/workbench/common/editor';
-import { ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, EditorPinnedAndUnpinnedTabsContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { Emitter, Relay } from 'monaco-editor/esm/vs/base/common/event.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { addDisposableListener, EventType, EventHelper, trackFocus, clearNode, isAncestor, Dimension, findParentWithClass } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { addDisposableListener, EventType, EventHelper, trackFocus, isAncestor, Dimension, findParentWithClass } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { ProgressBar } from 'monaco-editor/esm/vs/base/browser/ui/progressbar/progressbar.js';
 import { Themable, IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { contrastBorder, editorBackground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { EDITOR_GROUP_EMPTY_BACKGROUND, EDITOR_GROUP_HEADER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { TabsTitleControl } from './tabsTitleControl.js';
 import { EditorPanes } from './editorPanes.js';
 import { IEditorProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { EditorProgressIndicator } from 'vscode/vscode/vs/workbench/services/progress/browser/progressIndicator';
@@ -26,7 +25,6 @@ import { EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touc
 import { fillActiveEditorViewState } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
 import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { NoTabsTitleControl } from './noTabsTitleControl.js';
 import { MenuId, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
 import { createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
@@ -45,22 +43,23 @@ import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { TelemetryTrustedValue } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { defaultProgressBarStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { EditorGroupWatermark } from './editorGroupWatermark.js';
+import { EditorTitleControl } from './editorTitleControl.js';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var EditorGroupView_1;
 let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
-    static createNew(accessor, index, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView_1, accessor, null, index);
+    static createNew(groupsView, index, instantiationService) {
+        return instantiationService.createInstance(EditorGroupView_1, groupsView, null, index);
     }
-    static createFromSerialized(serialized, accessor, index, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView_1, accessor, serialized, index);
+    static createFromSerialized(serialized, groupsView, index, instantiationService) {
+        return instantiationService.createInstance(EditorGroupView_1, groupsView, serialized, index);
     }
-    static createCopy(copyFrom, accessor, index, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView_1, accessor, copyFrom, index);
+    static createCopy(copyFrom, groupsView, index, instantiationService) {
+        return instantiationService.createInstance(EditorGroupView_1, groupsView, copyFrom, index);
     }
-    constructor(accessor, from, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService) {
+    constructor(groupsView, from, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService) {
         super(themeService);
-        this.accessor = accessor;
+        this.groupsView = groupsView;
         this._index = _index;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
@@ -126,7 +125,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.titleContainer = document.createElement('div');
             this.titleContainer.classList.add('title');
             this.element.appendChild(this.titleContainer);
-            this.titleAreaControl = this.createTitleAreaControl();
+            this.titleControl = this._register(this.scopedInstantiationService.createInstance(EditorTitleControl, this.titleContainer, this.groupsView, this, this.model));
             this.editorContainer = document.createElement('div');
             this.editorContainer.classList.add('editor-container');
             this.element.appendChild(this.editorContainer);
@@ -151,6 +150,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const groupActiveEditorStickyContext = ActiveEditorStickyContext.bindTo(this.scopedContextKeyService);
         const groupEditorsCountContext = EditorGroupEditorsCountContext.bindTo(this.scopedContextKeyService);
         const groupLockedContext = ActiveEditorGroupLockedContext.bindTo(this.scopedContextKeyService);
+        const groupHasPinnedAndUnpinnedContext = EditorPinnedAndUnpinnedTabsContext.bindTo(this.scopedContextKeyService);
         const activeEditorListener = this._register(( new MutableDisposable()));
         const observeActiveEditor = () => {
             activeEditorListener.clear();
@@ -170,9 +170,10 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 case 2 :
                     groupLockedContext.set(this.isLocked);
                     break;
-                case 6 :
                 case 4 :
                 case 3 :
+                    groupHasPinnedAndUnpinnedContext.set(this.hasPinnedAndUnpinnedEditors());
+                case 6 :
                 case 5 :
                     groupActiveEditorFirstContext.set(this.model.isFirst(this.model.activeEditor));
                     groupActiveEditorLastContext.set(this.model.isLast(this.model.activeEditor));
@@ -186,6 +187,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorStickyContext.set(this.model.isSticky(this.model.activeEditor));
                     }
+                    groupHasPinnedAndUnpinnedContext.set(this.hasPinnedAndUnpinnedEditors());
                     break;
             }
             groupEditorsCountContext.set(this.count);
@@ -194,6 +196,10 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             observeActiveEditor();
         }));
         observeActiveEditor();
+        groupHasPinnedAndUnpinnedContext.set(this.hasPinnedAndUnpinnedEditors());
+    }
+    hasPinnedAndUnpinnedEditors() {
+        return this.model.stickyCount > 0 && this.model.stickyCount < this.model.count;
     }
     registerContainerListeners() {
         this._register(addDisposableListener(this.element, EventType.DBLCLICK, e => {
@@ -211,7 +217,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this._register(addDisposableListener(this.element, EventType.AUXCLICK, e => {
             if (this.isEmpty && e.button === 1 ) {
                 EventHelper.stop(e, true);
-                this.accessor.removeGroup(this);
+                this.groupsView.removeGroup(this);
             }
         }));
     }
@@ -302,21 +308,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.updateStyles();
     }
     updateTitleContainer() {
-        this.titleContainer.classList.toggle('tabs', this.accessor.partOptions.showTabs);
-        this.titleContainer.classList.toggle('show-file-icons', this.accessor.partOptions.showIcons);
-    }
-    createTitleAreaControl() {
-        if (this.titleAreaControl) {
-            this.titleAreaControl.dispose();
-            clearNode(this.titleContainer);
-        }
-        if (this.accessor.partOptions.showTabs) {
-            this.titleAreaControl = this.scopedInstantiationService.createInstance(TabsTitleControl, this.titleContainer, this.accessor, this);
-        }
-        else {
-            this.titleAreaControl = this.scopedInstantiationService.createInstance(NoTabsTitleControl, this.titleContainer, this.accessor, this);
-        }
-        return this.titleAreaControl;
+        this.titleContainer.classList.toggle('tabs', this.groupsView.partOptions.showTabs);
+        this.titleContainer.classList.toggle('show-file-icons', this.groupsView.partOptions.showIcons);
     }
     restoreEditors(from) {
         if (this.count === 0) {
@@ -338,15 +331,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         options.preserveFocus = true;
         const activeElement = document.activeElement;
         return this.doShowEditor(activeEditor, { active: true, isNew: false  }, options).then(() => {
-            if (this.accessor.activeGroup === this && activeElement === document.activeElement) {
+            if (this.groupsView.activeGroup === this && activeElement === document.activeElement) {
                 this.focus();
             }
         });
     }
     registerListeners() {
         this._register(this.model.onDidModelChange(e => this.onDidGroupModelChange(e)));
-        this._register(this.accessor.onDidChangeEditorPartOptions(e => this.onDidChangeEditorPartOptions(e)));
-        this._register(this.accessor.onDidVisibilityChange(e => this.onDidVisibilityChange(e)));
+        this._register(this.groupsView.onDidChangeEditorPartOptions(e => this.onDidChangeEditorPartOptions(e)));
+        this._register(this.groupsView.onDidVisibilityChange(e => this.onDidVisibilityChange(e)));
     }
     onDidGroupModelChange(e) {
         this._onDidModelChange.fire(e);
@@ -395,7 +388,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this._onDidCloseEditor.fire({ groupId: this.id, editor, context, index: editorIndex, sticky });
     }
     canDispose(editor) {
-        for (const groupView of this.accessor.groups) {
+        for (const groupView of this.groupsView.groups) {
             if (groupView instanceof EditorGroupView_1 && groupView.model.contains(editor, {
                 strictEquals: true,
                 supportSideBySide: SideBySideEditor.ANY
@@ -449,16 +442,14 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     onDidChangeEditorPartOptions(event) {
         this.updateTitleContainer();
-        if (event.oldPartOptions.showTabs !== event.newPartOptions.showTabs) {
-            this.createTitleAreaControl();
+        this.titleControl.updateOptions(event.oldPartOptions, event.newPartOptions);
+        if (event.oldPartOptions.showTabs !== event.newPartOptions.showTabs ||
+            (event.oldPartOptions.showTabs && event.oldPartOptions.pinnedTabsOnSeparateRow !== event.newPartOptions.pinnedTabsOnSeparateRow)) {
             this.relayout();
             if (this.model.activeEditor) {
-                this.titleAreaControl.openEditor(this.model.activeEditor);
+                this.titleControl.openEditor(this.model.activeEditor);
             }
         }
-        else {
-            this.titleAreaControl.updateOptions(event.oldPartOptions, event.newPartOptions);
-        }
         this.updateStyles();
         if (event.oldPartOptions.enablePreview && !event.newPartOptions.enablePreview) {
             if (this.model.previewEditor) {
@@ -468,10 +459,10 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     onDidChangeEditorDirty(editor) {
         this.pinEditor(editor);
-        this.titleAreaControl.updateEditorDirty(editor);
+        this.titleControl.updateEditorDirty(editor);
     }
     onDidChangeEditorLabel(editor) {
-        this.titleAreaControl.updateEditorLabel(editor);
+        this.titleControl.updateEditorLabel(editor);
     }
     onDidVisibilityChange(visible) {
         this.editorPane.setVisible(visible);
@@ -492,7 +483,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return this.count === 0;
     }
     get titleHeight() {
-        return this.titleAreaControl.getHeight();
+        return this.titleControl.getHeight();
     }
     notifyIndexChanged(newIndex) {
         if (this._index !== newIndex) {
@@ -504,7 +495,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.active = isActive;
         this.element.classList.toggle('active', isActive);
         this.element.classList.toggle('inactive', !isActive);
-        this.titleAreaControl.setActive(isActive);
+        this.titleControl.setActive(isActive);
         this.updateStyles();
         this.model.setActive(undefined );
     }
@@ -590,7 +581,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (candidate && !this.model.isPinned(candidate)) {
             const editor = this.model.pin(candidate);
             if (editor) {
-                this.titleAreaControl.pinEditor(editor);
+                this.titleControl.pinEditor(editor);
             }
         }
     }
@@ -609,18 +600,19 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             }
             const newIndexOfEditor = this.getIndexOfEditor(editor);
             if (newIndexOfEditor !== oldIndexOfEditor) {
-                this.titleAreaControl.moveEditor(editor, oldIndexOfEditor, newIndexOfEditor);
+                this.titleControl.moveEditor(editor, oldIndexOfEditor, newIndexOfEditor, true);
             }
             if (sticky) {
-                this.titleAreaControl.stickEditor(editor);
+                this.titleControl.stickEditor(editor);
             }
             else {
-                this.titleAreaControl.unstickEditor(editor);
+                this.titleControl.unstickEditor(editor);
             }
         }
     }
-    async openEditor(editor, options) {
+    async openEditor(editor, options, internalOptions) {
         return this.doOpenEditor(editor, options, {
+            ...internalOptions,
             supportSideBySide: SideBySideEditor.BOTH
         });
     }
@@ -630,7 +622,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         this._onWillOpenEditor.fire({ editor, groupId: this.id });
         const pinned = options?.sticky
-            || !this.accessor.partOptions.enablePreview
+            || !this.groupsView.partOptions.enablePreview
             || editor.isDirty()
             || ((options?.pinned ?? typeof options?.index === 'number') )
             || (typeof options?.index === 'number' && this.model.isSticky(options.index))
@@ -642,9 +634,6 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             active: this.count === 0 || !options || !options.inactive,
             supportSideBySide: internalOptions?.supportSideBySide
         };
-        if (options?.sticky && typeof options?.index === 'number' && !this.model.isSticky(options.index)) {
-            openEditorOptions.sticky = false;
-        }
         if (!openEditorOptions.active && !openEditorOptions.pinned && this.model.activeEditor && !this.model.isPinned(this.model.activeEditor)) {
             openEditorOptions.active = true;
         }
@@ -673,18 +662,18 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const { editor: openedEditor, isNew } = this.model.openEditor(editor, openEditorOptions);
         if (isNew &&
             this.count === 1 &&
-            this.accessor.groups.length > 1
+            this.groupsView.groups.length > 1
         ) {
-            if (openedEditor.editorId && this.accessor.partOptions.autoLockGroups?.has(openedEditor.editorId)) {
+            if (openedEditor.editorId && this.groupsView.partOptions.autoLockGroups?.has(openedEditor.editorId)) {
                 this.lock(true);
             }
         }
         const showEditorResult = this.doShowEditor(openedEditor, { active: !!openEditorOptions.active, isNew }, options, internalOptions);
         if (activateGroup) {
-            this.accessor.activateGroup(this);
+            this.groupsView.activateGroup(this);
         }
         else if (restoreGroup) {
-            this.accessor.restoreGroup(this);
+            this.groupsView.restoreGroup(this);
         }
         return showEditorResult;
     }
@@ -713,7 +702,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             openEditorPromise = Promise.resolve(undefined);
         }
         if (!internalOptions?.skipTitleUpdate) {
-            this.titleAreaControl.openEditor(editor);
+            this.titleControl.openEditor(editor, internalOptions);
         }
         return openEditorPromise;
     }
@@ -740,7 +729,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 skipTitleUpdate: true
             });
         })));
-        this.titleAreaControl.openEditors(( inactiveEditors.map(({ editor }) => editor)));
+        this.titleControl.openEditors(( inactiveEditors.map(({ editor }) => editor)));
         return this.editorPane.activeEditorPane ?? undefined;
     }
     moveEditors(editors, target) {
@@ -752,8 +741,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         if (internalOptions.skipTitleUpdate) {
             const movedEditors = ( editors.map(({ editor }) => editor));
-            target.titleAreaControl.openEditors(movedEditors);
-            this.titleAreaControl.closeEditors(movedEditors);
+            target.titleControl.openEditors(movedEditors);
+            this.titleControl.closeEditors(movedEditors);
         }
     }
     moveEditor(editor, target, options, internalOptions) {
@@ -770,24 +759,27 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             return;
         }
         const currentIndex = this.model.indexOf(candidate);
-        if (currentIndex === -1 || currentIndex === moveToIndex) {
-            return;
-        }
         const editor = this.model.getEditorByIndex(currentIndex);
         if (!editor) {
             return;
         }
-        this.model.moveEditor(editor, moveToIndex);
-        this.model.pin(editor);
-        this.titleAreaControl.moveEditor(editor, currentIndex, moveToIndex);
-        this.titleAreaControl.pinEditor(editor);
+        if (currentIndex !== moveToIndex) {
+            const oldStickyCount = this.model.stickyCount;
+            this.model.moveEditor(editor, moveToIndex);
+            this.model.pin(editor);
+            this.titleControl.moveEditor(editor, currentIndex, moveToIndex, oldStickyCount !== this.model.stickyCount);
+            this.titleControl.pinEditor(editor);
+        }
+        if (options?.sticky) {
+            this.stickEditor(editor);
+        }
     }
     doMoveOrCopyEditorAcrossGroups(editor, target, openOptions, internalOptions) {
         const keepCopy = internalOptions?.keepCopy;
         const options = fillActiveEditorViewState(this, editor, {
             ...openOptions,
             pinned: true,
-            sticky: !keepCopy && this.model.isSticky(editor)
+            sticky: openOptions?.sticky ?? (!keepCopy && this.model.isSticky(editor))
         });
         if (!keepCopy) {
             this._onWillMoveEditor.fire({
@@ -810,7 +802,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         if (internalOptions.skipTitleUpdate) {
             const copiedEditors = ( editors.map(({ editor }) => editor));
-            target.titleAreaControl.openEditors(copiedEditors);
+            target.titleControl.openEditors(copiedEditors);
         }
     }
     copyEditor(editor, target, options, internalOptions) {
@@ -835,9 +827,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.doCloseEditor(editor, options?.preserveFocus ? false : undefined, internalOptions);
         return true;
     }
-    doCloseEditor(editor, focusNext = (this.accessor.activeGroup === this), internalOptions) {
+    doCloseEditor(editor, focusNext = (this.groupsView.activeGroup === this), internalOptions) {
         if (!internalOptions?.skipTitleUpdate) {
-            this.titleAreaControl.beforeCloseEditor(editor);
+            this.titleControl.beforeCloseEditor(editor);
         }
         if (this.model.isActive(editor)) {
             this.doCloseActiveEditor(focusNext, internalOptions);
@@ -846,22 +838,22 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.doCloseInactiveEditor(editor, internalOptions);
         }
         if (!internalOptions?.skipTitleUpdate) {
-            this.titleAreaControl.closeEditor(editor);
+            this.titleControl.closeEditor(editor);
         }
     }
-    doCloseActiveEditor(focusNext = (this.accessor.activeGroup === this), internalOptions) {
+    doCloseActiveEditor(focusNext = (this.groupsView.activeGroup === this), internalOptions) {
         const editorToClose = this.activeEditor;
         const restoreFocus = this.shouldRestoreFocus(this.element);
-        const closeEmptyGroup = this.accessor.partOptions.closeEmptyGroups;
+        const closeEmptyGroup = this.groupsView.partOptions.closeEmptyGroups;
         if (closeEmptyGroup && this.active && this.count === 1) {
-            const mostRecentlyActiveGroups = this.accessor.getGroups(1 );
+            const mostRecentlyActiveGroups = this.groupsView.getGroups(1 );
             const nextActiveGroup = mostRecentlyActiveGroups[1];
             if (nextActiveGroup) {
                 if (restoreFocus) {
                     nextActiveGroup.focus();
                 }
                 else {
-                    this.accessor.activateGroup(nextActiveGroup);
+                    this.groupsView.activateGroup(nextActiveGroup);
                 }
             }
         }
@@ -872,7 +864,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (nextActiveEditor) {
             const preserveFocus = !focusNext;
             let activation = undefined;
-            if (preserveFocus && this.accessor.activeGroup !== this) {
+            if (preserveFocus && this.groupsView.activeGroup !== this) {
                 activation = EditorActivation.PRESERVE;
             }
             const options = {
@@ -891,7 +883,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             }
             this._onDidActiveEditorChange.fire({ editor: undefined });
             if (closeEmptyGroup) {
-                this.accessor.removeGroup(this);
+                this.groupsView.removeGroup(this);
             }
         }
     }
@@ -934,7 +926,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (editor instanceof SideBySideEditorInput && this.model.contains(editor.primary)) {
             return false;
         }
-        if (( this.accessor.groups.some(groupView => {
+        if (( this.groupsView.groups.some(groupView => {
             if (groupView === this) {
                 return false;
             }
@@ -1059,13 +1051,13 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.doCloseActiveEditor(options?.preserveFocus ? false : undefined);
         }
         if (editors.length) {
-            this.titleAreaControl.closeEditors(editors);
+            this.titleControl.closeEditors(editors);
         }
     }
     async closeAllEditors(options) {
         if (this.isEmpty) {
-            if (this.accessor.partOptions.closeEmptyGroups) {
-                this.accessor.removeGroup(this);
+            if (this.groupsView.partOptions.closeEmptyGroups) {
+                this.groupsView.removeGroup(this);
             }
             return true;
         }
@@ -1088,7 +1080,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.doCloseActiveEditor();
         }
         if (editorsToClose.length) {
-            this.titleAreaControl.closeEditors(editorsToClose);
+            this.titleControl.closeEditors(editorsToClose);
         }
     }
     async replaceEditors(editors) {
@@ -1145,13 +1137,13 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
     }
     get isLocked() {
-        if (this.accessor.groups.length === 1) {
+        if (this.groupsView.groups.length === 1) {
             return false;
         }
         return this.model.isLocked;
     }
     lock(locked) {
-        if (this.accessor.groups.length === 1) {
+        if (this.groupsView.groups.length === 1) {
             locked = false;
         }
         this.model.lock(locked);
@@ -1173,7 +1165,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.titleContainer.classList.remove('title-border-bottom');
             this.titleContainer.style.removeProperty('--title-border-bottom-color');
         }
-        const { showTabs } = this.accessor.partOptions;
+        const { showTabs } = this.groupsView.partOptions;
         this.titleContainer.style.backgroundColor = this.getColor(showTabs ? EDITOR_GROUP_HEADER_TABS_BACKGROUND : EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND) || '';
         this.editorContainer.style.backgroundColor = this.getColor(editorBackground) || '';
     }
@@ -1190,13 +1182,13 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     layout(width, height, top, left) {
         this.lastLayout = { width, height, top, left };
         this.element.classList.toggle('max-height-478px', height <= 478);
-        const titleAreaSize = this.titleAreaControl.layout({
+        const titleControlSize = this.titleControl.layout({
             container: ( new Dimension(width, height)),
             available: ( new Dimension(width, height - this.editorPane.minimumHeight))
         });
-        const editorHeight = Math.max(0, height - titleAreaSize.height);
+        const editorHeight = Math.max(0, height - titleControlSize.height);
         this.editorContainer.style.height = `${editorHeight}px`;
-        this.editorPane.layout({ width, height: editorHeight, top: top + titleAreaSize.height, left });
+        this.editorPane.layout({ width, height: editorHeight, top: top + titleControlSize.height, left });
     }
     relayout() {
         if (this.lastLayout) {
@@ -1213,7 +1205,6 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     dispose() {
         this._disposed = true;
         this._onWillDispose.fire();
-        this.titleAreaControl.dispose();
         super.dispose();
     }
 };