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

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

@@ -1,16 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
-import { GroupsOrder, GroupLocation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableMap, toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainEditorPart } from './editorPart.js';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { firstOrDefault, distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { AuxiliaryEditorPart } from './auxiliaryEditorPart.js';
 import { MultiWindowParts } from 'vscode/vscode/vs/workbench/browser/part';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
@@ -34,14 +31,14 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this.mapPartToInstantiationService = ( (new Map()));
         this._onDidCreateAuxiliaryEditorPart = this._register(( (new Emitter())));
         this.onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
-        this.workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
+        this.workspaceMemento = this.getMemento(1 , 0 );
         this._isReady = false;
         this.whenReadyPromise = ( (new DeferredPromise()));
         this.whenReady = this.whenReadyPromise.p;
         this.whenRestoredPromise = ( (new DeferredPromise()));
         this.whenRestored = this.whenRestoredPromise.p;
         this.editorWorkingSets = (() => {
-            const workingSetsRaw = this.storageService.get(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, StorageScope.WORKSPACE);
+            const workingSetsRaw = this.storageService.get(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, 1 );
             if (workingSetsRaw) {
                 return JSON.parse(workingSetsRaw);
             }
@@ -73,7 +70,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.onDidChangeMementoValue(StorageScope.WORKSPACE, this._store)(e => this.onDidChangeMementoState(e)));
+        this._register(this.onDidChangeMementoValue(1 , this._store)(e => this.onDidChangeMementoState(e)));
         this.whenReady.then(() => this.registerGroupsContextKeyListeners());
     }
     createMainEditorPart() {
@@ -140,7 +137,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return ( localize(3533, "Window {0}", index + 1));
+        return ( localize(3569, "Window {0}", index + 1));
     }
     getPart(groupOrElement) {
         if (this._parts.size > 1) {
@@ -176,7 +173,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
                 await this.restoreState(state);
             }
         }
-        const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+        const mostRecentActivePart = this.mostRecentActiveParts.at(0);
         mostRecentActivePart?.activeGroup.focus();
         this._isReady = true;
         this.whenReadyPromise.complete();
@@ -229,7 +226,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         );
     }
     onDidChangeMementoState(e) {
-        if (e.external && e.scope === StorageScope.WORKSPACE) {
+        if (e.external && e.scope === 1 ) {
             this.reloadMemento(e.scope);
             const state = this.loadState();
             if (state) {
@@ -242,7 +239,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             if (part === this.mainPart) {
                 continue;
             }
-            for (const group of part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
+            for (const group of part.getGroups(1 )) {
                 await group.closeAllEditors({ excludeConfirming: true });
             }
             const closed = part.close();
@@ -299,7 +296,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
         await this.mainPart.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.main, options);
         if (!options?.preserveFocus) {
-            const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+            const mostRecentActivePart = this.mostRecentActiveParts.at(0);
             if (mostRecentActivePart) {
                 await mostRecentActivePart.whenReady;
                 mostRecentActivePart.activeGroup.focus();
@@ -316,7 +313,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         return undefined;
     }
     saveWorkingSets() {
-        this.storageService.store(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, JSON.stringify(this.editorWorkingSets), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, JSON.stringify(this.editorWorkingSets), 1 , 1 );
     }
     get activeGroup() {
         return this.activePart.activeGroup;
@@ -330,15 +327,15 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     get count() {
         return this.groups.length;
     }
-    getGroups(order = GroupsOrder.CREATION_TIME) {
+    getGroups(order = 0 ) {
         if (this._parts.size > 1) {
             let parts;
             switch (order) {
-                case GroupsOrder.GRID_APPEARANCE:
-                case GroupsOrder.CREATION_TIME:
+                case 2 :
+                case 0 :
                     parts = this.parts;
                     break;
-                case GroupsOrder.MOST_RECENTLY_ACTIVE:
+                case 1 :
                     parts = distinct([...this.mostRecentActiveParts, ...this.parts]);
                     break;
             }
@@ -406,18 +403,18 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     findGroup(scope, source = this.activeGroup, wrap) {
         const sourcePart = this.getPart(source);
         if (this._parts.size > 1) {
-            const groups = this.getGroups(GroupsOrder.GRID_APPEARANCE);
-            if (scope.location === GroupLocation.FIRST || scope.location === GroupLocation.LAST) {
-                return scope.location === GroupLocation.FIRST ? groups[0] : groups[groups.length - 1];
+            const groups = this.getGroups(2 );
+            if (scope.location === 0  || scope.location === 1 ) {
+                return scope.location === 0  ? groups[0] : groups[groups.length - 1];
             }
             const group = sourcePart.findGroup(scope, source, false);
             if (group) {
                 return group;
             }
-            if (scope.location === GroupLocation.NEXT || scope.location === GroupLocation.PREVIOUS) {
+            if (scope.location === 2  || scope.location === 3 ) {
                 const sourceGroup = this.assertGroupView(source);
                 const index = groups.indexOf(sourceGroup);
-                if (scope.location === GroupLocation.NEXT) {
+                if (scope.location === 2 ) {
                     let nextGroup = groups[index + 1];
                     if (!nextGroup && wrap) {
                         nextGroup = groups[0];

package/vscode/src/vs/workbench/browser/parts/media/paneCompositePart.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .actions-container{justify-content:flex-end}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.global-actions .monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{margin-right:4px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item .action-label{outline-offset:-2px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-label{display:none}.monaco-workbench .pane-composite-part>.header-or-footer{background-color:var(--vscode-activityBarTop-background);padding-left:4px;padding-right:4px}.monaco-workbench .pane-composite-part>.header{border-bottom:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.footer{border-top:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container,.monaco-workbench .pane-composite-part>.title>.composite-bar-container{display:flex}.monaco-workbench .pane-composite-part>.header-or-footer .composite-bar-container{flex:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more{align-items:center;color:inherit!important;display:flex;justify-content:center;margin-left:0;margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar{height:35px;line-height:27px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item{display:flex;font-size:11px;padding:2px 10px;text-transform:uppercase}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon{height:35px;padding:0 3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon),.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon){height:16px;width:16px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{background-color:var(--insert-border-color);content:\"\";display:none;height:24px;opacity:0;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:opacity;width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{left:1px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after{margin-right:-2px;right:1px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{left:2px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{margin-right:-2px;right:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before{transition-delay:0s}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after{opacity:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;margin-right:0;padding:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label{background:none!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label{margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge{align-items:center;display:flex;margin-left:8px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge{margin-left:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content{border-radius:11px;box-sizing:border-box;display:inline-block;font-size:11px;font-weight:400;height:18px;line-height:11px;min-width:18px;padding:3px 5px;position:relative;text-align:center}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%;z-index:2}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content{border-radius:16px;font-size:9px;font-weight:600;height:13px;line-height:13px;min-width:13px;padding:0 2px;position:absolute;right:0;text-align:center;top:17px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content{font-size:8px;padding:0 3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before{left:1px;mask-size:11px;-webkit-mask-size:11px;top:3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator{bottom:0;height:100%;left:10px;overflow:hidden;pointer-events:none;position:absolute;top:-4px;width:calc(100% - 20px);z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator{left:2px;top:1px;width:calc(100% - 4px)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked{background-color:var(--vscode-activityBarTop-activeBackground)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-style:solid;border-top-width:1px;bottom:2px;content:\"\";height:0;position:absolute;width:100%;z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before{border-top-color:transparent!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-color:var(--vscode-focusBorder)!important;border-top-width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .pane-composite-part .empty-pane-message-area{display:none;height:100%;width:100%}.monaco-workbench .pane-composite-part .empty-pane-message-area.visible{align-content:center;align-items:center;display:flex;justify-content:center}.monaco-workbench .pane-composite-part .empty-pane-message-area .empty-pane-message{margin:12px;text-align:center}";
+var css = ".monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .actions-container{justify-content:flex-end}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.global-actions .monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{margin-right:4px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item .action-label{outline-offset:-2px}.monaco-workbench .pane-composite-part>.title.has-composite-bar>.title-label{display:none}.monaco-workbench .pane-composite-part>.header-or-footer{background-color:var(--vscode-activityBarTop-background);padding-left:4px;padding-right:4px}.monaco-workbench .pane-composite-part>.header{border-bottom:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.footer{border-top:1px solid var(--vscode-sideBarActivityBarTop-border)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container,.monaco-workbench .pane-composite-part>.title>.composite-bar-container{display:flex}.monaco-workbench .pane-composite-part>.header-or-footer .composite-bar-container{flex:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-label.codicon-more{align-items:center;color:inherit!important;display:flex;justify-content:center;margin-left:0;margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar{height:35px;line-height:27px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item{display:flex;font-size:11px;padding:2px 10px;text-transform:uppercase}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon{height:35px;padding:0 3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon),.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label:not(.codicon){height:16px;width:16px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{background-color:var(--insert-border-color);content:\"\";display:none;height:24px;opacity:0;position:absolute;transition-delay:.1s;transition-duration:0ms;transition-property:opacity;width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over>.composite-bar>.monaco-action-bar .action-item:before{display:block}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{left:1px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:after{margin-right:-2px;right:1px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:first-of-type:before{left:2px;margin-left:-2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type:after{margin-right:-2px;right:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right:before{transition-delay:0s}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-head>.composite-bar>.monaco-action-bar .action-item:first-of-type:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container.dragged-over-tail>.composite-bar>.monaco-action-bar .action-item:last-of-type:after,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.left:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.right+.action-item:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:last-of-type.right:after{opacity:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;margin-right:0;padding:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .action-label.codicon,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.icon) .action-label{background:none!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label{margin-right:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge{align-items:center;display:flex;margin-left:8px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge{margin-left:0}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .badge .badge-content{border-radius:11px;box-sizing:border-box;display:inline-block;font-size:11px;font-weight:400;height:18px;line-height:11px;min-width:18px;padding:3px 5px;position:relative;text-align:center}.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .icon-badge .badge-content{padding:3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact{bottom:0;height:100%;left:0;margin:auto;overflow:hidden;position:absolute;top:0;width:100%;z-index:2}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact .badge-content{border-radius:16px;font-size:9px;font-weight:600;height:13px;line-height:13px;min-width:13px;padding:0 2px;position:absolute;right:0;text-align:center;top:17px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.compact-content .badge-content{font-size:8px;padding:0 3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge.compact.progress-badge .badge-content:before{left:1px;mask-size:11px;-webkit-mask-size:11px;top:3px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .active-item-indicator{bottom:0;height:100%;left:10px;overflow:hidden;pointer-events:none;position:absolute;top:-4px;width:calc(100% - 20px);z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .active-item-indicator{left:2px;top:1px;width:calc(100% - 4px)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon.checked{background-color:var(--vscode-activityBarTop-activeBackground)}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-style:solid;border-top-width:1px;bottom:2px;content:\"\";height:0;position:absolute;width:100%;z-index:1}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before{border-top-color:transparent!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-color:var(--vscode-focusBorder)!important;border-top-width:2px}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .pane-composite-part>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .pane-composite-part .empty-pane-message-area{display:none;height:100%;width:100%}.monaco-workbench .pane-composite-part .empty-pane-message-area.visible{align-content:center;align-items:center;display:flex;justify-content:center}.monaco-workbench .pane-composite-part .empty-pane-message-area .empty-pane-message{margin:12px;text-align:center}";
 n(css,{});
 
 export { css, css as default };

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

@@ -1,19 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
-import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
-import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CompositeDragAndDrop, CompositeBar } from './compositeBar.js';
 import { asCSSUrl, createCSSRule, Dimension, isMouseEvent } from 'vscode/vscode/vs/base/browser/dom';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ToggleCompositePinnedAction, ToggleCompositeBadgeAction, CompositeBarAction } from 'vscode/vscode/vs/workbench/browser/parts/compositeBarActions';
-import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -25,10 +21,11 @@ import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { StringSHA1 } from 'vscode/vscode/vs/base/common/hash';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 var ViewContainerActivityAction_1;
 let PaneCompositeBar = class PaneCompositeBar extends Disposable {
-    constructor(options, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, contextKeyService, environmentService, layoutService) {
+    constructor(options, part, paneCompositePart, instantiationService, storageService, extensionService, viewDescriptorService, viewService, contextKeyService, environmentService, layoutService) {
         super();
         this.options = options;
         this.part = part;
@@ -37,6 +34,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.storageService = storageService;
         this.extensionService = extensionService;
         this.viewDescriptorService = viewDescriptorService;
+        this.viewService = viewService;
         this.contextKeyService = contextKeyService;
         this.environmentService = environmentService;
         this.layoutService = layoutService;
@@ -44,15 +42,15 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         this.compositeActions = ( (new Map()));
         this.hasExtensionsRegistered = false;
         this._cachedViewContainers = undefined;
-        this.location = paneCompositePart.partId === Parts.PANEL_PART
-            ? ViewContainerLocation.Panel : paneCompositePart.partId === Parts.AUXILIARYBAR_PART
-            ? ViewContainerLocation.AuxiliaryBar : ViewContainerLocation.Sidebar;
+        this.location = paneCompositePart.partId === "workbench.parts.panel"
+            ? 1  : paneCompositePart.partId === "workbench.parts.auxiliarybar"
+            ? 2  : 0 ;
         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 === ActionsOrientation.VERTICAL ? before?.verticallyBefore : before?.horizontallyBefore),
+            (from, to, before) => this.compositeBar.move(from, to, this.options.orientation === 1  ? before?.verticallyBefore : before?.horizontallyBefore),
             () => this.compositeBar.getCompositeBarItems()
         )));
         const cachedItems = ( (this.cachedViewContainers
@@ -95,7 +93,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: ( localize(9335, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
+            actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9409, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
         }
         else {
             const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
@@ -103,7 +101,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: ( localize(9335, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
+                    actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9409, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
                 }
             }
         }
@@ -119,8 +117,11 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 return;
             }
             this.onDidRegisterExtensions();
-            this._register(this.compositeBar.onDidChange(() => this.saveCachedViewContainers()));
-            this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, this.options.pinnedViewContainersKey, this._store)(e => this.onDidPinnedViewContainersStorageValueChange(e)));
+            this._register(this.compositeBar.onDidChange(() => {
+                this.updateCompositeBarItemsFromStorage(true);
+                this.saveCachedViewContainers();
+            }));
+            this._register(this.storageService.onDidChangeValue(0 , this.options.pinnedViewContainersKey, this._store)(() => this.updateCompositeBarItemsFromStorage(false)));
         });
     }
     onDidChangeViewContainers(added, removed) {
@@ -280,7 +281,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         const viewContainerId = isString(viewContainerOrId) ? viewContainerOrId : viewContainerOrId.id;
         if (viewContainer) {
             if (viewContainer.hideIfEmpty) {
-                if (this.viewDescriptorService.getViewContainerModel(viewContainer).activeViewDescriptors.length > 0) {
+                if (this.viewService.isViewContainerActive(viewContainerId)) {
                     return false;
                 }
             }
@@ -288,7 +289,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 return false;
             }
         }
-        if (!this.hasExtensionsRegistered && !(this.part === Parts.SIDEBAR_PART && this.environmentService.remoteAuthority && isNative)) {
+        if (!this.hasExtensionsRegistered && !(this.part === "workbench.parts.sidebar"  && this.environmentService.remoteAuthority && isNative)) {
             cachedViewContainer = cachedViewContainer || this.cachedViewContainers.find(({ id }) => id === viewContainerId);
             if (!viewContainer && cachedViewContainer?.isBuiltin && cachedViewContainer?.visible) {
                 return false;
@@ -352,48 +353,57 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
     getViewContainers() {
         return this.viewDescriptorService.getViewContainersByLocation(this.location);
     }
-    onDidPinnedViewContainersStorageValueChange(e) {
-        if (this.pinnedViewContainersValue !== this.getStoredPinnedViewContainersValue() ) {
-            this._placeholderViewContainersValue = undefined;
-            this._pinnedViewContainersValue = undefined;
-            this._cachedViewContainers = undefined;
-            const newCompositeItems = [];
-            const compositeItems = this.compositeBar.getCompositeBarItems();
-            for (const cachedViewContainer of this.cachedViewContainers) {
-                newCompositeItems.push({
-                    id: cachedViewContainer.id,
-                    name: cachedViewContainer.name,
-                    order: cachedViewContainer.order,
-                    pinned: cachedViewContainer.pinned,
-                    visible: cachedViewContainer.visible && !!this.getViewContainer(cachedViewContainer.id),
-                });
+    updateCompositeBarItemsFromStorage(retainExisting) {
+        if (this.pinnedViewContainersValue === this.getStoredPinnedViewContainersValue()) {
+            return;
+        }
+        this._placeholderViewContainersValue = undefined;
+        this._pinnedViewContainersValue = undefined;
+        this._cachedViewContainers = undefined;
+        const newCompositeItems = [];
+        const compositeItems = this.compositeBar.getCompositeBarItems();
+        for (const cachedViewContainer of this.cachedViewContainers) {
+            newCompositeItems.push({
+                id: cachedViewContainer.id,
+                name: cachedViewContainer.name,
+                order: cachedViewContainer.order,
+                pinned: cachedViewContainer.pinned,
+                visible: cachedViewContainer.visible && !!this.getViewContainer(cachedViewContainer.id),
+            });
+        }
+        for (const viewContainer of this.getViewContainers()) {
+            if (!( (newCompositeItems.some(({ id }) => id === viewContainer.id)))) {
+                const index = compositeItems.findIndex(({ id }) => id === viewContainer.id);
+                if (index !== -1) {
+                    const compositeItem = compositeItems[index];
+                    newCompositeItems.splice(index, 0, {
+                        id: viewContainer.id,
+                        name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
+                        order: compositeItem.order,
+                        pinned: compositeItem.pinned,
+                        visible: compositeItem.visible,
+                    });
+                }
+                else {
+                    newCompositeItems.push({
+                        id: viewContainer.id,
+                        name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
+                        order: viewContainer.order,
+                        pinned: true,
+                        visible: !this.shouldBeHidden(viewContainer),
+                    });
+                }
             }
-            for (const viewContainer of this.getViewContainers()) {
-                if (!( (newCompositeItems.some(({ id }) => id === viewContainer.id)))) {
-                    const index = compositeItems.findIndex(({ id }) => id === viewContainer.id);
-                    if (index !== -1) {
-                        const compositeItem = compositeItems[index];
-                        newCompositeItems.splice(index, 0, {
-                            id: viewContainer.id,
-                            name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
-                            order: compositeItem.order,
-                            pinned: compositeItem.pinned,
-                            visible: compositeItem.visible,
-                        });
-                    }
-                    else {
-                        newCompositeItems.push({
-                            id: viewContainer.id,
-                            name: typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value,
-                            order: viewContainer.order,
-                            pinned: true,
-                            visible: !this.shouldBeHidden(viewContainer),
-                        });
-                    }
+        }
+        if (retainExisting) {
+            for (const compositeItem of compositeItems) {
+                const newCompositeItem = newCompositeItems.find(({ id }) => id === compositeItem.id);
+                if (!newCompositeItem) {
+                    newCompositeItems.push(compositeItem);
                 }
             }
-            this.compositeBar.setCompositeBarItems(newCompositeItems);
         }
+        this.compositeBar.setCompositeBarItems(newCompositeItems);
     }
     saveCachedViewContainers() {
         const state = [];
@@ -489,10 +499,10 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getStoredPinnedViewContainersValue() {
-        return this.storageService.get(this.options.pinnedViewContainersKey, StorageScope.PROFILE, '[]');
+        return this.storageService.get(this.options.pinnedViewContainersKey, 0 , '[]');
     }
     setStoredPinnedViewContainersValue(value) {
-        this.storageService.store(this.options.pinnedViewContainersKey, value, StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(this.options.pinnedViewContainersKey, value, 0 , 0 );
     }
     getPlaceholderViewContainers() {
         return JSON.parse(this.placeholderViewContainersValue);
@@ -513,10 +523,10 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getStoredPlaceholderViewContainersValue() {
-        return this.storageService.get(this.options.placeholderViewContainersKey, StorageScope.PROFILE, '[]');
+        return this.storageService.get(this.options.placeholderViewContainersKey, 0 , '[]');
     }
     setStoredPlaceholderViewContainersValue(value) {
-        this.storageService.store(this.options.placeholderViewContainersKey, value, StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.storageService.store(this.options.placeholderViewContainersKey, value, 0 , 1 );
     }
     getViewContainersWorkspaceState() {
         return JSON.parse(this.viewContainersWorkspaceStateValue);
@@ -537,10 +547,10 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         }
     }
     getStoredViewContainersWorkspaceStateValue() {
-        return this.storageService.get(this.options.viewContainersWorkspaceStateKey, StorageScope.WORKSPACE, '[]');
+        return this.storageService.get(this.options.viewContainersWorkspaceStateKey, 1 , '[]');
     }
     setStoredViewContainersWorkspaceStateValue(value) {
-        this.storageService.store(this.options.viewContainersWorkspaceStateKey, value, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store(this.options.viewContainersWorkspaceStateKey, value, 1 , 1 );
     }
 };
 PaneCompositeBar = ( (__decorate([
@@ -548,9 +558,10 @@ PaneCompositeBar = ( (__decorate([
     ( (__param(4, IStorageService))),
     ( (__param(5, IExtensionService))),
     ( (__param(6, IViewDescriptorService))),
-    ( (__param(7, IContextKeyService))),
-    ( (__param(8, IWorkbenchEnvironmentService))),
-    ( (__param(9, IWorkbenchLayoutService)))
+    ( (__param(7, IViewsService))),
+    ( (__param(8, IContextKeyService))),
+    ( (__param(9, IWorkbenchEnvironmentService))),
+    ( (__param(10, IWorkbenchLayoutService)))
 ], PaneCompositeBar)));
 let ViewContainerActivityAction = class ViewContainerActivityAction extends CompositeBarAction {
     static { ViewContainerActivityAction_1 = this; }
@@ -588,8 +599,8 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Comp
         }
         this.lastRun = now;
         const focus = (event && 'preserveFocus' in event) ? !event.preserveFocus : true;
-        if (this.part === Parts.ACTIVITYBAR_PART) {
-            const sideBarVisible = this.layoutService.isVisible(Parts.SIDEBAR_PART);
+        if (this.part === "workbench.parts.activitybar" ) {
+            const sideBarVisible = this.layoutService.isVisible("workbench.parts.sidebar" );
             const activeViewlet = this.paneCompositePart.getActivePaneComposite();
             const focusBehavior = this.configurationService.getValue('workbench.activityBar.iconClickBehavior');
             if (sideBarVisible && activeViewlet?.getId() === this.compositeBarActionItem.id) {
@@ -601,7 +612,7 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Comp
                     case 'toggle':
                     default:
                         this.logAction('hide');
-                        this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
+                        this.layoutService.setPartHidden(true, "workbench.parts.sidebar" );
                         break;
                 }
                 return;