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

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

@@ -10,40 +10,50 @@ import { MultiWindowParts } from 'vscode/vscode/vs/workbench/browser/part';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { getWindow } from 'vscode/vscode/vs/base/browser/dom';
-import { getZoomLevel } from 'vscode/vscode/vs/base/browser/browser';
+import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 
 var EditorParts_1;
+const _moduleId = "vs/workbench/browser/parts/editor/editorParts";
 let EditorParts = class EditorParts extends MultiWindowParts {
     static { EditorParts_1 = this; }
-    constructor(instantiationService, storageService, themeService) {
+    constructor(instantiationService, storageService, themeService, auxiliaryWindowService) {
         super('workbench.editorParts', themeService, storageService);
         this.instantiationService = instantiationService;
+        this.storageService = storageService;
+        this.auxiliaryWindowService = auxiliaryWindowService;
         this.mainPart = this._register(this.createMainEditorPart());
         this.mostRecentActiveParts = [this.mainPart];
-        this._onDidCreateAuxiliaryEditorPart = this._register(( new Emitter()));
+        this._onDidCreateAuxiliaryEditorPart = this._register(( (new Emitter())));
         this.onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
         this.workspaceMemento = this.getMemento(1 , 0 );
         this._isReady = false;
-        this.whenReadyPromise = ( new DeferredPromise());
+        this.whenReadyPromise = ( (new DeferredPromise()));
         this.whenReady = this.whenReadyPromise.p;
-        this.whenRestoredPromise = ( new DeferredPromise());
+        this.whenRestoredPromise = ( (new DeferredPromise()));
         this.whenRestored = this.whenRestoredPromise.p;
-        this._onDidActiveGroupChange = this._register(( new Emitter()));
+        this.editorWorkingSets = (() => {
+            const workingSetsRaw = this.storageService.get(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, 1 );
+            if (workingSetsRaw) {
+                return JSON.parse(workingSetsRaw);
+            }
+            return [];
+        })();
+        this._onDidActiveGroupChange = this._register(( (new Emitter())));
         this.onDidChangeActiveGroup = this._onDidActiveGroupChange.event;
-        this._onDidAddGroup = this._register(( new Emitter()));
+        this._onDidAddGroup = this._register(( (new Emitter())));
         this.onDidAddGroup = this._onDidAddGroup.event;
-        this._onDidRemoveGroup = this._register(( new Emitter()));
+        this._onDidRemoveGroup = this._register(( (new Emitter())));
         this.onDidRemoveGroup = this._onDidRemoveGroup.event;
-        this._onDidMoveGroup = this._register(( new Emitter()));
+        this._onDidMoveGroup = this._register(( (new Emitter())));
         this.onDidMoveGroup = this._onDidMoveGroup.event;
-        this._onDidActivateGroup = this._register(( new Emitter()));
+        this._onDidActivateGroup = this._register(( (new Emitter())));
         this.onDidActivateGroup = this._onDidActivateGroup.event;
-        this._onDidChangeGroupIndex = this._register(( new Emitter()));
+        this._onDidChangeGroupIndex = this._register(( (new Emitter())));
         this.onDidChangeGroupIndex = this._onDidChangeGroupIndex.event;
-        this._onDidChangeGroupLocked = this._register(( new Emitter()));
+        this._onDidChangeGroupLocked = this._register(( (new Emitter())));
         this.onDidChangeGroupLocked = this._onDidChangeGroupLocked.event;
-        this._onDidChangeGroupMaximized = this._register(( new Emitter()));
+        this._onDidChangeGroupMaximized = this._register(( (new Emitter())));
         this.onDidChangeGroupMaximized = this._onDidChangeGroupMaximized.event;
         this._register(this.registerPart(this.mainPart));
         this.restoreParts();
@@ -58,12 +68,12 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     async createAuxiliaryEditorPart(options) {
         const { part, instantiationService, disposables } = await this.instantiationService.createInstance(AuxiliaryEditorPart, this).create(this.getGroupsLabel(this._parts.size), options);
         this._onDidAddGroup.fire(part.activeGroup);
-        const eventDisposables = disposables.add(( new DisposableStore()));
+        const eventDisposables = disposables.add(( (new DisposableStore())));
         this._onDidCreateAuxiliaryEditorPart.fire({ part, instantiationService, disposables: eventDisposables });
         return part;
     }
     registerPart(part) {
-        const disposables = this._register(( new DisposableStore()));
+        const disposables = this._register(( (new DisposableStore())));
         disposables.add(super.registerPart(part));
         this.registerEditorPartListeners(part, disposables);
         return disposables;
@@ -104,12 +114,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return ( localizeWithPath(
-            'vs/workbench/browser/parts/editor/editorParts',
-            'groupLabel',
-            "Window {0}",
-            index + 1
-        ));
+        return ( localizeWithPath(_moduleId, 0, "Window {0}", index + 1));
     }
     getPart(groupOrElement) {
         if (this._parts.size > 1) {
@@ -149,7 +154,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         mostRecentActivePart?.activeGroup.focus();
         this._isReady = true;
         this.whenReadyPromise.complete();
-        await Promise.allSettled(( this.parts.map(part => part.whenRestored)));
+        await Promise.allSettled(( (this.parts.map(part => part.whenRestored))));
         this.whenRestoredPromise.complete();
     }
     loadState() {
@@ -166,55 +171,36 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     }
     createState() {
         return {
-            auxiliary: ( this.parts.filter(part => part !== this.mainPart).map(part => {
+            auxiliary: ( (this.parts.filter(part => part !== this.mainPart).map(part => {
+                const auxiliaryWindow = this.auxiliaryWindowService.getWindow(part.windowId);
                 return {
                     state: part.createState(),
-                    bounds: (() => {
-                        const auxiliaryWindow = getWindow(part.getContainer());
-                        if (auxiliaryWindow) {
-                            return {
-                                x: auxiliaryWindow.screenX,
-                                y: auxiliaryWindow.screenY,
-                                width: auxiliaryWindow.outerWidth,
-                                height: auxiliaryWindow.outerHeight
-                            };
-                        }
-                        return undefined;
-                    })(),
-                    zoomLevel: (() => {
-                        const auxiliaryWindow = getWindow(part.getContainer());
-                        if (auxiliaryWindow) {
-                            return getZoomLevel(auxiliaryWindow);
-                        }
-                        return undefined;
-                    })()
+                    ...auxiliaryWindow?.createState()
                 };
-            })),
-            mru: ( this.mostRecentActiveParts.map(part => this.parts.indexOf(part)))
+            }))),
+            mru: ( (this.mostRecentActiveParts.map(part => this.parts.indexOf(part))))
         };
     }
     async restoreState(state) {
         if (state.auxiliary.length) {
             const auxiliaryEditorPartPromises = [];
             for (const auxiliaryEditorPartState of state.auxiliary) {
-                auxiliaryEditorPartPromises.push(this.createAuxiliaryEditorPart({
-                    bounds: auxiliaryEditorPartState.bounds,
-                    state: auxiliaryEditorPartState.state,
-                    zoomLevel: auxiliaryEditorPartState.zoomLevel
-                }));
+                auxiliaryEditorPartPromises.push(this.createAuxiliaryEditorPart(auxiliaryEditorPartState));
             }
             await Promise.allSettled(auxiliaryEditorPartPromises);
             if (state.mru.length === this.parts.length) {
-                this.mostRecentActiveParts = ( state.mru.map(index => this.parts[index]));
+                this.mostRecentActiveParts = ( (state.mru.map(index => this.parts[index])));
             }
             else {
                 this.mostRecentActiveParts = [...this.parts];
             }
-            await Promise.allSettled(( this.parts.map(part => part.whenReady)));
+            await Promise.allSettled(( (this.parts.map(part => part.whenReady))));
         }
     }
     get hasRestorableState() {
-        return ( this.parts.some(part => part.hasRestorableState));
+        return (
+             (this.parts.some(part => part.hasRestorableState))
+        );
     }
     onDidChangeMementoState(e) {
         if (e.external && e.scope === 1 ) {
@@ -231,16 +217,79 @@ let EditorParts = class EditorParts extends MultiWindowParts {
                 continue;
             }
             for (const group of part.getGroups(1 )) {
-                const closed = await group.closeAllEditors();
-                if (!closed) {
-                    return false;
-                }
+                await group.closeAllEditors({ excludeConfirming: true });
+            }
+            const closed = part.close();
+            if (!closed) {
+                return false;
             }
-            part.close();
         }
-        await this.restoreState(state);
+        if (state !== 'empty') {
+            await this.restoreState(state);
+        }
+        return true;
+    }
+    static { this.EDITOR_WORKING_SETS_STORAGE_KEY = 'editor.workingSets'; }
+    saveWorkingSet(name) {
+        const workingSet = {
+            id: generateUuid(),
+            name,
+            main: this.mainPart.createState(),
+            auxiliary: this.createState()
+        };
+        this.editorWorkingSets.push(workingSet);
+        this.saveWorkingSets();
+        return {
+            id: workingSet.id,
+            name: workingSet.name
+        };
+    }
+    getWorkingSets() {
+        return (
+             (this.editorWorkingSets.map(workingSet => ({ id: workingSet.id, name: workingSet.name })))
+        );
+    }
+    deleteWorkingSet(workingSet) {
+        const index = this.indexOfWorkingSet(workingSet);
+        if (typeof index === 'number') {
+            this.editorWorkingSets.splice(index, 1);
+            this.saveWorkingSets();
+        }
+    }
+    async applyWorkingSet(workingSet) {
+        let workingSetState;
+        if (workingSet === 'empty') {
+            workingSetState = 'empty';
+        }
+        else {
+            workingSetState = this.editorWorkingSets[this.indexOfWorkingSet(workingSet) ?? -1];
+        }
+        if (!workingSetState) {
+            return false;
+        }
+        const applied = await this.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.auxiliary);
+        if (!applied) {
+            return false;
+        }
+        await this.mainPart.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.main);
+        const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+        if (mostRecentActivePart) {
+            await mostRecentActivePart.whenReady;
+            mostRecentActivePart.activeGroup.focus();
+        }
         return true;
     }
+    indexOfWorkingSet(workingSet) {
+        for (let i = 0; i < this.editorWorkingSets.length; i++) {
+            if (this.editorWorkingSets[i].id === workingSet.id) {
+                return i;
+            }
+        }
+        return undefined;
+    }
+    saveWorkingSets() {
+        this.storageService.store(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, JSON.stringify(this.editorWorkingSets), 1 , 1 );
+    }
     get activeGroup() {
         return this.activePart.activeGroup;
     }
@@ -265,7 +314,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
                     parts = distinct([...this.mostRecentActiveParts, ...this.parts]);
                     break;
             }
-            return ( parts.map(part => part.getGroups(order))).flat();
+            return ( (parts.map(part => part.getGroups(order)))).flat();
         }
         return this.mainPart.getGroups(order);
     }
