@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/browser/parts/compositeBar.js

@@ -2,16 +2,16 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ActionsOrientation, ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { CompositeOverflowActivityAction, CompositeActionViewItem, CompositeOverflowActivityActionViewItem } from 'vscode/vscode/vs/workbench/browser/parts/compositeBarActions';
-import { $, addDisposableListener, EventType, getWindow, isAncestor, EventHelper } from 'vscode/vscode/vs/base/browser/dom';
+import { isAncestor, $, addDisposableListener, EventType, getWindow, EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { Widget } from 'vscode/vscode/vs/base/browser/ui/widget';
 import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { CompositeDragAndDropObserver, toggleDropEffect } from 'vscode/vscode/vs/workbench/browser/dnd';
+import { toggleDropEffect, CompositeDragAndDropObserver } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { Gesture, EventType as EventType$1 } from 'vscode/vscode/vs/base/browser/touch';
 
 class CompositeDragAndDrop {
@@ -62,7 +62,7 @@ class CompositeDragAndDrop {
             return undefined;
         }
         const items = this.getItems();
-        const before = this.orientation === ActionsOrientation.HORIZONTAL ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
+        const before = this.orientation === 0  ? before2d?.horizontallyBefore : before2d?.verticallyBefore;
         return items.filter(item => item.visible).findIndex(item => item.id === targetId) + (before ? 0 : 1);
     }
     canDrop(data, targetCompositeId) {
@@ -84,6 +84,63 @@ class CompositeDragAndDrop {
         }
     }
 }
+class CompositeBarDndCallbacks {
+    constructor(compositeBarContainer, actionBarContainer, compositeBarModel, dndHandler, orientation) {
+        this.compositeBarContainer = compositeBarContainer;
+        this.actionBarContainer = actionBarContainer;
+        this.compositeBarModel = compositeBarModel;
+        this.dndHandler = dndHandler;
+        this.orientation = orientation;
+        this.insertDropBefore = undefined;
+    }
+    onDragOver(e) {
+        const visibleItems = this.compositeBarModel.visibleItems;
+        if (!visibleItems.length || (e.eventData.target && isAncestor(e.eventData.target, this.actionBarContainer))) {
+            this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, true);
+            return;
+        }
+        const insertAtFront = this.insertAtFront(this.actionBarContainer, e.eventData);
+        const target = insertAtFront ? visibleItems[0] : visibleItems[visibleItems.length - 1];
+        const validDropTarget = this.dndHandler.onDragOver(e.dragAndDropData, target.id, e.eventData);
+        toggleDropEffect(e.eventData.dataTransfer, 'move', validDropTarget);
+        this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, validDropTarget, insertAtFront, true);
+    }
+    onDragLeave(e) {
+        this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, false);
+    }
+    onDragEnd(e) {
+        this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, false);
+    }
+    onDrop(e) {
+        const visibleItems = this.compositeBarModel.visibleItems;
+        let targetId = undefined;
+        if (visibleItems.length) {
+            targetId = this.insertAtFront(this.actionBarContainer, e.eventData) ? visibleItems[0].id : visibleItems[visibleItems.length - 1].id;
+        }
+        this.dndHandler.drop(e.dragAndDropData, targetId, e.eventData, this.insertDropBefore);
+        this.insertDropBefore = this.updateFromDragging(this.compositeBarContainer, false, false, false);
+    }
+    insertAtFront(element, event) {
+        const rect = element.getBoundingClientRect();
+        const posX = event.clientX;
+        const posY = event.clientY;
+        switch (this.orientation) {
+            case 0 :
+                return posX < rect.left;
+            case 1 :
+                return posY < rect.top;
+        }
+    }
+    updateFromDragging(element, showFeedback, front, isDragging) {
+        element.classList.toggle('dragged-over', isDragging);
+        element.classList.toggle('dragged-over-head', showFeedback && front);
+        element.classList.toggle('dragged-over-tail', showFeedback && !front);
+        if (!showFeedback) {
+            return undefined;
+        }
+        return { verticallyBefore: front, horizontallyBefore: front };
+    }
+}
 let CompositeBar = class CompositeBar extends Widget {
     constructor(items, options, instantiationService, contextMenuService, viewDescriptorService) {
         super();
@@ -103,7 +160,7 @@ let CompositeBar = class CompositeBar extends Widget {
     }
     setCompositeBarItems(items) {
         this.model.setItems(items);
-        this.updateCompositeSwitcher();
+        this.updateCompositeSwitcher(true);
     }
     getPinnedComposites() {
         return this.model.pinnedItems;
@@ -122,7 +179,7 @@ let CompositeBar = class CompositeBar extends Widget {
                 return item && this.instantiationService.createInstance(CompositeActionViewItem, { ...options, draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
             },
             orientation: this.options.orientation,
-            ariaLabel: ( localize(11175, "Active View Switcher")),
+            ariaLabel: ( localize(11274, "Active View Switcher")),
             ariaRole: 'tablist',
             preventLoopNavigation: this.options.preventLoopNavigation,
             triggerKeys: { keyDown: true }
@@ -130,57 +187,16 @@ let CompositeBar = class CompositeBar extends Widget {
         this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, e => this.showContextMenu(getWindow(parent), e)));
         this._register(Gesture.addTarget(parent));
         this._register(addDisposableListener(parent, EventType$1.Contextmenu, e => this.showContextMenu(getWindow(parent), e)));
-        let insertDropBefore = undefined;
-        this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, {
-            onDragOver: (e) => {
-                const visibleItems = this.getVisibleComposites();
-                if (!visibleItems.length || (e.eventData.target && isAncestor(e.eventData.target, actionBarDiv))) {
-                    insertDropBefore = this.updateFromDragging(parent, false, false, true);
-                    return;
-                }
-                const insertAtFront = this.insertAtFront(actionBarDiv, e.eventData);
-                const target = insertAtFront ? visibleItems[0] : visibleItems[visibleItems.length - 1];
-                const validDropTarget = this.options.dndHandler.onDragOver(e.dragAndDropData, target.id, e.eventData);
-                toggleDropEffect(e.eventData.dataTransfer, 'move', validDropTarget);
-                insertDropBefore = this.updateFromDragging(parent, validDropTarget, insertAtFront, true);
-            },
-            onDragLeave: (e) => {
-                insertDropBefore = this.updateFromDragging(parent, false, false, false);
-            },
-            onDragEnd: (e) => {
-                insertDropBefore = this.updateFromDragging(parent, false, false, false);
-            },
-            onDrop: (e) => {
-                const visibleItems = this.getVisibleComposites();
-                if (visibleItems.length) {
-                    const target = this.insertAtFront(actionBarDiv, e.eventData) ? visibleItems[0] : visibleItems[visibleItems.length - 1];
-                    this.options.dndHandler.drop(e.dragAndDropData, target.id, e.eventData, insertDropBefore);
-                }
-                insertDropBefore = this.updateFromDragging(parent, false, false, false);
-            }
-        }));
+        const dndCallback = ( (new CompositeBarDndCallbacks(
+            parent,
+            actionBarDiv,
+            this.model,
+            this.options.dndHandler,
+            this.options.orientation
+        )));
+        this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, dndCallback));
         return actionBarDiv;
     }
-    insertAtFront(element, event) {
-        const rect = element.getBoundingClientRect();
-        const posX = event.clientX;
-        const posY = event.clientY;
-        switch (this.options.orientation) {
-            case ActionsOrientation.HORIZONTAL:
-                return posX < rect.left;
-            case ActionsOrientation.VERTICAL:
-                return posY < rect.top;
-        }
-    }
-    updateFromDragging(element, showFeedback, front, isDragging) {
-        element.classList.toggle('dragged-over', isDragging);
-        element.classList.toggle('dragged-over-head', showFeedback && front);
-        element.classList.toggle('dragged-over-tail', showFeedback && !front);
-        if (!showFeedback) {
-            return undefined;
-        }
-        return { verticallyBefore: front, horizontallyBefore: front };
-    }
     focus(index) {
         this.compositeSwitcherBar?.focus(index);
     }
