@codingame/monaco-vscode-api 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Delayer } from '../../../../base/common/async.js';
+import { Delayer, disposableTimeout } from '../../../../base/common/async.js';
 import { $, append, addStandardDisposableListener, EventType, trackFocus } from '../../../../base/browser/dom.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
@@ -30,12 +30,14 @@ import { SubmenuEntryActionViewItem } from '../../../../platform/actions/browser
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 
 const viewFilterMenu = ( new MenuId("menu.view.filter"));
 const viewFilterSubmenu = ( new MenuId("submenu.view.filter"));
 MenuRegistry.appendMenuItem(viewFilterMenu, {
     submenu: viewFilterSubmenu,
-    title: ( localize(3702, "More Filters...")),
+    title: ( localize(3771, "More Filters...")),
     group: "navigation",
     icon: Codicon.filter
 });
@@ -72,18 +74,23 @@ let FilterWidget = class FilterWidget extends Widget {
         instantiationService,
         contextViewService,
         contextKeyService,
-        keybindingService
+        keybindingService,
+        configurationService,
+        accessibilityService
     ) {
         super();
         this.options = options;
         this.instantiationService = instantiationService;
         this.contextViewService = contextViewService;
         this.keybindingService = keybindingService;
+        this.configurationService = configurationService;
+        this.accessibilityService = accessibilityService;
         this._onDidChangeFilterText = this._register(( new Emitter()));
         this.onDidChangeFilterText = this._onDidChangeFilterText.event;
         this._onDidAcceptFilterText = this._register(( new Emitter()));
         this.onDidAcceptFilterText = this._onDidAcceptFilterText.event;
         this.isMoreFiltersChecked = false;
+        this._accessibilityHelpHintAnnounced = false;
         this.delayedFilterUpdate = ( new Delayer(300));
         this._register(toDisposable(() => this.delayedFilterUpdate.cancel()));
         if (options.focusContextKey) {
@@ -102,8 +109,24 @@ let FilterWidget = class FilterWidget extends Widget {
         return this.filterInputBox.hasFocus();
     }
     focus() {
+        this._updateFilterInputAriaLabel();
         this.filterInputBox.focus();
     }
+    _updateFilterInputAriaLabel() {
+        let ariaLabel = this.options.ariaLabel || ( localize(3772, "Filter"));
+        if (!this._accessibilityHelpHintAnnounced && this.configurationService.getValue("accessibility.verbosity.find") && this.accessibilityService.isScreenReaderOptimized()) {
+            const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp")?.getAriaLabel();
+            if (keybinding) {
+                ariaLabel += ", " + ( localize(3773, "Press {0} for accessibility help", keybinding));
+                this._accessibilityHelpHintAnnounced = true;
+                this._labelResetTimeout?.dispose();
+                this._labelResetTimeout = disposableTimeout(() => {
+                    this.filterInputBox.setAriaLabel(this.options.ariaLabel || ( localize(3772, "Filter")));
+                }, 1000);
+            }
+        }
+        this.filterInputBox.setAriaLabel(ariaLabel);
+    }
     blur() {
         this.filterInputBox.blur();
     }
@@ -226,6 +249,6 @@ let FilterWidget = class FilterWidget extends Widget {
         }
     }
 };
-FilterWidget = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IContextViewService)), ( __param(3, IContextKeyService)), ( __param(4, IKeybindingService))], FilterWidget));
+FilterWidget = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IContextViewService)), ( __param(3, IContextKeyService)), ( __param(4, IKeybindingService)), ( __param(5, IConfigurationService)), ( __param(6, IAccessibilityService))], FilterWidget));
 
 export { FilterWidget, viewFilterSubmenu };

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -69,8 +69,8 @@ var ViewPaneShowActions;
     ViewPaneShowActions[ViewPaneShowActions["Always"] = 2] = "Always";
 })(ViewPaneShowActions || (ViewPaneShowActions = {}));
 const VIEWPANE_FILTER_ACTION = ( new Action("viewpane.action.filter"));
