@codingame/monaco-vscode-api 4.5.1 → 4.5.2

package/vscode/src/vs/workbench/browser/labels.js

@@ -19,6 +19,7 @@ import { Disposable, dispose, MutableDisposable } from '../../base/common/lifecy
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
 import { normalizeDriveLetter } from '../../base/common/labels.js';
 import { INotebookDocumentService } from '../services/notebook/common/notebookDocumentService.service.js';
+const _moduleId = "vs/workbench/browser/labels";
 function toResource(props) {
     if (!props || !props.resource) {
         return undefined;
@@ -43,7 +44,7 @@ let ResourceLabels = class ResourceLabels extends Disposable {
         this.themeService = themeService;
         this.labelService = labelService;
         this.textFileService = textFileService;
-        this._onDidChangeDecorations = this._register(( new Emitter()));
+        this._onDidChangeDecorations = this._register(( (new Emitter())));
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
         this.widgets = [];
         this.labels = [];
@@ -128,17 +129,17 @@ let ResourceLabels = class ResourceLabels extends Disposable {
         this.clear();
     }
 };
-ResourceLabels = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IModelService)),
-    ( __param(4, IWorkspaceContextService)),
-    ( __param(5, ILanguageService)),
-    ( __param(6, IDecorationsService)),
-    ( __param(7, IThemeService)),
-    ( __param(8, ILabelService)),
-    ( __param(9, ITextFileService))
-], ResourceLabels));
+ResourceLabels = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IConfigurationService))),
+    ( (__param(3, IModelService))),
+    ( (__param(4, IWorkspaceContextService))),
+    ( (__param(5, ILanguageService))),
+    ( (__param(6, IDecorationsService))),
+    ( (__param(7, IThemeService))),
+    ( (__param(8, ILabelService))),
+    ( (__param(9, ITextFileService)))
+], ResourceLabels)));
 let ResourceLabel = class ResourceLabel extends ResourceLabels {
     get element() { return this.label; }
     constructor(container, options, instantiationService, configurationService, modelService, workspaceService, languageService, decorationsService, themeService, labelService, textFileService) {
@@ -146,22 +147,22 @@ let ResourceLabel = class ResourceLabel extends ResourceLabels {
         this.label = this._register(this.create(container, options));
     }
 };
-ResourceLabel = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IModelService)),
-    ( __param(5, IWorkspaceContextService)),
-    ( __param(6, ILanguageService)),
-    ( __param(7, IDecorationsService)),
-    ( __param(8, IThemeService)),
-    ( __param(9, ILabelService)),
-    ( __param(10, ITextFileService))
-], ResourceLabel));
+ResourceLabel = ( (__decorate([
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IConfigurationService))),
+    ( (__param(4, IModelService))),
+    ( (__param(5, IWorkspaceContextService))),
+    ( (__param(6, ILanguageService))),
+    ( (__param(7, IDecorationsService))),
+    ( (__param(8, IThemeService))),
+    ( (__param(9, ILabelService))),
+    ( (__param(10, ITextFileService)))
+], ResourceLabel)));
 var Redraw;