@@ -289,7 +338,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             groupView = group;
         }
         if (!groupView) {
-            throw new Error('Invalid editor group provided!');
+            throw ( (new Error('Invalid editor group provided!')));
         }
         return groupView;
     }
@@ -302,14 +351,14 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     setSize(group, size) {
         this.getPart(group).setSize(group, size);
     }
-    arrangeGroups(arrangement, group) {
-        (group !== undefined ? this.getPart(group) : this.activePart).arrangeGroups(arrangement, group);
+    arrangeGroups(arrangement, group = this.activePart.activeGroup) {
+        this.getPart(group).arrangeGroups(arrangement, group);
     }
-    toggleMaximizeGroup(group) {
-        (group !== undefined ? this.getPart(group) : this.activePart).toggleMaximizeGroup(group);
+    toggleMaximizeGroup(group = this.activePart.activeGroup) {
+        this.getPart(group).toggleMaximizeGroup(group);
     }
-    toggleExpandGroup(group) {
-        (group !== undefined ? this.getPart(group) : this.activePart).toggleExpandGroup(group);
+    toggleExpandGroup(group = this.activePart.activeGroup) {
+        this.getPart(group).toggleExpandGroup(group);
     }
     restoreGroup(group) {
         return this.getPart(group).restoreGroup(group);
@@ -382,10 +431,11 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     get partOptions() { return this.mainPart.partOptions; }
     get onDidChangeEditorPartOptions() { return this.mainPart.onDidChangeEditorPartOptions; }
 };
-EditorParts = EditorParts_1 = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IStorageService)),
-    ( __param(2, IThemeService))
-], EditorParts));
+EditorParts = EditorParts_1 = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, IStorageService))),
+    ( (__param(2, IThemeService))),
+    ( (__param(3, IAuxiliaryWindowService)))
+], EditorParts)));
 
 export { EditorParts };

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