-const viewPaneContainerExpandedIcon = registerIcon("view-pane-container-expanded", Codicon.chevronDown, ( localize(3703, "Icon for an expanded view pane container.")));
-const viewPaneContainerCollapsedIcon = registerIcon("view-pane-container-collapsed", Codicon.chevronRight, ( localize(3704, "Icon for a collapsed view pane container.")));
+const viewPaneContainerExpandedIcon = registerIcon("view-pane-container-expanded", Codicon.chevronDown, ( localize(3774, "Icon for an expanded view pane container.")));
+const viewPaneContainerCollapsedIcon = registerIcon("view-pane-container-collapsed", Codicon.chevronRight, ( localize(3775, "Icon for a collapsed view pane container.")));
 const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 let ViewWelcomeController = class ViewWelcomeController {
     get enabled() {
@@ -130,7 +130,9 @@ let ViewWelcomeController = class ViewWelcomeController {
         this.container.classList.add("welcome");
         const viewWelcomeContainer = append(this.container, $(".welcome-view"));
         this.element = $(".welcome-view-content", {
-            tabIndex: 0
+            tabIndex: 0,
+            role: "region",
+            "aria-label": ( localize(3776, "Welcome"))
         });
         if (this._wide) {
             this.element.classList.add("wide");
@@ -410,7 +412,7 @@ let ViewPane = class ViewPane extends Pane {
                 }
                 return item;
             },
-            ariaLabel: ( localize(3705, "{0} actions", this.title)),
+            ariaLabel: ( localize(3777, "{0} actions", this.title)),
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             renderDropdownAsChildElement: true,
             actionRunner: this.getActionRunner(),
@@ -510,7 +512,7 @@ let ViewPane = class ViewPane extends Pane {
                 return title;
             }
         }
-        return localize(3706, "Use Alt+F1 for accessibility help {0}", title);
+        return localize(3778, "Use Alt+F1 for accessibility help {0}", title);
     }
     updateTitle(title) {
         const calculatedTitle = this.calculateTitle(title);

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -54,7 +54,7 @@ registerCss(paneviewlet);
 const ViewsSubMenu = ( new MenuId("Views"));
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     submenu: ViewsSubMenu,
-    title: ( localize(3707, "Views")),
+    title: ( localize(3779, "Views")),
     order: 1
 });
 var DropDirection;
@@ -352,32 +352,21 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             return pos.x >= bounds.left && pos.x <= bounds.right && pos.y >= bounds.top && pos.y <= bounds.bottom;
         };
         let bounds;
-        this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, {
-            onDragEnter: e => {
-                bounds = getOverlayBounds();
-                if (overlay?.disposed) {
-                    overlay = undefined;
-                }
-                if (!overlay && inBounds(bounds, e.eventData)) {
-                    const dropData = e.dragAndDropData.getData();
-                    if (dropData.type === "view") {
-                        const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
-                        const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
-                        if (oldViewContainer !== this.viewContainer && (!viewDescriptor || !viewDescriptor.canMoveView || this.viewContainer.rejectAddedViews)) {
-                            return;
-                        }
-                        overlay = ( new ViewPaneDropOverlay(
-                            parent,
-                            undefined,
-                            bounds,
-                            this.viewDescriptorService.getViewContainerLocation(this.viewContainer),
-                            this.themeService
-                        ));
+        if (this.viewDescriptorService.canMoveViews()) {
+            this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, {
+                onDragEnter: e => {
+                    bounds = getOverlayBounds();
+                    if (overlay?.disposed) {
+                        overlay = undefined;
                     }
-                    if (dropData.type === "composite" && dropData.id !== this.viewContainer.id) {
-                        const container = this.viewDescriptorService.getViewContainerById(dropData.id);
-                        const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
-                        if (!( viewsToMove.some(v => !v.canMoveView)) && viewsToMove.length > 0) {
+                    if (!overlay && inBounds(bounds, e.eventData)) {
+                        const dropData = e.dragAndDropData.getData();
+                        if (dropData.type === "view") {
+                            const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
+                            const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
+                            if (oldViewContainer !== this.viewContainer && (!viewDescriptor || !viewDescriptor.canMoveView || this.viewContainer.rejectAddedViews)) {
+                                return;
+                            }
                             overlay = ( new ViewPaneDropOverlay(
                                 parent,
                                 undefined,
@@ -386,59 +375,72 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                                 this.themeService
                             ));
                         }
+                        if (dropData.type === "composite" && dropData.id !== this.viewContainer.id) {
+                            const container = this.viewDescriptorService.getViewContainerById(dropData.id);
+                            const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
+                            if (!( viewsToMove.some(v => !v.canMoveView)) && viewsToMove.length > 0) {
+                                overlay = ( new ViewPaneDropOverlay(
+                                    parent,
+                                    undefined,
+                                    bounds,
+                                    this.viewDescriptorService.getViewContainerLocation(this.viewContainer),
+                                    this.themeService
+                                ));
+                            }
+                        }
                     }
-                }
-            },
-            onDragOver: e => {
-                if (overlay?.disposed) {
-                    overlay = undefined;
-                }
-                if (overlay && !inBounds(bounds, e.eventData)) {
-                    overlay.dispose();
+                },
+                onDragOver: e => {
+                    if (overlay?.disposed) {
+                        overlay = undefined;
+                    }
+                    if (overlay && !inBounds(bounds, e.eventData)) {
+                        overlay.dispose();
+                        overlay = undefined;
+                    }
+                    if (inBounds(bounds, e.eventData)) {
+                        toggleDropEffect(e.eventData.dataTransfer, "move", overlay !== undefined);
+                    }
+                },
+                onDragLeave: e => {
+                    overlay?.dispose();
                     overlay = undefined;
-                }
-                if (inBounds(bounds, e.eventData)) {
-                    toggleDropEffect(e.eventData.dataTransfer, "move", overlay !== undefined);
-                }
-            },
-            onDragLeave: e => {
-                overlay?.dispose();
-                overlay = undefined;
-            },
-            onDrop: e => {
-                if (overlay) {
-                    const dropData = e.dragAndDropData.getData();
-                    const viewsToMove = [];
-                    if (dropData.type === "composite" && dropData.id !== this.viewContainer.id) {
-                        const container = this.viewDescriptorService.getViewContainerById(dropData.id);
-                        const allViews = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
-                        if (!( allViews.some(v => !v.canMoveView))) {
-                            viewsToMove.push(...allViews);
+                },
+                onDrop: e => {
+                    if (overlay) {
+                        const dropData = e.dragAndDropData.getData();
+                        const viewsToMove = [];
+                        if (dropData.type === "composite" && dropData.id !== this.viewContainer.id) {
+                            const container = this.viewDescriptorService.getViewContainerById(dropData.id);
+                            const allViews = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
+                            if (!( allViews.some(v => !v.canMoveView))) {
+                                viewsToMove.push(...allViews);
+                            }
+                        } else if (dropData.type === "view") {
+                            const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
+                            const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
+                            if (oldViewContainer !== this.viewContainer && viewDescriptor?.canMoveView) {
+                                this.viewDescriptorService.moveViewsToContainer([viewDescriptor], this.viewContainer, undefined, "dnd");
+                            }
                         }
-                    } else if (dropData.type === "view") {
-                        const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
-                        const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
-                        if (oldViewContainer !== this.viewContainer && viewDescriptor?.canMoveView) {
-                            this.viewDescriptorService.moveViewsToContainer([viewDescriptor], this.viewContainer, undefined, "dnd");
+                        const paneCount = this.panes.length;
+                        if (viewsToMove.length > 0) {
+                            this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer, undefined, "dnd");
                         }
-                    }
-                    const paneCount = this.panes.length;
-                    if (viewsToMove.length > 0) {
-                        this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer, undefined, "dnd");
-                    }
-                    if (paneCount > 0) {
-                        for (const view of viewsToMove) {
-                            const paneToMove = this.panes.find(p => p.id === view.id);
-                            if (paneToMove) {
-                                this.movePane(paneToMove, this.panes[this.panes.length - 1]);
+                        if (paneCount > 0) {
+                            for (const view of viewsToMove) {
+                                const paneToMove = this.panes.find(p => p.id === view.id);
+                                if (paneToMove) {
+                                    this.movePane(paneToMove, this.panes[this.panes.length - 1]);
+                                }
                             }
                         }
                     }
+                    overlay?.dispose();
+                    overlay = undefined;
                 }
-                overlay?.dispose();
-                overlay = undefined;
-            }
-        }));
+            }));
+        }
         this._register(this.onDidSashChange(() => this.saveViewSizes()));
         this._register(
             this.viewContainerModel.onDidAddVisibleViewDescriptors(added => this.onDidAddViewDescriptors(added))
@@ -814,39 +816,28 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         this.paneItems.splice(index, 0, paneItem);
         assertReturnsDefined(this.paneview).addPane(pane, size, index);
         let overlay;
-        if (pane.draggableElement) {
+        if (this.viewDescriptorService.canMoveViews()) {
+            if (pane.draggableElement) {
+                store.add(
+                    CompositeDragAndDropObserver.INSTANCE.registerDraggable(pane.draggableElement, () => {
+                        return {
+                            type: "view",
+                            id: pane.id
+                        };
+                    }, {})
+                );
+            }
             store.add(
-                CompositeDragAndDropObserver.INSTANCE.registerDraggable(pane.draggableElement, () => {
-                    return {
-                        type: "view",
-                        id: pane.id
-                    };
-                }, {})
-            );
-        }
-        store.add(
-            CompositeDragAndDropObserver.INSTANCE.registerTarget(pane.dropTargetElement, {
-                onDragEnter: e => {
-                    if (!overlay) {
-                        const dropData = e.dragAndDropData.getData();
-                        if (dropData.type === "view" && dropData.id !== pane.id) {
-                            const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
-                            const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
-                            if (oldViewContainer !== this.viewContainer && (!viewDescriptor || !viewDescriptor.canMoveView || this.viewContainer.rejectAddedViews)) {
-                                return;
-                            }
-                            overlay = ( new ViewPaneDropOverlay(
-                                pane.dropTargetElement,
-                                this.orientation ?? Orientation.VERTICAL,
-                                undefined,
-                                this.viewDescriptorService.getViewContainerLocation(this.viewContainer),
-                                this.themeService
-                            ));
-                        }
-                        if (dropData.type === "composite" && dropData.id !== this.viewContainer.id && !this.viewContainer.rejectAddedViews) {
-                            const container = this.viewDescriptorService.getViewContainerById(dropData.id);
-                            const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
-                            if (!( viewsToMove.some(v => !v.canMoveView)) && viewsToMove.length > 0) {
+                CompositeDragAndDropObserver.INSTANCE.registerTarget(pane.dropTargetElement, {
+                    onDragEnter: e => {
+                        if (!overlay) {
+                            const dropData = e.dragAndDropData.getData();
+                            if (dropData.type === "view" && dropData.id !== pane.id) {
+                                const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
+                                const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
+                                if (oldViewContainer !== this.viewContainer && (!viewDescriptor || !viewDescriptor.canMoveView || this.viewContainer.rejectAddedViews)) {
+                                    return;
+                                }
                                 overlay = ( new ViewPaneDropOverlay(
                                     pane.dropTargetElement,
                                     this.orientation ?? Orientation.VERTICAL,
@@ -855,88 +846,101 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
                                     this.themeService
                                 ));
                             }
-                        }
-                    }
-                },
-                onDragOver: e => {
-                    toggleDropEffect(e.eventData.dataTransfer, "move", overlay !== undefined);
-                },
-                onDragLeave: e => {
-                    overlay?.dispose();
-                    overlay = undefined;
-                },
-                onDrop: e => {
-                    if (overlay) {
-                        const dropData = e.dragAndDropData.getData();
-                        const viewsToMove = [];
-                        let anchorView;
-                        if (dropData.type === "composite" && dropData.id !== this.viewContainer.id && !this.viewContainer.rejectAddedViews) {
-                            const container = this.viewDescriptorService.getViewContainerById(dropData.id);
-                            const allViews = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
-                            if (allViews.length > 0 && !( allViews.some(v => !v.canMoveView))) {
-                                viewsToMove.push(...allViews);
-                                anchorView = allViews[0];
-                            }
-                        } else if (dropData.type === "view") {
-                            const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
-                            const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
-                            if (oldViewContainer !== this.viewContainer && viewDescriptor && viewDescriptor.canMoveView && !this.viewContainer.rejectAddedViews) {
-                                viewsToMove.push(viewDescriptor);
-                            }
-                            if (viewDescriptor) {
-                                anchorView = viewDescriptor;
+                            if (dropData.type === "composite" && dropData.id !== this.viewContainer.id && !this.viewContainer.rejectAddedViews) {
+                                const container = this.viewDescriptorService.getViewContainerById(dropData.id);
+                                const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
+                                if (!( viewsToMove.some(v => !v.canMoveView)) && viewsToMove.length > 0) {
+                                    overlay = ( new ViewPaneDropOverlay(
+                                        pane.dropTargetElement,
+                                        this.orientation ?? Orientation.VERTICAL,
+                                        undefined,
+                                        this.viewDescriptorService.getViewContainerLocation(this.viewContainer),
+                                        this.themeService
+                                    ));
+                                }
                             }
                         }
-                        if (viewsToMove) {
-                            this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer, undefined, "dnd");
-                        }
-                        if (anchorView) {
-                            if (overlay.currentDropOperation === DropDirection.DOWN || overlay.currentDropOperation === DropDirection.RIGHT) {
-                                const fromIndex = this.panes.findIndex(p => p.id === anchorView.id);
-                                let toIndex = this.panes.findIndex(p => p.id === pane.id);
-                                if (fromIndex >= 0 && toIndex >= 0) {
-                                    if (fromIndex > toIndex) {
-                                        toIndex++;
-                                    }
-                                    if (toIndex < this.panes.length && toIndex !== fromIndex) {
-                                        this.movePane(this.panes[fromIndex], this.panes[toIndex]);
-                                    }
+                    },
+                    onDragOver: e => {
+                        toggleDropEffect(e.eventData.dataTransfer, "move", overlay !== undefined);
+                    },
+                    onDragLeave: e => {
+                        overlay?.dispose();
+                        overlay = undefined;
+                    },
+                    onDrop: e => {
+                        if (overlay) {
+                            const dropData = e.dragAndDropData.getData();
+                            const viewsToMove = [];
+                            let anchorView;
+                            if (dropData.type === "composite" && dropData.id !== this.viewContainer.id && !this.viewContainer.rejectAddedViews) {
+                                const container = this.viewDescriptorService.getViewContainerById(dropData.id);
+                                const allViews = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
+                                if (allViews.length > 0 && !( allViews.some(v => !v.canMoveView))) {
+                                    viewsToMove.push(...allViews);
+                                    anchorView = allViews[0];
                                 }
-                            }
-                            if (overlay.currentDropOperation === DropDirection.UP || overlay.currentDropOperation === DropDirection.LEFT) {
-                                const fromIndex = this.panes.findIndex(p => p.id === anchorView.id);
-                                let toIndex = this.panes.findIndex(p => p.id === pane.id);
-                                if (fromIndex >= 0 && toIndex >= 0) {
-                                    if (fromIndex < toIndex) {
-                                        toIndex--;
-                                    }
-                                    if (toIndex >= 0 && toIndex !== fromIndex) {
-                                        this.movePane(this.panes[fromIndex], this.panes[toIndex]);
-                                    }
+                            } else if (dropData.type === "view") {
+                                const oldViewContainer = this.viewDescriptorService.getViewContainerByViewId(dropData.id);
+                                const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dropData.id);
+                                if (oldViewContainer !== this.viewContainer && viewDescriptor && viewDescriptor.canMoveView && !this.viewContainer.rejectAddedViews) {
+                                    viewsToMove.push(viewDescriptor);
+                                }
+                                if (viewDescriptor) {
+                                    anchorView = viewDescriptor;
                                 }
                             }
-                            if (viewsToMove.length > 1) {
-                                viewsToMove.slice(1).forEach(view => {
-                                    let toIndex = this.panes.findIndex(p => p.id === anchorView.id);
-                                    const fromIndex = this.panes.findIndex(p => p.id === view.id);
+                            if (viewsToMove) {
+                                this.viewDescriptorService.moveViewsToContainer(viewsToMove, this.viewContainer, undefined, "dnd");
+                            }
+                            if (anchorView) {
+                                if (overlay.currentDropOperation === DropDirection.DOWN || overlay.currentDropOperation === DropDirection.RIGHT) {
+                                    const fromIndex = this.panes.findIndex(p => p.id === anchorView.id);
+                                    let toIndex = this.panes.findIndex(p => p.id === pane.id);
                                     if (fromIndex >= 0 && toIndex >= 0) {
                                         if (fromIndex > toIndex) {
                                             toIndex++;
                                         }
                                         if (toIndex < this.panes.length && toIndex !== fromIndex) {
                                             this.movePane(this.panes[fromIndex], this.panes[toIndex]);
-                                            anchorView = view;
                                         }
                                     }
-                                });
+                                }
+                                if (overlay.currentDropOperation === DropDirection.UP || overlay.currentDropOperation === DropDirection.LEFT) {
+                                    const fromIndex = this.panes.findIndex(p => p.id === anchorView.id);
+                                    let toIndex = this.panes.findIndex(p => p.id === pane.id);
+                                    if (fromIndex >= 0 && toIndex >= 0) {
+                                        if (fromIndex < toIndex) {
+                                            toIndex--;
+                                        }
+                                        if (toIndex >= 0 && toIndex !== fromIndex) {
+                                            this.movePane(this.panes[fromIndex], this.panes[toIndex]);
+                                        }
+                                    }
+                                }
+                                if (viewsToMove.length > 1) {
+                                    viewsToMove.slice(1).forEach(view => {
+                                        let toIndex = this.panes.findIndex(p => p.id === anchorView.id);
+                                        const fromIndex = this.panes.findIndex(p => p.id === view.id);
+                                        if (fromIndex >= 0 && toIndex >= 0) {
+                                            if (fromIndex > toIndex) {
+                                                toIndex++;
+                                            }
+                                            if (toIndex < this.panes.length && toIndex !== fromIndex) {
+                                                this.movePane(this.panes[fromIndex], this.panes[toIndex]);
+                                                anchorView = view;
+                                            }
+                                        }
+                                    });
+                                }
                             }
                         }
+                        overlay?.dispose();
+                        overlay = undefined;
                     }
-                    overlay?.dispose();
-                    overlay = undefined;
-                }
-            })
-        );
+                })
+            );
+        }
     }
     removePanes(panes) {
         const wasMerged = this.isViewMergedWithContainer();
@@ -1106,7 +1110,7 @@ registerAction2(class MoveViewUp extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewUp",
-            title: ( localize(3708, "Move View Up")),
+            title: ( localize(3780, "Move View Up")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.UpArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1119,7 +1123,7 @@ registerAction2(class MoveViewLeft extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewLeft",
-            title: ( localize(3709, "Move View Left")),
+            title: ( localize(3781, "Move View Left")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.LeftArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1132,7 +1136,7 @@ registerAction2(class MoveViewDown extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewDown",
-            title: ( localize(3710, "Move View Down")),
+            title: ( localize(3782, "Move View Down")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.DownArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1145,7 +1149,7 @@ registerAction2(class MoveViewRight extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewRight",
-            title: ( localize(3711, "Move View Right")),
+            title: ( localize(3783, "Move View Right")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.RightArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1158,7 +1162,7 @@ registerAction2(class MoveViews extends Action2 {
     constructor() {
         super({
             id: "vscode.moveViews",
-            title: ( localize(3712, "Move Views"))
+            title: ( localize(3784, "Move Views"))
         });
     }
     async run(accessor, options) {

package/vscode/src/vs/workbench/browser/parts/visibleViewContainersTracker.d.ts

@@ -0,0 +1,29 @@
+import { Disposable } from "../../../base/common/lifecycle.js";
+import { Event } from "../../../base/common/event.js";
+import { ViewContainerLocation } from "../../common/views.js";
+import { IViewDescriptorService } from "../../common/views.service.js";
+/**
+ * Tracks the number of visible view containers at a given location.
+ * A view container is considered visible if it has active views (activeViewDescriptors.length > 0).
+ * Fires an event when the number of visible containers changes.
+ */
+export declare class VisibleViewContainersTracker extends Disposable {
+    private readonly location;
+    private readonly viewDescriptorService;
+    private readonly viewContainerModelListeners;
+    private readonly _onDidChange;
+    readonly onDidChange: Event<{
+        before: number;
+        after: number;
+    }>;
+    private _visibleCount;
+    constructor(location: ViewContainerLocation, viewDescriptorService: IViewDescriptorService);
+    /**
+     * Returns the current number of visible view containers at this location.
+     */
+    get visibleCount(): number;
+    private registerListeners;
+    private initializeViewContainerListeners;
+    private addViewContainerModelListener;
+    private updateVisibleCount;
+}