-( (function(Redraw) {
+( ((function(Redraw) {
     Redraw[Redraw["Basic"] = 1] = "Basic";
     Redraw[Redraw["Full"] = 2] = "Full";
-})(Redraw || (Redraw = {})));
+})(Redraw || (Redraw = {}))));
 let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
     constructor(container, options, languageService, modelService, decorationsService, labelService, textFileService, contextService, notebookDocumentService) {
         super(container, options);
@@ -172,10 +173,10 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         this.textFileService = textFileService;
         this.contextService = contextService;
         this.notebookDocumentService = notebookDocumentService;
-        this._onDidRender = this._register(( new Emitter()));
+        this._onDidRender = this._register(( (new Emitter())));
         this.onDidRender = this._onDidRender.event;
         this.label = undefined;
-        this.decoration = this._register(( new MutableDisposable()));
+        this.decoration = this._register(( (new MutableDisposable())));
         this.options = undefined;
         this.computedIconClasses = undefined;
         this.computedLanguageId = undefined;
@@ -306,22 +307,10 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
             const notebookDocument = this.notebookDocumentService.getNotebook(resource);
             const cellIndex = notebookDocument?.getCellIndex(resource);
             if (notebookDocument && cellIndex !== undefined && typeof label.name === 'string') {
-                options.title = ( localizeWithPath(
-                    'vs/workbench/browser/labels',
-                    'notebookCellLabel',
-                    "{0} • Cell {1}",
-                    label.name,
-                    `${cellIndex + 1}`
-                ));
+                options.title = ( localizeWithPath(_moduleId, 0, "{0} • Cell {1}", label.name, `${cellIndex + 1}`));
             }
             if (typeof label.name === 'string' && notebookDocument && cellIndex !== undefined && typeof label.name === 'string') {
-                label.name = ( localizeWithPath(
-                    'vs/workbench/browser/labels',
-                    'notebookCellLabel',
-                    "{0} • Cell {1}",
-                    label.name,
-                    `${cellIndex + 1}`
-                ));
+                label.name = ( localizeWithPath(_moduleId, 0, "{0} • Cell {1}", label.name, `${cellIndex + 1}`));
             }
         }
         const hasResourceChanged = this.hasResourceChanged(label);
@@ -350,7 +339,7 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         const newResource = toResource(newLabel);
         const oldResource = toResource(this.label);
         if (newResource && oldResource) {
-            return ( newResource.toString()) !== ( oldResource.toString());
+            return ( (newResource.toString())) !== ( (oldResource.toString()));
         }
         if (!newResource && !oldResource) {
             return false;
@@ -470,13 +459,13 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         this.computedWorkspaceFolderLabel = undefined;
     }
 };
-ResourceLabelWidget = ( __decorate([
-    ( __param(2, ILanguageService)),
-    ( __param(3, IModelService)),
-    ( __param(4, IDecorationsService)),
-    ( __param(5, ILabelService)),
-    ( __param(6, ITextFileService)),
-    ( __param(7, IWorkspaceContextService)),
-    ( __param(8, INotebookDocumentService))
-], ResourceLabelWidget));
+ResourceLabelWidget = ( (__decorate([
+    ( (__param(2, ILanguageService))),
+    ( (__param(3, IModelService))),
+    ( (__param(4, IDecorationsService))),
+    ( (__param(5, ILabelService))),
+    ( (__param(6, ITextFileService))),
+    ( (__param(7, IWorkspaceContextService))),
+    ( (__param(8, INotebookDocumentService)))
+], ResourceLabelWidget)));
 export { DEFAULT_LABELS_CONTAINER, ResourceLabel, ResourceLabels };

package/vscode/src/vs/workbench/browser/part.js