@@ -23,6 +23,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 var ViewContainerActivityAction_1;
+const _moduleId = "vs/workbench/browser/parts/paneCompositeBar";
 let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     constructor(options, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, layoutService) {
         super();
@@ -36,29 +37,29 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.contextKeyService = contextKeyService;
         this.environmentService = environmentService;
         this.layoutService = layoutService;
-        this.viewContainerDisposables = this._register(( new DisposableMap()));
-        this.compositeActions = ( new Map());
+        this.viewContainerDisposables = this._register(( (new DisposableMap())));
+        this.compositeActions = ( (new Map()));
         this.hasExtensionsRegistered = false;
         this._cachedViewContainers = undefined;
         this.location = paneCompositePart.partId === "workbench.parts.panel"
             ? 1  : paneCompositePart.partId === "workbench.parts.auxiliarybar"
             ? 2  : 0 ;
-        this.dndHandler = ( new CompositeDragAndDrop(
+        this.dndHandler = ( (new CompositeDragAndDrop(
             this.viewDescriptorService,
             this.location,
             this.options.orientation,
             async (id, focus) => { return (await this.paneCompositePart.openPaneComposite(id, focus)) ?? null; },
             (from, to, before) => this.compositeBar.move(from, to, this.options.orientation === 1  ? before?.verticallyBefore : before?.horizontallyBefore),
             () => this.compositeBar.getCompositeBarItems()
-        ));
-        const cachedItems = ( this.cachedViewContainers
+        )));
+        const cachedItems = ( (this.cachedViewContainers
             .map(container => ({
             id: container.id,
             name: container.name,
             visible: !this.shouldBeHidden(container.id, container),
             order: container.order,
             pinned: container.pinned,
-        })));
+        }))));
         this.compositeBar = this.createCompositeBar(cachedItems);
         this.onDidRegisterViewContainers(this.getViewContainers());
         this.registerListeners();