@@ -315,14 +331,14 @@ let CompositeBar = class CompositeBar extends Widget {
             if (compositeSwitcherBar && this.dimension && this.dimension.height !== 0 && this.dimension.width !== 0) {
                 const currentItemsLength = compositeSwitcherBar.viewItems.length;
                 compositeSwitcherBar.push(( (items.map(composite => composite.activityAction))));
-                items.forEach((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === ActionsOrientation.VERTICAL
+                items.forEach((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === 1
                     ? compositeSwitcherBar.getHeight(currentItemsLength + index)
                     : compositeSwitcherBar.getWidth(currentItemsLength + index)));
                 items.forEach(() => compositeSwitcherBar.pull(compositeSwitcherBar.viewItems.length - 1));
             }
         }
     }
-    updateCompositeSwitcher() {
+    updateCompositeSwitcher(donotTrigger) {
         const compositeSwitcherBar = this.compositeSwitcherBar;
         if (!compositeSwitcherBar || !this.dimension) {
             return;
@@ -332,7 +348,7 @@ let CompositeBar = class CompositeBar extends Widget {
         let maxVisible = compositesToShow.length;
         const totalComposites = compositesToShow.length;
         let size = 0;
-        const limit = this.options.orientation === ActionsOrientation.VERTICAL ? this.dimension.height : this.dimension.width;
+        const limit = this.options.orientation === 1  ? this.dimension.height : this.dimension.width;
         for (let i = 0; i < compositesToShow.length; i++) {
             const compositeSize = this.compositeSizeInBar.get(compositesToShow[i]);
             if (size + compositeSize > limit) {
@@ -398,7 +414,9 @@ let CompositeBar = class CompositeBar extends Widget {
             }, this.options.getOnCompositeClickAction, this.options.colors, this.options.activityHoverOptions));
             compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
         }
-        this._onDidChange.fire();
+        if (!donotTrigger) {
+            this._onDidChange.fire();
+        }
     }
     getOverflowingComposites() {
         let overflowingIds = ( (this.model.visibleItems.filter(item => item.pinned).map(item => item.id)));

package/vscode/src/vs/workbench/browser/parts/compositePart.js

@@ -4,14 +4,12 @@ import { defaultGenerator } from 'vscode/vscode/vs/base/common/idGenerator';
 import { MutableDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { prepareActions, ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { prepareActions } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { ProgressBar } from 'vscode/vscode/vs/base/browser/ui/progressbar/progressbar';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { $, show, hide, append, Dimension } from 'vscode/vscode/vs/base/browser/dom';
-import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { ScopedProgressIndicator, AbstractProgressScope } from 'vscode/vscode/vs/workbench/services/progress/browser/progressIndicator';
@@ -40,7 +38,7 @@ class CompositePart extends Part {
         this.mapActionsBindingToComposite = ( (new Map()));
         this.instantiatedCompositeItems = ( (new Map()));
         this.actionsListener = this._register(( (new MutableDisposable())));
-        this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, StorageScope.WORKSPACE, this.defaultCompositeId);
+        this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, 1 , this.defaultCompositeId);
         this.toolbarHoverDelegate = this._register(createInstantHoverDelegate());
     }
     openComposite(id, focus) {
@@ -116,10 +114,10 @@ class CompositePart extends Part {
         this.activeComposite = composite;
         const id = this.activeComposite.getId();
         if (id !== this.defaultCompositeId) {
-            this.storageService.store(this.activeCompositeSettingsKey, id, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this.storageService.store(this.activeCompositeSettingsKey, id, 1 , 1 );
         }
         else {
-            this.storageService.remove(this.activeCompositeSettingsKey, StorageScope.WORKSPACE);
+            this.storageService.remove(this.activeCompositeSettingsKey, 1 );
         }
         this.lastActiveCompositeId = this.activeComposite.getId();
         let compositeContainer = this.mapCompositeToCompositeContainer.get(composite.getId());
@@ -190,7 +188,7 @@ class CompositePart extends Part {
         const keybinding = this.keybindingService.lookupKeybinding(compositeId);
         this.titleLabel.updateTitle(compositeId, compositeTitle, keybinding?.getLabel() ?? undefined);
         const toolBar = assertIsDefined(this.toolBar);
-        toolBar.setAriaLabel(( localize(11159, "{0} actions", compositeTitle)));
+        toolBar.setAriaLabel(( localize(11271, "{0} actions", compositeTitle)));
     }
     collectCompositeActions(composite) {
         const menuIds = composite?.getMenuIds();
@@ -232,10 +230,10 @@ class CompositePart extends Part {
         const titleActionsContainer = append(titleArea, $('.title-actions'));
         this.toolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, titleActionsContainer, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-            orientation: ActionsOrientation.HORIZONTAL,
+            orientation: 0 ,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-            toggleMenuTitle: ( localize(11160, "Views and More Actions...")),
+            toggleMenuTitle: ( localize(11272, "Views and More Actions...")),
             telemetrySource: this.nameForTelemetry,
             hoverDelegate: this.toolbarHoverDelegate
         }));
@@ -252,7 +250,7 @@ class CompositePart extends Part {
             updateTitle: (id, title, keybinding) => {
                 if (!this.activeComposite || this.activeComposite.getId() === id) {
                     titleLabel.innerText = title;
-                    hover.update(keybinding ? ( localize(11161, "{0} ({1})", title, keybinding)) : title);
+                    hover.update(keybinding ? ( localize(11273, "{0} ({1})", title, keybinding)) : title);
                 }
             },
             updateStyles: () => {
@@ -294,7 +292,7 @@ class CompositePart extends Part {
         return compositeItem ? compositeItem.progress : undefined;
     }
     getTitleAreaDropDownAnchorAlignment() {
-        return AnchorAlignment.RIGHT;
+        return 1 ;
     }
     layout(width, height, top, left) {
         super.layout(width, height, top, left);

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

@@ -14,7 +14,6 @@ import { hasCustomTitlebar } from 'vscode/vscode/vs/platform/window/common/windo
 import { EditorPart } from './editorPart.js';
 import { WindowTitle } from 'vscode/vscode/vs/workbench/browser/parts/titlebar/windowTitle';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
-import { GroupsOrder, GroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { shouldShowCustomTitleBar } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -191,7 +190,7 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
     }
     doRemoveLastGroup(preserveFocus) {
         const restoreFocus = !preserveFocus && this.shouldRestoreFocus(this.container);
-        const mostRecentlyActiveGroups = this.editorPartsView.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
+        const mostRecentlyActiveGroups = this.editorPartsView.getGroups(1 );
         const nextActiveGroup = mostRecentlyActiveGroups[1];
         if (nextActiveGroup) {
             nextActiveGroup.groupsView.activateGroup(nextActiveGroup);
@@ -223,14 +222,14 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
             return true;
         }
         let targetGroup = undefined;
-        for (const group of this.editorPartsView.mainPart.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
+        for (const group of this.editorPartsView.mainPart.getGroups(1 )) {
             if (!group.isLocked) {
                 targetGroup = group;
                 break;
             }
         }
         if (!targetGroup) {
-            targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? GroupDirection.RIGHT : GroupDirection.DOWN);
+            targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? 3  : 1 );
         }
         const result = this.mergeAllGroups(targetGroup);
         targetGroup.focus();