@@ -45,7 +45,7 @@ class Part extends Component {
     }
     setHeaderArea(headerContainer) {
         if (this.headerArea) {
-            throw new Error('Header already exists');
+            throw ( new Error('Header already exists'));
         }
         if (!this.parent || !this.titleArea) {
             return;
@@ -59,7 +59,7 @@ class Part extends Component {
     }
     setFooterArea(footerContainer) {
         if (this.footerArea) {
-            throw new Error('Footer already exists');
+            throw ( new Error('Footer already exists'));
         }
         if (!this.parent || !this.titleArea) {
             return;

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js

@@ -8,49 +8,26 @@ import { AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
 import { ViewContainerLocationToString } from '../../../common/views.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
+const _moduleId = "vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions";
 const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, ( localizeWithPath(
-    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-    'toggleAuxiliaryIconRight',
+    _moduleId,
+    0,
     'Icon to toggle the auxiliary bar off in its right position.'
 )));
-const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, ( localizeWithPath(
-    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-    'toggleAuxiliaryIconRightOn',
-    'Icon to toggle the auxiliary bar on in its right position.'
-)));
-const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codicon.layoutSidebarLeft, ( localizeWithPath(
-    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-    'toggleAuxiliaryIconLeft',
-    'Icon to toggle the auxiliary bar in its left position.'
-)));
-const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon', Codicon.layoutSidebarLeftOff, ( localizeWithPath(
-    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-    'toggleAuxiliaryIconLeftOn',
-    'Icon to toggle the auxiliary bar on in its left position.'
-)));
+const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, ( localizeWithPath(_moduleId, 1, 'Icon to toggle the auxiliary bar on in its right position.')));
+const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codicon.layoutSidebarLeft, ( localizeWithPath(_moduleId, 2, 'Icon to toggle the auxiliary bar in its left position.')));
+const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon', Codicon.layoutSidebarLeftOff, ( localizeWithPath(_moduleId, 3, 'Icon to toggle the auxiliary bar on in its left position.')));
 class ToggleAuxiliaryBarAction extends Action2 {
     static { this.ID = 'workbench.action.toggleAuxiliaryBar'; }
-    static { this.LABEL = ( localize2WithPath(
-        'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-        'toggleAuxiliaryBar',
-        "Toggle Secondary Side Bar Visibility"
-    )); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 4, "Toggle Secondary Side Bar Visibility")); }
     constructor() {
         super({
             id: ToggleAuxiliaryBarAction.ID,
             title: ToggleAuxiliaryBarAction.LABEL,
             toggled: {
                 condition: AuxiliaryBarVisibleContext,
-                title: ( localizeWithPath(
-                    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-                    'secondary sidebar',
-                    "Secondary Side Bar"
-                )),
-                mnemonicTitle: ( localizeWithPath(
-                    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-                    { key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] },
-                    "Secondary Si&&de Bar"
-                )),
+                title: ( localizeWithPath(_moduleId, 5, "Secondary Side Bar")),
+                mnemonicTitle: ( localizeWithPath(_moduleId, 6, "Secondary Si&&de Bar")),
             },
             category: Categories.View,
             f1: true,
@@ -80,11 +57,7 @@ class ToggleAuxiliaryBarAction extends Action2 {
 registerAction2(ToggleAuxiliaryBarAction);
 registerAction2(class FocusAuxiliaryBarAction extends Action2 {
     static { this.ID = 'workbench.action.focusAuxiliaryBar'; }
-    static { this.LABEL = ( localize2WithPath(
-        'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-        'focusAuxiliaryBar',
-        "Focus into Secondary Side Bar"
-    )); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 7, "Focus into Secondary Side Bar")); }
     constructor() {
         super({
             id: FocusAuxiliaryBarAction.ID,
@@ -110,15 +83,14 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localizeWithPath(
-                    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-                    'toggleSecondarySideBar',
-                    "Toggle Secondary Side Bar"
-                )),
+                title: ( localizeWithPath(_moduleId, 8, "Toggle Secondary Side Bar")),
                 toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarLeftIcon },
                 icon: auxiliaryBarLeftOffIcon,
             },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')), ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')))), ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')))),