@@ -91,11 +92,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         const viewContainer = this.viewDescriptorService.getViewContainerById(compositeId);
         const defaultLocation = this.viewDescriptorService.getDefaultViewContainerLocation(viewContainer);
         if (defaultLocation !== this.viewDescriptorService.getViewContainerLocation(viewContainer)) {
-            actions.push(toAction({ id: 'resetLocationAction', label: ( localizeWithPath(
-                'vs/workbench/browser/parts/paneCompositeBar',
-                'resetLocation',
-                "Reset Location"
-            )), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
+            actions.push(toAction({ id: 'resetLocationAction', label: ( localizeWithPath(_moduleId, 0, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
         }
         else {
             const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
@@ -103,11 +100,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 const viewToReset = viewContainerModel.allViewDescriptors[0];
                 const defaultContainer = this.viewDescriptorService.getDefaultContainerById(viewToReset.id);
                 if (defaultContainer !== viewContainer) {
-                    actions.push(toAction({ id: 'resetLocationAction', label: ( localizeWithPath(
-                        'vs/workbench/browser/parts/paneCompositeBar',
-                        'resetLocation',
-                        "Reset Location"
-                    )), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
+                    actions.push(toAction({ id: 'resetLocationAction', label: ( localizeWithPath(_moduleId, 0, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
                 }
             }
         }
@@ -129,7 +122,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     }
     onDidChangeViewContainers(added, removed) {
         removed.filter(({ location }) => location === this.location).forEach(({ container }) => this.onDidDeregisterViewContainer(container));
-        this.onDidRegisterViewContainers(( added.filter(({ location }) => location === this.location).map(({ container }) => container)));
+        this.onDidRegisterViewContainers(( (added.filter(({ location }) => location === this.location).map(({ container }) => container))));
     }
     onDidChangeViewContainerLocation(container, from, to) {
         if (from === this.location) {
@@ -189,16 +182,16 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
                 compositeActions = {
                     activityAction: this._register(this.instantiationService.createInstance(ViewContainerActivityAction, this.toCompositeBarActionItemFrom(viewContainerModel), this.part, this.paneCompositePart)),
-                    pinnedAction: this._register(( new ToggleCompositePinnedAction(this.toCompositeBarActionItemFrom(viewContainerModel), this.compositeBar))),
-                    badgeAction: this._register(( new ToggleCompositeBadgeAction(this.toCompositeBarActionItemFrom(viewContainerModel), this.compositeBar)))
+                    pinnedAction: this._register(( (new ToggleCompositePinnedAction(this.toCompositeBarActionItemFrom(viewContainerModel), this.compositeBar)))),
+                    badgeAction: this._register(( (new ToggleCompositeBadgeAction(this.toCompositeBarActionItemFrom(viewContainerModel), this.compositeBar))))
                 };
             }
             else {
                 const cachedComposite = this.cachedViewContainers.filter(c => c.id === compositeId)[0];
                 compositeActions = {
                     activityAction: this._register(this.instantiationService.createInstance(PlaceHolderViewContainerActivityAction, this.toCompositeBarActionItem(compositeId, cachedComposite?.name ?? compositeId, cachedComposite?.icon, undefined), this.part, this.paneCompositePart)),
-                    pinnedAction: this._register(( new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar))),
-                    badgeAction: this._register(( new PlaceHolderToggleCompositeBadgeAction(compositeId, this.compositeBar)))
+                    pinnedAction: this._register(( (new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar)))),
+                    badgeAction: this._register(( (new PlaceHolderToggleCompositeBadgeAction(compositeId, this.compositeBar))))
                 };
             }
             this.compositeActions.set(compositeId, compositeActions);
@@ -219,7 +212,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
             const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
             this.updateCompositeBarActionItem(viewContainer, viewContainerModel);
             this.showOrHideViewContainer(viewContainer);
-            const disposables = ( new DisposableStore());
+            const disposables = ( (new DisposableStore()));
             disposables.add(viewContainerModel.onDidChangeContainerInfo(() => this.updateCompositeBarActionItem(viewContainer, viewContainerModel)));
             disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.showOrHideViewContainer(viewContainer)));
             this.viewContainerDisposables.set(viewContainer.id, disposables);
@@ -251,7 +244,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
             if (URI.isUri(icon)) {
                 iconUrl = icon;
                 const cssUrl = asCSSUrl(icon);
-                const hash = ( new StringSHA1());
+                const hash = ( (new StringSHA1()));
                 hash.update(cssUrl);
                 const iconId = `activity-${id.replace(/\./g, '-')}-${hash.digest()}`;
                 const iconClass = `.monaco-workbench .${this.options.partContainerClass} .monaco-action-bar .action-label.${iconId}`;
@@ -325,16 +318,20 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getPinnedPaneCompositeIds() {
-        const pinnedCompositeIds = ( this.compositeBar.getPinnedComposites().map(v => v.id));
-        return ( this.getViewContainers()
-            .filter(v => this.compositeBar.isPinned(v.id))
-            .sort((v1, v2) => pinnedCompositeIds.indexOf(v1.id) - pinnedCompositeIds.indexOf(v2.id))
-            .map(v => v.id));
+        const pinnedCompositeIds = ( (this.compositeBar.getPinnedComposites().map(v => v.id)));
+        return (
+             (this.getViewContainers()
+                .filter(v => this.compositeBar.isPinned(v.id))
+                .sort((v1, v2) => pinnedCompositeIds.indexOf(v1.id) - pinnedCompositeIds.indexOf(v2.id))
+                .map(v => v.id))
+        );
     }
     getVisiblePaneCompositeIds() {
-        return ( this.compositeBar.getVisibleComposites()
-            .filter(v => this.paneCompositePart.getActivePaneComposite()?.getId() === v.id || this.compositeBar.isPinned(v.id))
-            .map(v => v.id));
+        return (
+             (this.compositeBar.getVisibleComposites()
+                .filter(v => this.paneCompositePart.getActivePaneComposite()?.getId() === v.id || this.compositeBar.isPinned(v.id))
+                .map(v => v.id))
+        );
     }
     getContextMenuActions() {
         return this.compositeBar.getContextMenuActions();
@@ -343,7 +340,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.compositeBar.focus(index);
     }
     layout(width, height) {
-        this.compositeBar.layout(( new Dimension(width, height)));
+        this.compositeBar.layout(( (new Dimension(width, height))));
     }
     getViewContainer(id) {
         const viewContainer = this.viewDescriptorService.getViewContainerById(id);
@@ -369,7 +366,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 });
             }
             for (const viewContainer of this.getViewContainers()) {
-                if (!( newCompositeItems.some(({ id }) => id === viewContainer.id))) {
+                if (!( (newCompositeItems.some(({ id }) => id === viewContainer.id)))) {
                     const index = compositeItems.findIndex(({ id }) => id === viewContainer.id);
                     if (index !== -1) {
                         const compositeItem = compositeItems[index];
@@ -451,24 +448,24 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     }
     storeCachedViewContainersState(cachedViewContainers) {
         const pinnedViewContainers = this.getPinnedViewContainers();
-        this.setPinnedViewContainers(( cachedViewContainers.map(({ id, pinned, order }) => ({
+        this.setPinnedViewContainers(( (cachedViewContainers.map(({ id, pinned, order }) => ({
             id,
             pinned,
             visible: pinnedViewContainers.find(({ id: pinnedId }) => pinnedId === id)?.visible,
             order
-        }))));
-        this.setPlaceholderViewContainers(( cachedViewContainers.map(({ id, icon, name, views, isBuiltin }) => ({
+        })))));
+        this.setPlaceholderViewContainers(( (cachedViewContainers.map(({ id, icon, name, views, isBuiltin }) => ({
             id,
             iconUrl: URI.isUri(icon) ? icon : undefined,
             themeIcon: ThemeIcon.isThemeIcon(icon) ? icon : undefined,
             name,
             isBuiltin,
             views
-        }))));
-        this.setViewContainersWorkspaceState(( cachedViewContainers.map(({ id, visible }) => ({
+        })))));
+        this.setViewContainersWorkspaceState(( (cachedViewContainers.map(({ id, visible }) => ({
             id,
             visible,
-        }))));
+        })))));
     }
     getPinnedViewContainers() {
         return JSON.parse(this.pinnedViewContainersValue);
@@ -543,15 +540,15 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.storageService.store(this.options.viewContainersWorkspaceStateKey, value, 1 , 1 );
     }
 };
-PaneCompositeBar = ( __decorate([
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, IExtensionService)),
-    ( __param(6, IViewDescriptorService)),
-    ( __param(7, IContextKeyService)),
-    ( __param(8, IWorkbenchEnvironmentService)),
-    ( __param(9, IWorkbenchLayoutService))
-], PaneCompositeBar));
+PaneCompositeBar = ( (__decorate([
+    ( (__param(3, IInstantiationService))),
+    ( (__param(4, IStorageService))),
+    ( (__param(5, IExtensionService))),
+    ( (__param(6, IViewDescriptorService))),
+    ( (__param(7, IContextKeyService))),
+    ( (__param(8, IWorkbenchEnvironmentService))),
+    ( (__param(9, IWorkbenchLayoutService)))
+], PaneCompositeBar)));
 let ViewContainerActivityAction = class ViewContainerActivityAction extends CompositeBarAction {
     static { ViewContainerActivityAction_1 = this; }
     static { this.preventDoubleClickDelay = 300; }
@@ -615,12 +612,12 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Comp
         this.telemetryService.publicLog2('activityBarAction', { viewletId: this.compositeBarActionItem.id, action });
     }
 };
-ViewContainerActivityAction = ViewContainerActivityAction_1 = ( __decorate([
-    ( __param(3, IWorkbenchLayoutService)),
-    ( __param(4, ITelemetryService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IActivityService))
-], ViewContainerActivityAction));
+ViewContainerActivityAction = ViewContainerActivityAction_1 = ( (__decorate([
+    ( (__param(3, IWorkbenchLayoutService))),
+    ( (__param(4, ITelemetryService))),
+    ( (__param(5, IConfigurationService))),
+    ( (__param(6, IActivityService)))
+], ViewContainerActivityAction)));
 class PlaceHolderViewContainerActivityAction extends ViewContainerActivityAction {
 }
 class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinnedAction {