@codingame/monaco-vscode-api 1.83.15 → 1.85.0-next.0

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

@@ -3,12 +3,11 @@ import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action, Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
 import { addDisposableListener, EventType, append, $, hide, clearNode, show, EventHelper, getDomNodePagePosition } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { MutableDisposable, DisposableStore, toDisposable, disposeIfDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { MutableDisposable, DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { NumberBadge, TextBadge, IconBadge, ProgressBadge } from '../../services/activity/common/activity.js';
+import { ProgressBadge, NumberBadge } from '../../services/activity/common/activity.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { contrastBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { DelayedDragHandler } from 'monaco-editor/esm/vs/base/browser/dnd.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
@@ -19,23 +18,31 @@ import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { IHoverService } from '../../services/hover/browser/hover.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-var ActivityActionViewItem_1, CompositeActionViewItem_1;
-class ActivityAction extends Action {
-    constructor(_activity) {
-        super(_activity.id, _activity.name, _activity.classNames?.join(' '), true);
-        this._activity = _activity;
+import { badgeForeground, badgeBackground, contrastBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
+var CompoisteBarActionViewItem_1, CompositeActionViewItem_1;
+class CompositeBarAction extends Action {
+    constructor(item) {
+        super(item.id, item.name, item.classNames?.join(' '), true);
+        this.item = item;
+        this._onDidChangeCompositeBarActionItem = this._register(( new Emitter()));
+        this.onDidChangeCompositeBarActionItem = this._onDidChangeCompositeBarActionItem.event;
         this._onDidChangeActivity = this._register(( new Emitter()));
         this.onDidChangeActivity = this._onDidChangeActivity.event;
-        this._onDidChangeBadge = this._register(( new Emitter()));
-        this.onDidChangeBadge = this._onDidChangeBadge.event;
+    }
+    get compositeBarActionItem() {
+        return this.item;
+    }
+    set compositeBarActionItem(item) {
+        this._label = item.name;
+        this.item = item;
+        this._onDidChangeCompositeBarActionItem.fire(this);
     }
     get activity() {
         return this._activity;
     }
     set activity(activity) {
-        this._label = activity.name;
         this._activity = activity;
-        this._onDidChangeActivity.fire(this);
+        this._onDidChangeActivity.fire(activity);
     }
     activate() {
         if (!this.checked) {
@@ -47,25 +54,9 @@ class ActivityAction extends Action {
             this._setChecked(false);
         }
     }
-    getBadge() {
-        return this.badge;
-    }
-    getClass() {
-        return this.clazz;
-    }
-    setBadge(badge, clazz) {
-        this.badge = badge;
-        this.clazz = clazz;
-        this._onDidChangeBadge.fire(this);
-    }
-    dispose() {
-        this._onDidChangeActivity.dispose();
-        this._onDidChangeBadge.dispose();
-        super.dispose();
-    }
 }
-let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionViewItem {
-    static { ActivityActionViewItem_1 = this; }
+let CompoisteBarActionViewItem = class CompoisteBarActionViewItem extends BaseActionViewItem {
+    static { CompoisteBarActionViewItem_1 = this; }
     static { this.hoverLeaveTime = 0; }
     constructor(action, options, badgesEnabled, themeService, hoverService, configurationService, keybindingService) {
         super(null, action, options);
@@ -79,13 +70,13 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         this.showHoverScheduler = ( new RunOnceScheduler(() => this.showHover(), 0));
         this.options = options;
         this._register(this.themeService.onDidColorThemeChange(this.onThemeChange, this));
-        this._register(action.onDidChangeActivity(this.updateActivity, this));
+        this._register(action.onDidChangeCompositeBarActionItem(() => this.update()));
         this._register(Event.filter(keybindingService.onDidUpdateKeybindings, () => this.keybindingLabel !== this.computeKeybindingLabel())(() => this.updateTitle()));
-        this._register(action.onDidChangeBadge(this.updateBadge, this));
+        this._register(action.onDidChangeActivity(() => this.updateActivity()));
         this._register(toDisposable(() => this.showHoverScheduler.cancel()));
     }
-    get activity() {
-        return this._action.activity;
+    get compositeBarActionItem() {
+        return this._action.compositeBarActionItem;
     }
     updateStyles() {
         const theme = this.themeService.getColorTheme();
@@ -93,7 +84,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         if (this.label) {
             if (this.options.icon) {
                 const foreground = this._action.checked ? colors.activeForegroundColor : colors.inactiveForegroundColor;
-                if (this.activity.iconUrl) {
+                if (this.compositeBarActionItem.iconUrl) {
                     this.label.style.backgroundColor = foreground ? ( foreground.toString()) : '';
                     this.label.style.color = '';
                 }
@@ -111,12 +102,12 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
             this.container.style.setProperty('--insert-border-color', colors.dragAndDropBorder ? ( colors.dragAndDropBorder.toString()) : '');
         }
         if (this.badgeContent) {
-            const badgeForeground = colors.badgeForeground;
-            const badgeBackground = colors.badgeBackground;
+            const badgeFg = colors.badgeForeground ?? theme.getColor(badgeForeground);
+            const badgeBg = colors.badgeBackground ?? theme.getColor(badgeBackground);
             const contrastBorderColor = theme.getColor(contrastBorder);
-            this.badgeContent.style.color = badgeForeground ? ( badgeForeground.toString()) : '';
-            this.badgeContent.style.backgroundColor = badgeBackground ? ( badgeBackground.toString()) : '';
-            this.badgeContent.style.borderStyle = contrastBorderColor ? 'solid' : '';
+            this.badgeContent.style.color = badgeFg ? ( badgeFg.toString()) : '';
+            this.badgeContent.style.backgroundColor = badgeBg ? ( badgeBg.toString()) : '';
+            this.badgeContent.style.borderStyle = contrastBorderColor && !this.options.compact ? 'solid' : '';
             this.badgeContent.style.borderWidth = contrastBorderColor ? '1px' : '';
             this.badgeContent.style.borderColor = contrastBorderColor ? ( contrastBorderColor.toString()) : '';
         }
@@ -150,35 +141,48 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         this.badgeContent = append(this.badge, $('.badge-content'));
         append(container, $('.active-item-indicator'));
         hide(this.badge);
-        this.updateActivity();
+        this.update();
         this.updateStyles();
         this.updateHover();
     }
     onThemeChange(theme) {
         this.updateStyles();
     }
-    updateActivity() {
+    update() {
         this.updateLabel();
+        this.updateActivity();
         this.updateTitle();
-        this.updateBadge();
         this.updateStyles();
     }
-    updateBadge() {
+    updateActivity() {
         const action = this.action;
-        if (!this.badge || !this.badgeContent || !(action instanceof ActivityAction)) {
+        if (!this.badge || !this.badgeContent || !(action instanceof CompositeBarAction)) {
             return;
         }
-        const badge = action.getBadge();
-        const clazz = action.getClass();
+        const activity = action.activity;
         this.badgeDisposable.clear();
         clearNode(this.badgeContent);
         hide(this.badge);
-        const shouldRenderBadges = this.badgesEnabled(this.activity.id);
-        if (badge && shouldRenderBadges) {
-            if (badge instanceof NumberBadge) {
+        const shouldRenderBadges = this.badgesEnabled(this.compositeBarActionItem.id);
+        if (activity && shouldRenderBadges) {
+            const { badge } = activity;
+            const classes = [];
+            if (this.options.compact) {
+                classes.push('compact');
+            }
+            if (badge instanceof ProgressBadge) {
+                show(this.badge);
+                classes.push('progress-badge');
+            }
+            else if (badge instanceof NumberBadge) {
                 if (badge.number) {
                     let number = ( badge.number.toString());
-                    if (badge.number > 999) {
+                    if (this.options.compact) {
+                        if (badge.number > 99) {
+                            number = '';
+                        }
+                    }
+                    else if (badge.number > 999) {
                         const noOfThousands = badge.number / 1000;
                         const floor = Math.floor(noOfThousands);
                         if (noOfThousands > floor) {
@@ -192,30 +196,17 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
                     show(this.badge);
                 }
             }
-            else if (badge instanceof TextBadge) {
-                this.badgeContent.textContent = badge.text;
-                show(this.badge);
-            }
-            else if (badge instanceof IconBadge) {
-                const clazzList = ThemeIcon.asClassNameArray(badge.icon);
-                this.badgeContent.classList.add(...clazzList);
-                show(this.badge);
-            }
-            else if (badge instanceof ProgressBadge) {
-                show(this.badge);
-            }
-            if (clazz) {
-                const classNames = clazz.split(' ');
-                this.badge.classList.add(...classNames);
-                this.badgeDisposable.value = toDisposable(() => this.badge.classList.remove(...classNames));
+            if (classes.length) {
+                this.badge.classList.add(...classes);
+                this.badgeDisposable.value = toDisposable(() => this.badge.classList.remove(...classes));
             }
         }
         this.updateTitle();
     }
     updateLabel() {
         this.label.className = 'action-label';
-        if (this.activity.classNames) {
-            this.label.classList.add(...this.activity.classNames);
+        if (this.compositeBarActionItem.classNames) {
+            this.label.classList.add(...this.compositeBarActionItem.classNames);
         }
         if (!this.options.icon) {
             this.label.textContent = this.action.label;
@@ -237,10 +228,10 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
             'vs/workbench/browser/parts/compositeBarActions',
             'titleKeybinding',
             "{0} ({1})",
-            this.activity.name,
+            this.compositeBarActionItem.name,
             this.keybindingLabel
-        )) : this.activity.name;
-        const badge = this.action.getBadge();
+        )) : this.compositeBarActionItem.name;
+        const badge = this.action.activity?.badge;
         if (badge?.getDescription()) {
             title = ( localizeWithPath(
                 'vs/workbench/browser/parts/compositeBarActions',
@@ -253,7 +244,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         return title;
     }
     computeKeybindingLabel() {
-        const keybinding = this.activity.keybindingId ? this.keybindingService.lookupKeybinding(this.activity.keybindingId) : null;
+        const keybinding = this.compositeBarActionItem.keybindingId ? this.keybindingService.lookupKeybinding(this.compositeBarActionItem.keybindingId) : null;
         return keybinding?.getLabel();
     }
     updateHover() {
@@ -261,7 +252,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         this.updateTitle();
         this.hoverDisposables.add(addDisposableListener(this.container, EventType.MOUSE_OVER, () => {
             if (!this.showHoverScheduler.isScheduled()) {
-                if (Date.now() - ActivityActionViewItem_1.hoverLeaveTime < 200) {
+                if (Date.now() - CompoisteBarActionViewItem_1.hoverLeaveTime < 200) {
                     this.showHover(true);
                 }
                 else {
@@ -271,7 +262,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         }, true));
         this.hoverDisposables.add(addDisposableListener(this.container, EventType.MOUSE_LEAVE, e => {
             if (e.target === this.container) {
-                ActivityActionViewItem_1.hoverLeaveTime = Date.now();
+                CompoisteBarActionViewItem_1.hoverLeaveTime = Date.now();
                 this.hoverService.hideHover();
                 this.showHoverScheduler.cancel();
             }
@@ -288,12 +279,18 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         const hoverPosition = this.options.hoverOptions.position();
         this.lastHover = this.hoverService.showHover({
             target: this.container,
-            hoverPosition,
             content: this.computeTitle(),
-            showPointer: true,
-            compact: true,
-            hideOnKeyDown: true,
-            skipFadeInAnimation,
+            position: {
+                hoverPosition,
+            },
+            persistence: {
+                hideOnKeyDown: true,
+            },
+            appearance: {
+                showPointer: true,
+                compact: true,
+                skipFadeInAnimation,
+            }
         });
     }
     dispose() {
@@ -304,13 +301,13 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         this.badge.remove();
     }
 };
-ActivityActionViewItem = ActivityActionViewItem_1 = ( __decorate([
+CompoisteBarActionViewItem = CompoisteBarActionViewItem_1 = ( __decorate([
     ( __param(3, IThemeService)),
     ( __param(4, IHoverService)),
     ( __param(5, IConfigurationService)),
     ( __param(6, IKeybindingService))
-], ActivityActionViewItem));
-class CompositeOverflowActivityAction extends ActivityAction {
+], CompoisteBarActionViewItem));
+class CompositeOverflowActivityAction extends CompositeBarAction {
     constructor(showMenu) {
         super({
             id: 'additionalComposites.action',
@@ -327,7 +324,7 @@ class CompositeOverflowActivityAction extends ActivityAction {
         this.showMenu();
     }
 }
-let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityActionViewItem extends ActivityActionViewItem {
+let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityActionViewItem extends CompoisteBarActionViewItem {
     constructor(action, getOverflowingComposites, getActiveCompositeId, getBadge, getCompositeOpenAction, colors, hoverOptions, contextMenuService, themeService, hoverService, configurationService, keybindingService) {
         super(action, { icon: true, colors, hasPopup: true, hoverOptions }, () => true, themeService, hoverService, configurationService, keybindingService);
         this.getOverflowingComposites = getOverflowingComposites;
@@ -335,18 +332,12 @@ let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityAct
         this.getBadge = getBadge;
         this.getCompositeOpenAction = getCompositeOpenAction;
         this.contextMenuService = contextMenuService;
-        this.actions = [];
     }
     showMenu() {
-        if (this.actions) {
-            disposeIfDisposable(this.actions);
-        }
-        this.actions = this.getActions();
         this.contextMenuService.showContextMenu({
             getAnchor: () => this.container,
-            getActions: () => this.actions,
+            getActions: () => this.getActions(),
             getCheckedActionsRepresentation: () => 'radio',
-            onHide: () => disposeIfDisposable(this.actions)
         });
     }
     getActions() {
@@ -358,9 +349,6 @@ let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityAct
             if (badge instanceof NumberBadge) {
                 suffix = badge.number;
             }
-            else if (badge instanceof TextBadge) {
-                suffix = badge.text;
-            }
             if (suffix) {
                 action.label = ( localizeWithPath(
                     'vs/workbench/browser/parts/compositeBarActions',
@@ -376,12 +364,6 @@ let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityAct
             return action;
         }));
     }
-    dispose() {
-        super.dispose();
-        if (this.actions) {
-            this.actions = disposeIfDisposable(this.actions);
-        }
-    }
 };
 CompositeOverflowActivityActionViewItem = ( __decorate([
     ( __param(7, IContextMenuService)),
@@ -406,7 +388,7 @@ let ManageExtensionAction = class ManageExtensionAction extends Action {
 ManageExtensionAction = ( __decorate([
     ( __param(0, ICommandService))
 ], ManageExtensionAction));
-let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActionViewItem {
+let CompositeActionViewItem = class CompositeActionViewItem extends CompoisteBarActionViewItem {
     static { CompositeActionViewItem_1 = this; }
     constructor(options, compositeActivityAction, toggleCompositePinnedAction, toggleCompositeBadgeAction, compositeContextMenuActionsProvider, contextMenuActionsProvider, dndHandler, compositeBar, contextMenuService, keybindingService, instantiationService, themeService, hoverService, configurationService) {
         super(compositeActivityAction, options, compositeBar.areBadgesEnabled.bind(compositeBar), themeService, hoverService, configurationService, keybindingService);
@@ -431,9 +413,9 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
             this.showContextMenu(container);
         }));
         let insertDropBefore = undefined;
-        this._register(CompositeDragAndDropObserver.INSTANCE.registerDraggable(this.container, () => { return { type: 'composite', id: this.activity.id }; }, {
+        this._register(CompositeDragAndDropObserver.INSTANCE.registerDraggable(this.container, () => { return { type: 'composite', id: this.compositeBarActionItem.id }; }, {
             onDragOver: e => {
-                const isValidMove = e.dragAndDropData.getData().id !== this.activity.id && this.dndHandler.onDragOver(e.dragAndDropData, this.activity.id, e.eventData);
+                const isValidMove = e.dragAndDropData.getData().id !== this.compositeBarActionItem.id && this.dndHandler.onDragOver(e.dragAndDropData, this.compositeBarActionItem.id, e.eventData);
                 toggleDropEffect(e.eventData.dataTransfer, 'move', isValidMove);
                 insertDropBefore = this.updateFromDragging(container, isValidMove, e.eventData);
             },
@@ -445,11 +427,11 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
             },
             onDrop: e => {
                 EventHelper.stop(e.eventData, true);
-                this.dndHandler.drop(e.dragAndDropData, this.activity.id, e.eventData, insertDropBefore);
+                this.dndHandler.drop(e.dragAndDropData, this.compositeBarActionItem.id, e.eventData, insertDropBefore);
                 insertDropBefore = this.updateFromDragging(container, false, e.eventData);
             },
             onDragStart: e => {
-                if (e.dragAndDropData.getData().id !== this.activity.id) {
+                if (e.dragAndDropData.getData().id !== this.compositeBarActionItem.id) {
                     return;
                 }
                 if (e.eventData.dataTransfer) {
@@ -497,21 +479,21 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
     }
     showContextMenu(container) {
         const actions = [this.toggleCompositePinnedAction, this.toggleCompositeBadgeAction];
-        const compositeContextMenuActions = this.compositeContextMenuActionsProvider(this.activity.id);
+        const compositeContextMenuActions = this.compositeContextMenuActionsProvider(this.compositeBarActionItem.id);
         if (compositeContextMenuActions.length) {
             actions.push(...compositeContextMenuActions);
         }
-        if (this.compositeActivityAction.activity.extensionId) {
+        if (this.compositeActivityAction.compositeBarActionItem.extensionId) {
             actions.push(( new Separator()));
             actions.push(CompositeActionViewItem_1.manageExtensionAction);
         }
-        const isPinned = this.compositeBar.isPinned(this.activity.id);
+        const isPinned = this.compositeBar.isPinned(this.compositeBarActionItem.id);
         if (isPinned) {
             this.toggleCompositePinnedAction.label = ( localizeWithPath(
                 'vs/workbench/browser/parts/compositeBarActions',
                 'hide',
                 "Hide '{0}'",
-                this.activity.name
+                this.compositeBarActionItem.name
             ));
             this.toggleCompositePinnedAction.checked = false;
         }
@@ -520,10 +502,10 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
                 'vs/workbench/browser/parts/compositeBarActions',
                 'keep',
                 "Keep '{0}'",
-                this.activity.name
+                this.compositeBarActionItem.name
             ));
         }
-        const isBadgeEnabled = this.compositeBar.areBadgesEnabled(this.activity.id);
+        const isBadgeEnabled = this.compositeBar.areBadgesEnabled(this.compositeBarActionItem.id);
         if (isBadgeEnabled) {
             this.toggleCompositeBadgeAction.label = ( localizeWithPath(
                 'vs/workbench/browser/parts/compositeBarActions',
@@ -551,7 +533,7 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
         this.contextMenuService.showContextMenu({
             getAnchor: () => anchor,
             getActions: () => actions,
-            getActionsContext: () => this.activity.id
+            getActionsContext: () => this.compositeBarActionItem.id
         });
     }
     updateChecked() {
@@ -615,19 +597,19 @@ class ToggleCompositePinnedAction extends Action {
     }
 }
 class ToggleCompositeBadgeAction extends Action {
-    constructor(activity, compositeBar) {
-        super('show.toggleCompositeBadge', activity ? activity.name : ( localizeWithPath(
+    constructor(compositeBarActionItem, compositeBar) {
+        super('show.toggleCompositeBadge', compositeBarActionItem ? compositeBarActionItem.name : ( localizeWithPath(
             'vs/workbench/browser/parts/compositeBarActions',
             'toggleBadge',
             "Toggle View Badge"
         )));
-        this.activity = activity;
+        this.compositeBarActionItem = compositeBarActionItem;
         this.compositeBar = compositeBar;
         this.checked = false;
     }
     async run(context) {
-        const id = this.activity ? this.activity.id : context;
+        const id = this.compositeBarActionItem ? this.compositeBarActionItem.id : context;
         this.compositeBar.toggleBadgeEnablement(id);
     }
 }
-export { ActivityAction, ActivityActionViewItem, CompositeActionViewItem, CompositeOverflowActivityAction, CompositeOverflowActivityActionViewItem, ToggleCompositeBadgeAction, ToggleCompositePinnedAction };
+export { CompoisteBarActionViewItem, CompositeActionViewItem, CompositeBarAction, CompositeOverflowActivityAction, CompositeOverflowActivityActionViewItem, ToggleCompositeBadgeAction, ToggleCompositePinnedAction };