+            when: ( (ContextKeyExpr.and( (ContextKeyExpr.or(
+                 (ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')),
+                 (ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both'))
+            )),  (ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'))))),
             order: 0
         }
     }, {
@@ -127,15 +99,14 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localizeWithPath(
-                    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-                    'toggleSecondarySideBar',
-                    "Toggle Secondary Side Bar"
-                )),
+                title: ( localizeWithPath(_moduleId, 8, "Toggle Secondary Side Bar")),
                 toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarRightIcon },
                 icon: auxiliaryBarRightOffIcon,
             },
-            when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')), ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')))), ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')))),
+            when: ( (ContextKeyExpr.and( (ContextKeyExpr.or(
+                 (ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')),
+                 (ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both'))
+            )),  (ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'))))),
             order: 2
         }
     }, {
@@ -144,16 +115,12 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localize2WithPath(
-                    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions',
-                    'hideAuxiliaryBar',
-                    'Hide Secondary Side Bar'
-                )),
+                title: ( localize2WithPath(_moduleId, 9, 'Hide Secondary Side Bar')),
             },
-            when: ( ContextKeyExpr.and(AuxiliaryBarVisibleContext, ( ContextKeyExpr.equals(
+            when: ( (ContextKeyExpr.and(AuxiliaryBarVisibleContext,  (ContextKeyExpr.equals(
                 'viewLocation',
                 ViewContainerLocationToString(2 )
-            )))),
+            ))))),
             order: 2
         }
     }

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

@@ -30,13 +30,14 @@ import { badgeForeground, badgeBackground } from '../../../platform/theme/common
 import '../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../platform/theme/common/colors/searchColors.js';
 var CompositeBarActionViewItem_1, CompositeActionViewItem_1;
+const _moduleId = "vs/workbench/browser/parts/compositeBarActions";
 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._register(( (new Emitter())));
         this.onDidChangeCompositeBarActionItem = this._onDidChangeCompositeBarActionItem.event;
-        this._onDidChangeActivity = this._register(( new Emitter()));
+        this._onDidChangeActivity = this._register(( (new Emitter())));
         this.onDidChangeActivity = this._onDidChangeActivity.event;
     }
     get compositeBarActionItem() {
@@ -75,9 +76,9 @@ let CompositeBarActionViewItem = class CompositeBarActionViewItem extends BaseAc
         this.hoverService = hoverService;
         this.configurationService = configurationService;
         this.keybindingService = keybindingService;
-        this.badgeDisposable = this._register(( new MutableDisposable()));
-        this.hoverDisposables = this._register(( new DisposableStore()));
-        this.showHoverScheduler = ( new RunOnceScheduler(() => this.showHover(), 0));
+        this.badgeDisposable = this._register(( (new MutableDisposable())));
+        this.hoverDisposables = this._register(( (new DisposableStore())));
+        this.showHoverScheduler = ( (new RunOnceScheduler(() => this.showHover(), 0)));
         this.options = options;
         this._register(this.themeService.onDidColorThemeChange(this.onThemeChange, this));
         this._register(action.onDidChangeCompositeBarActionItem(() => this.update()));
@@ -95,31 +96,31 @@ let CompositeBarActionViewItem = class CompositeBarActionViewItem extends BaseAc
             if (this.options.icon) {
                 const foreground = this._action.checked ? colors.activeForegroundColor : colors.inactiveForegroundColor;
                 if (this.compositeBarActionItem.iconUrl) {
-                    this.label.style.backgroundColor = foreground ? ( foreground.toString()) : '';
+                    this.label.style.backgroundColor = foreground ? ( (foreground.toString())) : '';
                     this.label.style.color = '';
                 }
                 else {
-                    this.label.style.color = foreground ? ( foreground.toString()) : '';
+                    this.label.style.color = foreground ? ( (foreground.toString())) : '';
                     this.label.style.backgroundColor = '';
                 }
             }
             else {
                 const foreground = this._action.checked ? colors.activeForegroundColor : colors.inactiveForegroundColor;
                 const borderBottomColor = this._action.checked ? colors.activeBorderBottomColor : null;
-                this.label.style.color = foreground ? ( foreground.toString()) : '';
-                this.label.style.borderBottomColor = borderBottomColor ? ( borderBottomColor.toString()) : '';
+                this.label.style.color = foreground ? ( (foreground.toString())) : '';
+                this.label.style.borderBottomColor = borderBottomColor ? ( (borderBottomColor.toString())) : '';
             }
-            this.container.style.setProperty('--insert-border-color', colors.dragAndDropBorder ? ( colors.dragAndDropBorder.toString()) : '');
+            this.container.style.setProperty('--insert-border-color', colors.dragAndDropBorder ? ( (colors.dragAndDropBorder.toString())) : '');
         }
         if (this.badgeContent) {
             const badgeFg = colors.badgeForeground ?? theme.getColor(badgeForeground);
             const badgeBg = colors.badgeBackground ?? theme.getColor(badgeBackground);
             const contrastBorderColor = theme.getColor(contrastBorder);
-            this.badgeContent.style.color = badgeFg ? ( badgeFg.toString()) : '';
-            this.badgeContent.style.backgroundColor = badgeBg ? ( badgeBg.toString()) : '';
+            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()) : '';
+            this.badgeContent.style.borderColor = contrastBorderColor ? ( (contrastBorderColor.toString())) : '';
         }
     }
     render(container) {
@@ -186,7 +187,7 @@ let CompositeBarActionViewItem = class CompositeBarActionViewItem extends BaseAc
             }
             else if (badge instanceof NumberBadge) {
                 if (badge.number) {
-                    let number = ( badge.number.toString());
+                    let number = ( (badge.number.toString()));
                     if (this.options.compact) {
                         if (badge.number > 99) {
                             number = '';
@@ -235,21 +236,15 @@ let CompositeBarActionViewItem = class CompositeBarActionViewItem extends BaseAc
     computeTitle() {
         this.keybindingLabel = this.computeKeybindingLabel();
         let title = this.keybindingLabel ? ( localizeWithPath(
-            'vs/workbench/browser/parts/compositeBarActions',
-            'titleKeybinding',
+            _moduleId,
+            0,
             "{0} ({1})",
             this.compositeBarActionItem.name,
             this.keybindingLabel
         )) : this.compositeBarActionItem.name;
         const badge = this.action.activity?.badge;
         if (badge?.getDescription()) {
-            title = ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBarActions',
-                'badgeTitle',
-                "{0} - {1}",
-                title,
-                badge.getDescription()
-            ));
+            title = ( localizeWithPath(_moduleId, 1, "{0} - {1}", title, badge.getDescription()));
         }
         return title;
     }
@@ -311,21 +306,17 @@ let CompositeBarActionViewItem = class CompositeBarActionViewItem extends BaseAc
         this.badge.remove();
     }
 };
-CompositeBarActionViewItem = CompositeBarActionViewItem_1 = ( __decorate([
-    ( __param(3, IThemeService)),
-    ( __param(4, IHoverService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IKeybindingService))
-], CompositeBarActionViewItem));
+CompositeBarActionViewItem = CompositeBarActionViewItem_1 = ( (__decorate([
+    ( (__param(3, IThemeService))),
+    ( (__param(4, IHoverService))),
+    ( (__param(5, IConfigurationService))),
+    ( (__param(6, IKeybindingService)))
+], CompositeBarActionViewItem)));
 class CompositeOverflowActivityAction extends CompositeBarAction {
     constructor(showMenu) {
         super({
             id: 'additionalComposites.action',
-            name: ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBarActions',
-                'additionalViews',
-                "Additional Views"
-            )),
+            name: ( localizeWithPath(_moduleId, 2, "Additional Views")),
             classNames: ThemeIcon.asClassNameArray(Codicon.more)
         });
         this.showMenu = showMenu;
@@ -351,53 +342,45 @@ let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityAct
         });
     }
     getActions() {
-        return ( this.getOverflowingComposites().map(composite => {
-            const action = this.getCompositeOpenAction(composite.id);
-            action.checked = this.getActiveCompositeId() === action.id;
-            const badge = this.getBadge(composite.id);
-            let suffix;
-            if (badge instanceof NumberBadge) {
-                suffix = badge.number;
-            }
-            if (suffix) {
-                action.label = ( localizeWithPath(
-                    'vs/workbench/browser/parts/compositeBarActions',
-                    'numberBadge',
-                    "{0} ({1})",
-                    composite.name,
-                    suffix
-                ));
-            }
-            else {
-                action.label = composite.name || '';
-            }
-            return action;
-        }));
+        return (
+             (this.getOverflowingComposites().map(composite => {
+                const action = this.getCompositeOpenAction(composite.id);
+                action.checked = this.getActiveCompositeId() === action.id;
+                const badge = this.getBadge(composite.id);
+                let suffix;
+                if (badge instanceof NumberBadge) {
+                    suffix = badge.number;
+                }
+                if (suffix) {
+                    action.label = ( localizeWithPath(_moduleId, 3, "{0} ({1})", composite.name, suffix));
+                }
+                else {
+                    action.label = composite.name || '';
+                }
+                return action;
+            }))
+        );
     }
 };
