@codingame/monaco-vscode-view-common-service-override 4.5.1 → 5.0.0

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

@@ -14,6 +14,7 @@ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.
 import { CompositeDragAndDropObserver, toggleDropEffect } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { Gesture, EventType as EventType$1 } from 'vscode/vscode/vs/base/browser/touch';
 
+const _moduleId = "vs/workbench/browser/parts/compositeBar";
 class CompositeDragAndDrop {
     constructor(viewDescriptorService, targetContainerLocation, orientation, openComposite, moveComposite, getItems) {
         this.viewDescriptorService = viewDescriptorService;
@@ -91,11 +92,11 @@ let CompositeBar = class CompositeBar extends Widget {
         this.instantiationService = instantiationService;
         this.contextMenuService = contextMenuService;
         this.viewDescriptorService = viewDescriptorService;
-        this._onDidChange = this._register(( new Emitter()));
+        this._onDidChange = this._register(( (new Emitter())));
         this.onDidChange = this._onDidChange.event;
-        this.model = ( new CompositeBarModel(items, options));
+        this.model = ( (new CompositeBarModel(items, options)));
         this.visibleComposites = [];
-        this.compositeSizeInBar = ( new Map());
+        this.compositeSizeInBar = ( (new Map()));
         this.computeSizes(this.model.visibleItems);
     }
     getCompositeBarItems() {
@@ -113,7 +114,7 @@ let CompositeBar = class CompositeBar extends Widget {
     }
     create(parent) {
         const actionBarDiv = parent.appendChild($('.composite-bar'));
-        this.compositeSwitcherBar = this._register(( new ActionBar(actionBarDiv, {
+        this.compositeSwitcherBar = this._register(( (new ActionBar(actionBarDiv, {
             actionViewItemProvider: (action, options) => {
                 if (action instanceof CompositeOverflowActivityAction) {
                     return this.compositeOverflowActionViewItem;
@@ -122,15 +123,11 @@ 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: ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBar',
-                'activityBarAriaLabel',
-                "Active View Switcher"
-            )),
+            ariaLabel: ( localizeWithPath(_moduleId, 0, "Active View Switcher")),
             ariaRole: 'tablist',
             preventLoopNavigation: this.options.preventLoopNavigation,
             triggerKeys: { keyDown: true }
-        })));
+        }))));
         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)));
@@ -318,7 +315,7 @@ let CompositeBar = class CompositeBar extends Widget {
             const compositeSwitcherBar = this.compositeSwitcherBar;
             if (compositeSwitcherBar && this.dimension && this.dimension.height !== 0 && this.dimension.width !== 0) {
                 const currentItemsLength = compositeSwitcherBar.viewItems.length;
-                compositeSwitcherBar.push(( items.map(composite => composite.activityAction)));
+                compositeSwitcherBar.push(( (items.map(composite => composite.activityAction))));
                 items.forEach((composite, index) => this.compositeSizeInBar.set(composite.id, this.options.orientation === 1
                     ? compositeSwitcherBar.getHeight(currentItemsLength + index)
                     : compositeSwitcherBar.getWidth(currentItemsLength + index)));
@@ -331,8 +328,8 @@ let CompositeBar = class CompositeBar extends Widget {
         if (!compositeSwitcherBar || !this.dimension) {
             return;
         }
-        let compositesToShow = ( this.model.visibleItems.filter(item => item.pinned
-            || (this.model.activeItem && this.model.activeItem.id === item.id) ).map(item => item.id));
+        let compositesToShow = ( (this.model.visibleItems.filter(item => item.pinned
+            || (this.model.activeItem && this.model.activeItem.id === item.id) ).map(item => item.id)));
         let maxVisible = compositesToShow.length;
         const totalComposites = compositesToShow.length;
         let size = 0;
@@ -405,25 +402,27 @@ let CompositeBar = class CompositeBar extends Widget {
         this._onDidChange.fire();
     }
     getOverflowingComposites() {
-        let overflowingIds = ( this.model.visibleItems.filter(item => item.pinned).map(item => item.id));
+        let overflowingIds = ( (this.model.visibleItems.filter(item => item.pinned).map(item => item.id)));
         if (this.model.activeItem && !this.model.activeItem.pinned) {
             overflowingIds.push(this.model.activeItem.id);
         }
         overflowingIds = overflowingIds.filter(compositeId => !this.visibleComposites.includes(compositeId));
-        return ( this.model.visibleItems.filter(c => overflowingIds.includes(c.id)).map(
-            item => { return { id: item.id, name: this.getAction(item.id)?.label || item.name }; }
-        ));
+        return (
+             (this.model.visibleItems.filter(c => overflowingIds.includes(c.id)).map(
+                item => { return { id: item.id, name: this.getAction(item.id)?.label || item.name }; }
+            ))
+        );
     }
     showContextMenu(targetWindow, e) {
         EventHelper.stop(e, true);
-        const event = ( new StandardMouseEvent(targetWindow, e));
+        const event = ( (new StandardMouseEvent(targetWindow, e)));
         this.contextMenuService.showContextMenu({
             getAnchor: () => event,
             getActions: () => this.getContextMenuActions(e)
         });
     }
     getContextMenuActions(e) {
-        const actions = ( this.model.visibleItems
+        const actions = ( (this.model.visibleItems
             .map(({ id, name, activityAction }) => (toAction({
             id,
             label: this.getAction(id).label || name || id,
@@ -437,16 +436,16 @@ let CompositeBar = class CompositeBar extends Widget {
                     this.pin(id, true);
                 }
             }
-        }))));
+        })))));
         this.options.fillExtraContextMenuActions(actions, e);
         return actions;
     }
 };
-CompositeBar = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IContextMenuService)),
-    ( __param(4, IViewDescriptorService))
-], CompositeBar));
+CompositeBar = ( (__decorate([
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IContextMenuService))),
+    ( (__param(4, IViewDescriptorService)))
+], CompositeBar)));
 class CompositeBarModel {
     get items() { return this._items; }
     constructor(items, options) {
@@ -456,10 +455,10 @@ class CompositeBarModel {
     }
     setItems(items) {
         this._items = [];
-        this._items = ( items
+        this._items = ( (items
             .map(
             i => this.createCompositeBarItem(i.id, i.name, i.order, i.pinned, i.visible)
-        ));
+        )));
     }
     get visibleItems() {
         return this.items.filter(item => item.visible);

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

@@ -16,15 +16,16 @@ import { ScopedProgressIndicator, AbstractProgressScope } from 'vscode/vscode/vs
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { defaultProgressBarStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 
+const _moduleId = "vs/workbench/browser/parts/compositePart";
 class CompositePart extends Part {
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
         super(id, options, themeService, storageService, layoutService);
         this.notificationService = notificationService;
         this.storageService = storageService;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
+        this.hoverService = hoverService;
         this.instantiationService = instantiationService;
         this.registry = registry;
         this.activeCompositeSettingsKey = activeCompositeSettingsKey;
@@ -32,12 +33,12 @@ class CompositePart extends Part {
         this.nameForTelemetry = nameForTelemetry;
         this.compositeCSSClass = compositeCSSClass;
         this.titleForegroundColor = titleForegroundColor;
-        this.onDidCompositeOpen = this._register(( new Emitter()));
-        this.onDidCompositeClose = this._register(( new Emitter()));
-        this.mapCompositeToCompositeContainer = ( new Map());
-        this.mapActionsBindingToComposite = ( new Map());
-        this.instantiatedCompositeItems = ( new Map());
-        this.actionsListener = this._register(( new MutableDisposable()));
+        this.onDidCompositeOpen = this._register(( (new Emitter())));
+        this.onDidCompositeClose = this._register(( (new Emitter())));
+        this.mapCompositeToCompositeContainer = ( (new Map()));
+        this.mapActionsBindingToComposite = ( (new Map()));
+        this.instantiatedCompositeItems = ( (new Map()));
+        this.actionsListener = this._register(( (new MutableDisposable())));
         this.lastActiveCompositeId = storageService.get(activeCompositeSettingsKey, 1 , this.defaultCompositeId);
         this.toolbarHoverDelegate = this._register(createInstantHoverDelegate());
     }
@@ -88,7 +89,7 @@ class CompositePart extends Part {
         const compositeDescriptor = this.registry.getComposite(id);
         if (compositeDescriptor) {
             const that = this;
-            const compositeProgressIndicator = ( new ScopedProgressIndicator(
+            const compositeProgressIndicator = ( (new ScopedProgressIndicator(
                 assertIsDefined(this.progressBar),
                 new (class extends AbstractProgressScope {
                     constructor() {
@@ -97,17 +98,17 @@ class CompositePart extends Part {
                         this._register(that.onDidCompositeClose.event(e => this.onScopeClosed(e.getId())));
                     }
                 })()
-            ));
-            const compositeInstantiationService = this.instantiationService.createChild(( new ServiceCollection(
-                [IEditorProgressService, compositeProgressIndicator]
             )));
+            const compositeInstantiationService = this.instantiationService.createChild(( (new ServiceCollection(
+                [IEditorProgressService, compositeProgressIndicator]
+            ))));
             const composite = compositeDescriptor.instantiate(compositeInstantiationService);
-            const disposable = ( new DisposableStore());
+            const disposable = ( (new DisposableStore()));
             this.instantiatedCompositeItems.set(id, { composite, disposable, progress: compositeProgressIndicator });
             disposable.add(composite.onTitleAreaUpdate(() => this.onTitleAreaUpdate(composite.getId()), this));
             return composite;
         }
-        throw new Error(`Unable to find composite with id ${id}`);
+        throw ( (new Error(`Unable to find composite with id ${id}`)));
     }
     showComposite(composite) {
         this.activeComposite = composite;
@@ -187,12 +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(( localizeWithPath(
-            'vs/workbench/browser/parts/compositePart',
-            'ariaCompositeToolbarLabel',
-            "{0} actions",
-            compositeTitle
-        )));
+        toolBar.setAriaLabel(( localizeWithPath(_moduleId, 0, "{0} actions", compositeTitle)));
     }
     collectCompositeActions(composite) {
         const menuIds = composite?.getMenuIds();
@@ -237,11 +233,7 @@ class CompositePart extends Part {
             orientation: 0 ,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-            toggleMenuTitle: ( localizeWithPath(
-                'vs/workbench/browser/parts/compositePart',
-                'viewsAndMoreActions',
-                "Views and More Actions..."
-            )),
+            toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "Views and More Actions...")),
             telemetrySource: this.nameForTelemetry,
             hoverDelegate: this.toolbarHoverDelegate
         }));
@@ -252,19 +244,13 @@ class CompositePart extends Part {
         const titleContainer = append(parent, $('.title-label'));
         const titleLabel = append(titleContainer, $('h2'));
         this.titleLabelElement = titleLabel;
-        const hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
+        const hover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
         const $this = this;
         return {
             updateTitle: (id, title, keybinding) => {
                 if (!this.activeComposite || this.activeComposite.getId() === id) {
                     titleLabel.innerText = title;
-                    hover.update(keybinding ? ( localizeWithPath(
-                        'vs/workbench/browser/parts/compositePart',
-                        'titleTooltip',
-                        "{0} ({1})",
-                        title,
-                        keybinding
-                    )) : title);
+                    hover.update(keybinding ? ( localizeWithPath(_moduleId, 2, "{0} ({1})", title, keybinding)) : title);
                 }
             },
             updateStyles: () => {
@@ -297,7 +283,7 @@ class CompositePart extends Part {
     }
     createContentArea(parent) {
         const contentContainer = append(parent, $('.content'));
-        this.progressBar = this._register(( new ProgressBar(contentContainer, defaultProgressBarStyles)));
+        this.progressBar = this._register(( (new ProgressBar(contentContainer, defaultProgressBarStyles))));
         this.progressBar.hide();
         return contentContainer;
     }

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

@@ -207,17 +207,19 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         return;
     }
     close() {
-        this.doClose(true );
+        return this.doClose(true );
     }
     doClose(mergeGroupsToMainPart) {
+        let result = true;
         if (mergeGroupsToMainPart) {
-            this.mergeGroupsToMainPart();
+            result = this.mergeGroupsToMainPart();
         }
         this._onWillClose.fire();
+        return result;
     }
     mergeGroupsToMainPart() {
         if (!( this.groups.some(group => group.count > 0))) {
-            return;
+            return true;
         }
         let targetGroup = undefined;
         for (const group of this.editorPartsView.mainPart.getGroups(1 )) {
@@ -229,8 +231,9 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         if (!targetGroup) {
             targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? 3  : 1 );
         }
-        this.mergeAllGroups(targetGroup);
+        const result = this.mergeAllGroups(targetGroup);
         targetGroup.focus();
+        return result;
     }
 };
 AuxiliaryEditorPartImpl = AuxiliaryEditorPartImpl_1 = ( __decorate([