-CompositeOverflowActivityActionViewItem = ( __decorate([
-    ( __param(7, IContextMenuService)),
-    ( __param(8, IThemeService)),
-    ( __param(9, IHoverService)),
-    ( __param(10, IConfigurationService)),
-    ( __param(11, IKeybindingService))
-], CompositeOverflowActivityActionViewItem));
+CompositeOverflowActivityActionViewItem = ( (__decorate([
+    ( (__param(7, IContextMenuService))),
+    ( (__param(8, IThemeService))),
+    ( (__param(9, IHoverService))),
+    ( (__param(10, IConfigurationService))),
+    ( (__param(11, IKeybindingService)))
+], CompositeOverflowActivityActionViewItem)));
 let ManageExtensionAction = class ManageExtensionAction extends Action {
     constructor(commandService) {
-        super('activitybar.manage.extension', ( localizeWithPath(
-            'vs/workbench/browser/parts/compositeBarActions',
-            'manageExtension',
-            "Manage Extension"
-        )));
+        super('activitybar.manage.extension', ( localizeWithPath(_moduleId, 4, "Manage Extension")));
         this.commandService = commandService;
     }
     run(id) {
         return this.commandService.executeCommand('_extensions.manage', id);
     }
 };
-ManageExtensionAction = ( __decorate([
-    ( __param(0, ICommandService))
-], ManageExtensionAction));
+ManageExtensionAction = ( (__decorate([
+    ( (__param(0, ICommandService)))
+], ManageExtensionAction)));
 let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBarActionViewItem {
     static { CompositeActionViewItem_1 = this; }
     constructor(options, compositeActivityAction, toggleCompositePinnedAction, toggleCompositeBadgeAction, compositeContextMenuActionsProvider, contextMenuActionsProvider, dndHandler, compositeBar, contextMenuService, keybindingService, instantiationService, themeService, hoverService, configurationService) {
@@ -450,11 +433,11 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
                 this.blur();
             }
         }));
-        [this.badge, this.label].forEach(element => this._register(( new DelayedDragHandler(element, () => {
+        [this.badge, this.label].forEach(element => this._register(( (new DelayedDragHandler(element, () => {
             if (!this.action.checked) {
                 this.action.run();
             }
-        }))));
+        })))));
         this.updateStyles();
     }
     updateFromDragging(element, showFeedback, event) {
@@ -494,45 +477,27 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
             actions.push(...compositeContextMenuActions);
         }
         if (this.compositeActivityAction.compositeBarActionItem.extensionId) {
-            actions.push(( new Separator()));
+            actions.push(( (new Separator())));
             actions.push(CompositeActionViewItem_1.manageExtensionAction);
         }
         const isPinned = this.compositeBar.isPinned(this.compositeBarActionItem.id);
         if (isPinned) {
-            this.toggleCompositePinnedAction.label = ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBarActions',
-                'hide',
-                "Hide '{0}'",
-                this.compositeBarActionItem.name
-            ));
+            this.toggleCompositePinnedAction.label = ( localizeWithPath(_moduleId, 5, "Hide '{0}'", this.compositeBarActionItem.name));
             this.toggleCompositePinnedAction.checked = false;
         }
         else {
-            this.toggleCompositePinnedAction.label = ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBarActions',
-                'keep',
-                "Keep '{0}'",
-                this.compositeBarActionItem.name
-            ));
+            this.toggleCompositePinnedAction.label = ( localizeWithPath(_moduleId, 6, "Keep '{0}'", this.compositeBarActionItem.name));
         }
         const isBadgeEnabled = this.compositeBar.areBadgesEnabled(this.compositeBarActionItem.id);
         if (isBadgeEnabled) {
-            this.toggleCompositeBadgeAction.label = ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBarActions',
-                'hideBadge',
-                "Hide Badge"
-            ));
+            this.toggleCompositeBadgeAction.label = ( localizeWithPath(_moduleId, 7, "Hide Badge"));
         }
         else {
-            this.toggleCompositeBadgeAction.label = ( localizeWithPath(
-                'vs/workbench/browser/parts/compositeBarActions',
-                'showBadge',
-                "Show Badge"
-            ));
+            this.toggleCompositeBadgeAction.label = ( localizeWithPath(_moduleId, 8, "Show Badge"));
         }
         const otherActions = this.contextMenuActionsProvider();
         if (otherActions.length) {
-            actions.push(( new Separator()));
+            actions.push(( (new Separator())));
             actions.push(...otherActions);
         }
         const elementPosition = getDomNodePagePosition(container);
@@ -577,21 +542,17 @@ let CompositeActionViewItem = class CompositeActionViewItem extends CompositeBar
         this.label.remove();
     }
 };
-CompositeActionViewItem = CompositeActionViewItem_1 = ( __decorate([
-    ( __param(8, IContextMenuService)),
-    ( __param(9, IKeybindingService)),
-    ( __param(10, IInstantiationService)),
-    ( __param(11, IThemeService)),
-    ( __param(12, IHoverService)),
-    ( __param(13, IConfigurationService))
-], CompositeActionViewItem));
+CompositeActionViewItem = CompositeActionViewItem_1 = ( (__decorate([
+    ( (__param(8, IContextMenuService))),
+    ( (__param(9, IKeybindingService))),
+    ( (__param(10, IInstantiationService))),
+    ( (__param(11, IThemeService))),
+    ( (__param(12, IHoverService))),
+    ( (__param(13, IConfigurationService)))
+], CompositeActionViewItem)));
 class ToggleCompositePinnedAction extends Action {
     constructor(activity, compositeBar) {
-        super('show.toggleCompositePinned', activity ? activity.name : ( localizeWithPath(
-            'vs/workbench/browser/parts/compositeBarActions',
-            'toggle',
-            "Toggle View Pinned"
-        )));
+        super('show.toggleCompositePinned', activity ? activity.name : ( localizeWithPath(_moduleId, 9, "Toggle View Pinned")));
         this.activity = activity;
         this.compositeBar = compositeBar;
         this.checked = !!this.activity && this.compositeBar.isPinned(this.activity.id);
@@ -608,11 +569,7 @@ class ToggleCompositePinnedAction extends Action {
 }
 class ToggleCompositeBadgeAction extends Action {
     constructor(compositeBarActionItem, compositeBar) {
-        super('show.toggleCompositeBadge', compositeBarActionItem ? compositeBarActionItem.name : ( localizeWithPath(
-            'vs/workbench/browser/parts/compositeBarActions',
-            'toggleBadge',
-            "Toggle View Badge"
-        )));
+        super('show.toggleCompositeBadge', compositeBarActionItem ? compositeBarActionItem.name : ( localizeWithPath(_moduleId, 10, "Toggle View Badge")));
         this.compositeBarActionItem = compositeBarActionItem;
         this.compositeBar = compositeBar;
         this.checked = false;