@codingame/monaco-vscode-views-service-override 2.0.3 → 2.1.0

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
-import { getWindow, isAncestor, addDisposableGenericMouseDownListener, EventHelper, Dimension, $ } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindow, getActiveElement, isAncestorOfActiveElement, addDisposableGenericMouseDownListener, EventHelper, Dimension, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, Relay, Event } from 'vscode/vscode/vs/base/common/event';
 import { contrastBorder, editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { isGridBranchNode, createSerializedGrid, Sizing, SerializableGrid } from '../../../../base/browser/ui/grid/grid.js';
 import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { coalesce, distinct, firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
+import { coalesce, distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { getEditorPartOptions, impactsEditorPartOptions } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
-import { EditorGroupView } from './editorGroupView.js';
+import { EditorGroupView } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorGroupView';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -28,6 +28,7 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IsAuxiliaryEditorPartContext, EditorPartMultipleEditorGroupsContext, EditorPartMaximizedEditorGroupContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { orthogonal } from '../../../../base/browser/ui/grid/gridview.js';
 
 var EditorPart_1;
@@ -66,11 +67,11 @@ let EditorPart = class EditorPart extends Part {
     static { EditorPart_1 = this; }
     static { this.EDITOR_PART_UI_STATE_STORAGE_KEY = 'editorpart.state'; }
     static { this.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY = 'editorpart.centeredview'; }
-    constructor(editorPartsView, id, groupsLabel, isAuxiliary, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService) {
+    constructor(editorPartsView, id, groupsLabel, windowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService) {
         super(id, { hasTitle: false }, themeService, storageService, layoutService);
         this.editorPartsView = editorPartsView;
         this.groupsLabel = groupsLabel;
-        this.isAuxiliary = isAuxiliary;
+        this.windowId = windowId;
         this.instantiationService = instantiationService;
         this.configurationService = configurationService;
         this.hostService = hostService;
@@ -104,7 +105,7 @@ let EditorPart = class EditorPart extends Part {
         this.onDidScroll = Event.any(this.onDidSetGridWidget.event, this._onDidScroll.event);
         this._onDidChangeEditorPartOptions = this._register(( new Emitter()));
         this.onDidChangeEditorPartOptions = this._onDidChangeEditorPartOptions.event;
-        this.workspaceMemento = this.getMemento(1 , 1 );
+        this.workspaceMemento = this.getMemento(1 , 0 );
         this.profileMemento = this.getMemento(0 , 1 );
         this.groupViews = ( new Map());
         this.mostRecentActiveGroups = [];
@@ -125,12 +126,14 @@ let EditorPart = class EditorPart extends Part {
         this.whenReady = this.whenReadyPromise.p;
         this.whenRestoredPromise = ( new DeferredPromise());
         this.whenRestored = this.whenRestoredPromise.p;
+        this._willRestoreState = false;
         this.priority = 2 ;
         this.registerListeners();
     }
     registerListeners() {
         this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e)));
         this._register(this.themeService.onDidFileIconThemeChange(() => this.handleChangedPartOptions()));
+        this._register(this.onDidChangeMementoValue(1 , this._store)(e => this.onDidChangeMementoState(e)));
     }
     onConfigurationUpdated(event) {
         if (impactsEditorPartOptions(event)) {
@@ -172,6 +175,7 @@ let EditorPart = class EditorPart extends Part {
     get hasRestorableState() {
         return !!this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
     }
+    get willRestoreState() { return this._willRestoreState; }
     getGroups(order = 0 ) {
         switch (order) {
             case 0 :
@@ -358,15 +362,7 @@ let EditorPart = class EditorPart extends Part {
             ),
             groups: layout.groups
         });
-        this.doCreateGridControlWithState(gridDescriptor, activeGroup.id, currentGroupViews);
-        this.doLayout(this._contentDimension);
-        this.updateContainer();
-        for (const groupView of this.getGroups(2 )) {
-            if (!currentGroupViews.includes(groupView)) {
-                this._onDidAddGroup.fire(groupView);
-            }
-        }
-        this.notifyGroupIndexChange();
+        this.doApplyGridState(gridDescriptor, activeGroup.id, currentGroupViews);
         if (restoreFocus) {
             this._activeGroup.focus();
         }
@@ -393,11 +389,11 @@ let EditorPart = class EditorPart extends Part {
         if (!target) {
             return false;
         }
-        const activeElement = target.ownerDocument.activeElement;
+        const activeElement = getActiveElement();
         if (activeElement === target.ownerDocument.body) {
             return true;
         }
-        return isAncestor(activeElement, target);
+        return isAncestorOfActiveElement(target);
     }
     isTwoDimensionalGrid() {
         const views = this.gridWidget.getViews();
@@ -494,15 +490,20 @@ let EditorPart = class EditorPart extends Part {
         this._onDidActivateGroup.fire(group);
     }
     doRestoreGroup(group) {
-        if (this.gridWidget) {
-            if (this.hasMaximizedGroup() && !this.isGroupMaximized(group)) {
-                this.unmaximizeGroup();
-            }
+        if (!this.gridWidget) {
+            return;
+        }
+        if (this.hasMaximizedGroup() && !this.isGroupMaximized(group)) {
+            this.unmaximizeGroup();
+        }
+        try {
             const viewSize = this.gridWidget.getViewSize(group);
             if (viewSize.width === group.minimumWidth || viewSize.height === group.minimumHeight) {
                 this.arrangeGroups(1 , group);
             }
         }
+        catch (error) {
+        }
     }
     doUpdateMostRecentActive(group, makeMostRecentlyActive) {
         const index = this.mostRecentActiveGroups.indexOf(group.id);
@@ -564,9 +565,6 @@ let EditorPart = class EditorPart extends Part {
         }
         this.notifyGroupIndexChange();
         this.updateContainer();
-        if (this.count === 1 && !this.isAuxiliary) {
-            firstOrDefault(this.groups)?.lock(false);
-        }
         this._onDidRemoveGroup.fire(groupView);
     }
     moveGroup(group, location, direction) {
@@ -673,13 +671,14 @@ let EditorPart = class EditorPart extends Part {
         this.element = parent;
         this.container = document.createElement('div');
         this.container.classList.add('content');
-        if (this.isAuxiliary) {
+        if (this.windowId !== mainWindow.vscodeWindowId) {
             this.container.classList.add('auxiliary');
         }
         parent.appendChild(this.container);
         const scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.container));
         this.scopedInstantiationService = this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, scopedContextKeyService])));
-        this.doCreateGridControl(options);
+        this._willRestoreState = !options || options.restorePreviousState;
+        this.doCreateGridControl();
         this.centeredLayoutWidget = this._register(( new CenteredViewLayout(
             this.container,
             this.gridWidgetView,
@@ -698,7 +697,7 @@ let EditorPart = class EditorPart extends Part {
     }
     handleContextKeys(contextKeyService) {
         const isAuxiliaryEditorPartContext = IsAuxiliaryEditorPartContext.bindTo(contextKeyService);
-        isAuxiliaryEditorPartContext.set(this.isAuxiliary);
+        isAuxiliaryEditorPartContext.set(this.windowId !== mainWindow.vscodeWindowId);
         const multipleEditorGroupsContext = EditorPartMultipleEditorGroupsContext.bindTo(contextKeyService);
         const maximizedEditorGroupContext = EditorPartMaximizedEditorGroupContext.bindTo(contextKeyService);
         const updateContextKeys = () => {
@@ -795,9 +794,6 @@ let EditorPart = class EditorPart extends Part {
         }));
     }
     centerLayout(active) {
-        if (this.hasMaximizedGroup()) {
-            this.unmaximizeGroup();
-        }
         this.centeredLayoutWidget.activate(active);
         this._activeGroup.focus();
     }
@@ -807,9 +803,9 @@ let EditorPart = class EditorPart extends Part {
         }
         return false;
     }
-    doCreateGridControl(options) {
+    doCreateGridControl() {
         let restoreError = false;
-        if (!options || options.restorePreviousState) {
+        if (this._willRestoreState) {
             restoreError = !this.doCreateGridControlWithPreviousState();
         }
         if (!this.gridWidget || restoreError) {
@@ -821,16 +817,15 @@ let EditorPart = class EditorPart extends Part {
         this.notifyGroupIndexChange();
     }
     doCreateGridControlWithPreviousState() {
-        const uiState = this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
-        if (uiState?.serializedGrid) {
+        const state = this.loadState();
+        if (state?.serializedGrid) {
             try {
-                this.mostRecentActiveGroups = uiState.mostRecentActiveGroups;
-                this.doCreateGridControlWithState(uiState.serializedGrid, uiState.activeGroup);
-                this._activeGroup.focus();
+                this.mostRecentActiveGroups = state.mostRecentActiveGroups;
+                this.doCreateGridControlWithState(state.serializedGrid, state.activeGroup);
             }
             catch (error) {
                 onUnexpectedError(( new Error(
-                    `Error restoring editor grid widget: ${error} (with state: ${JSON.stringify(uiState)})`
+                    `Error restoring editor grid widget: ${error} (with state: ${JSON.stringify(state)})`
                 )));
                 this.disposeGroups();
                 return false;
@@ -919,16 +914,11 @@ let EditorPart = class EditorPart extends Part {
     }
     saveState() {
         if (this.gridWidget) {
-            const uiState = {
-                serializedGrid: this.gridWidget.serialize(),
-                activeGroup: this._activeGroup.id,
-                mostRecentActiveGroups: this.mostRecentActiveGroups
-            };
             if (this.isEmpty) {
                 delete this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
             }
             else {
-                this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY] = uiState;
+                this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY] = this.createState();
             }
         }
         if (this.centeredLayoutWidget) {
@@ -942,6 +932,48 @@ let EditorPart = class EditorPart extends Part {
         }
         super.saveState();
     }
+    loadState() {
+        return this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
+    }
+    createState() {
+        return {
+            serializedGrid: this.gridWidget.serialize(),
+            activeGroup: this._activeGroup.id,
+            mostRecentActiveGroups: this.mostRecentActiveGroups
+        };
+    }
+    async applyState(state) {
+        for (const group of this.getGroups(1 )) {
+            const closed = await group.closeAllEditors();
+            if (!closed) {
+                return false;
+            }
+        }
+        this.disposeGroups();
+        this.mostRecentActiveGroups = state.mostRecentActiveGroups;
+        this.doApplyGridState(state.serializedGrid, state.activeGroup);
+        return true;
+    }
+    doApplyGridState(gridState, activeGroupId, editorGroupViewsToReuse) {
+        this.doCreateGridControlWithState(gridState, activeGroupId, editorGroupViewsToReuse);
+        this.doLayout(this._contentDimension);
+        this.updateContainer();
+        for (const groupView of this.getGroups(2 )) {
+            if (!editorGroupViewsToReuse?.includes(groupView)) {
+                this._onDidAddGroup.fire(groupView);
+            }
+        }
+        this.notifyGroupIndexChange();
+    }
+    onDidChangeMementoState(e) {
+        if (e.external && e.scope === 1 ) {
+            this.reloadMemento(e.scope);
+            const state = this.loadState();
+            if (state) {
+                this.applyState(state);
+            }
+        }
+    }
     toJSON() {
         return {
             type: "workbench.parts.editor"
@@ -972,7 +1004,7 @@ EditorPart = EditorPart_1 = ( __decorate([
 ], EditorPart));
 let MainEditorPart = class MainEditorPart extends EditorPart {
     constructor(editorPartsView, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService) {
-        super(editorPartsView, "workbench.parts.editor" , '', false, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
+        super(editorPartsView, "workbench.parts.editor" , '', mainWindow.vscodeWindowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
     }
 };
 MainEditorPart = ( __decorate([

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

@@ -4,18 +4,31 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MainEditorPart } from './editorPart.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { firstOrDefault, 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 { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { getWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { getZoomLevel } from 'vscode/vscode/vs/base/browser/browser';
 
+var EditorParts_1;
 let EditorParts = class EditorParts extends MultiWindowParts {
-    constructor(instantiationService) {
-        super();
+    static { EditorParts_1 = this; }
+    constructor(instantiationService, storageService, themeService) {
+        super('workbench.editorParts', themeService, storageService);
         this.instantiationService = instantiationService;
         this.mainPart = this._register(this.createMainEditorPart());
         this.mostRecentActiveParts = [this.mainPart];
         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.whenReady = this.whenReadyPromise.p;
+        this.whenRestoredPromise = ( new DeferredPromise());
+        this.whenRestored = this.whenRestoredPromise.p;
         this._onDidActiveGroupChange = this._register(( new Emitter()));
         this.onDidChangeActiveGroup = this._onDidActiveGroupChange.event;
         this._onDidAddGroup = this._register(( new Emitter()));
@@ -33,6 +46,11 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         this._onDidChangeGroupMaximized = this._register(( new Emitter()));
         this.onDidChangeGroupMaximized = this._onDidChangeGroupMaximized.event;
         this._register(this.registerPart(this.mainPart));
+        this.restoreParts();
+        this.registerListeners();
+    }
+    registerListeners() {
+        this._register(this.onDidChangeMementoValue(1 , this._store)(e => this.onDidChangeMementoState(e)));
     }
     createMainEditorPart() {
         return this.instantiationService.createInstance(MainEditorPart, this);
@@ -117,6 +135,112 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
         return this.mainPart;
     }
+    static { this.EDITOR_PARTS_UI_STATE_STORAGE_KEY = 'editorparts.state'; }
+    get isReady() { return this._isReady; }
+    async restoreParts() {
+        await this.mainPart.whenReady;
+        if (this.mainPart.willRestoreState) {
+            const state = this.loadState();
+            if (state) {
+                await this.restoreState(state);
+            }
+        }
+        const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+        mostRecentActivePart?.activeGroup.focus();
+        this._isReady = true;
+        this.whenReadyPromise.complete();
+        await Promise.allSettled(( this.parts.map(part => part.whenRestored)));
+        this.whenRestoredPromise.complete();
+    }
+    loadState() {
+        return this.workspaceMemento[EditorParts_1.EDITOR_PARTS_UI_STATE_STORAGE_KEY];
+    }
+    saveState() {
+        const state = this.createState();
+        if (state.auxiliary.length === 0) {
+            delete this.workspaceMemento[EditorParts_1.EDITOR_PARTS_UI_STATE_STORAGE_KEY];
+        }
+        else {
+            this.workspaceMemento[EditorParts_1.EDITOR_PARTS_UI_STATE_STORAGE_KEY] = state;
+        }
+    }
+    createState() {
+        return {
+            auxiliary: ( this.parts.filter(part => part !== this.mainPart).map(part => {
+                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;
+                    })()
+                };
+            })),
+            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
+                }));
+            }
+            await Promise.allSettled(auxiliaryEditorPartPromises);
+            if (state.mru.length === this.parts.length) {
+                this.mostRecentActiveParts = ( state.mru.map(index => this.parts[index]));
+            }
+            else {
+                this.mostRecentActiveParts = [...this.parts];
+            }
+            await Promise.allSettled(( this.parts.map(part => part.whenReady)));
+        }
+    }
+    get hasRestorableState() {
+        return ( this.parts.some(part => part.hasRestorableState));
+    }
+    onDidChangeMementoState(e) {
+        if (e.external && e.scope === 1 ) {
+            this.reloadMemento(e.scope);
+            const state = this.loadState();
+            if (state) {
+                this.applyState(state);
+            }
+        }
+    }
+    async applyState(state) {
+        for (const part of this.parts) {
+            if (part === this.mainPart) {
+                continue;
+            }
+            for (const group of part.getGroups(1 )) {
+                const closed = await group.closeAllEditors();
+                if (!closed) {
+                    return false;
+                }
+            }
+            part.close();
+        }
+        await this.restoreState(state);
+        return true;
+    }
     get activeGroup() {
         return this.activePart.activeGroup;
     }
@@ -258,8 +382,10 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     get partOptions() { return this.mainPart.partOptions; }
     get onDidChangeEditorPartOptions() { return this.mainPart.onDidChangeEditorPartOptions; }
 };
-EditorParts = ( __decorate([
-    ( __param(0, IInstantiationService))
+EditorParts = EditorParts_1 = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IStorageService)),
+    ( __param(2, IThemeService))
 ], EditorParts));
 
 export { EditorParts };

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

@@ -1,6 +1,6 @@
 import n from '../../../../../../../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>.title>.composite-bar-container{display:flex}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar{height:35px;line-height:27px}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon{height:24px;padding:0 5px}.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar .monaco-action-bar .action-label.codicon{font-size:18px}.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>.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>.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{left:1px;margin-left:-2px}.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>.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>.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>.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>.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>.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>.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label{margin-right:0}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge{margin-left:0}.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 .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>.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:11px}.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>.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>.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>.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:0;content:\"\";height:0;position:absolute;width:100%;z-index:1}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-color:var(--vscode-focusBorder)!important}.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.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>.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{padding-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>.title>.composite-bar-container{display:flex}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar{height:35px;line-height:27px}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon{height:24px;padding:0 5px}.monaco-workbench .pane-composite-part>.title>.composite-bar-container>.composite-bar .monaco-action-bar .action-label.codicon{font-size:18px}.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>.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>.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:before{left:1px;margin-left:-2px}.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>.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>.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>.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>.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>.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>.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label{margin-right:0}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.icon .badge{margin-left:0}.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 .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>.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:11px}.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>.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>.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>.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:0;content:\"\";height:0;position:absolute;width:100%;z-index:1}.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>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .active-item-indicator:before{border-top-color:var(--vscode-focusBorder)!important}.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>.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

@@ -367,7 +367,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                     name: cachedViewContainer.name,
                     order: cachedViewContainer.order,
                     pinned: cachedViewContainer.pinned,
-                    visible: cachedViewContainer.visible,
+                    visible: cachedViewContainer.visible && !!this.getViewContainer(cachedViewContainer.id),
                 });
             }
             for (const viewContainer of this.getViewContainers()) {

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

@@ -308,7 +308,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         }
     }
     layoutEmptyMessage() {
-        this.emptyPaneMessageElement?.classList.toggle('visible', !!this.paneCompositeBar.value && this.paneCompositeBar.value.getVisiblePaneCompositeIds().length === 0);
+        this.emptyPaneMessageElement?.classList.toggle('visible', !this.getActiveComposite());
     }
     updateGlobalToolbarActions() {
         const primaryActions = this.globalActions.getPrimaryActions();
@@ -320,7 +320,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         if (!activePane || !this.toolBar) {
             return 0;
         }
-        return this.toolBar.getItemsWidth() + (this.globalToolBar?.getItemsWidth() ?? 0);
+        return this.toolBar.getItemsWidth() + 5 + (this.globalToolBar?.getItemsWidth() ?? 0);
     }
     onTitleAreaContextMenu(event) {
         if (this.shouldShowCompositeBar() && this.paneCompositeBar.value) {

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

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench.nosidebar>.part.sidebar{display:none!important;visibility:hidden!important}.monaco-workbench .part.sidebar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.sidebar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.sidebar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .viewlet .collapsible.header .title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .viewlet .collapsible.header .actions{width:0}.monaco-workbench .viewlet .collapsible.header.focused .actions,.monaco-workbench .viewlet .split-view-view:hover>.header .actions{flex:1;width:auto}.monaco-workbench .viewlet .collapsible.header .actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;height:22px;margin-right:0;width:28px}.monaco-workbench .viewlet .collapsible.header .actions .action-label .label,.monaco-workbench .viewlet .collapsible.header.collapsed .actions{display:none}.monaco-workbench .viewlet .collapsible.header .action-label{background-repeat:no-repeat;height:16px;margin-right:.2em;width:16px}.monaco-workbench .sidebar.pane-composite-part>.title>.composite-bar-container{flex:1}.monaco-workbench .sidebar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .sidebar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
+var css = ".monaco-workbench.nosidebar>.part.sidebar{display:none!important;visibility:hidden!important}.monaco-workbench .part.sidebar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.sidebar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.sidebar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .viewlet .collapsible.header .title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .viewlet .collapsible.header .actions{width:0}.monaco-workbench .viewlet .collapsible.header.focused .actions,.monaco-workbench .viewlet .split-view-view:hover>.header .actions{flex:1;width:auto}.monaco-workbench .viewlet .collapsible.header .actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;height:22px;margin-right:0;width:28px}.monaco-workbench .viewlet .collapsible.header .actions .action-label .label,.monaco-workbench .viewlet .collapsible.header.collapsed .actions{display:none}.monaco-workbench .viewlet .collapsible.header .action-label{background-repeat:no-repeat;height:16px;margin-right:.2em;width:16px}.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .sidebar.pane-composite-part>.title>.composite-bar-container{flex:1}.monaco-workbench .sidebar.part.pane-composite-part>.composite.title.has-composite-bar>.title-actions{flex:inherit}.monaco-workbench .sidebar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts

@@ -15,8 +15,6 @@ import { AbstractPaneCompositePart } from '../paneCompositePart.js';
 import { ActivityBarCompositeBar } from '../activitybar/activitybarPart.js';
 import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 declare class SidebarPart extends AbstractPaneCompositePart {
     private readonly configurationService;
@@ -28,7 +26,7 @@ declare class SidebarPart extends AbstractPaneCompositePart {
     readonly priority: LayoutPriority;
     get preferredWidth(): number | undefined;
     private readonly acitivityBarPart;
-    constructor(notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, configurationService: IConfigurationService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, menuService: IMenuService);
+    constructor(notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, configurationService: IConfigurationService, menuService: IMenuService);
     private onDidChangeActivityBarLocation;
     updateStyles(): void;
     layout(width: number, height: number, top: number, left: number): void;

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js

@@ -8,7 +8,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { contrastBorder } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
-import { SIDE_BAR_BORDER, SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
+import { SIDE_BAR_BORDER, SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
@@ -18,12 +18,9 @@ import { AbstractPaneCompositePart } from '../paneCompositePart.js';
 import { ActivitybarPart, ActivityBarCompositeBar } from '../activitybar/activitybarPart.js';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { registerAction2, Action2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ToggleActivityBarVisibilityActionId } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 
 var SidebarPart_1;
 let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
@@ -40,7 +37,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         }
         return Math.max(width, 300);
     }
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, configurationService, telemetryService, lifecycleService, menuService) {
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, configurationService, menuService) {
         super("workbench.parts.sidebar" , { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 }, SidebarPart_1.activeViewletSettingsKey, ActiveViewletContext.bindTo(contextKeyService), SidebarFocusContext.bindTo(contextKeyService), 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.configurationService = configurationService;
         this.minimumWidth = 170;
@@ -56,9 +53,6 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             }
         }));
         this.registerActions();
-        lifecycleService.when(4 ).then(() => {
-            telemetryService.publicLog2('activityBar:location', { location: configurationService.getValue("workbench.activityBar.location" ) });
-        });
     }
     onDidChangeActivityBarLocation() {
         this.updateTitleArea();
@@ -121,18 +115,18 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             colors: theme => ({
                 activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
                 inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
-                activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
-                activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
-                inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
+                activeBorderBottomColor: theme.getColor(ACTIVITY_BAR_TOP_ACTIVE_BORDER),
+                activeForegroundColor: theme.getColor(ACTIVITY_BAR_TOP_FOREGROUND),
+                inactiveForegroundColor: theme.getColor(ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND),
                 badgeBackground: theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND),
                 badgeForeground: theme.getColor(ACTIVITY_BAR_BADGE_FOREGROUND),
-                dragAndDropBorder: theme.getColor(PANEL_DRAG_AND_DROP_BORDER)
+                dragAndDropBorder: theme.getColor(ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER)
             }),
             compact: true
         };
     }
     shouldShowCompositeBar() {
-        return this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow) && this.configurationService.getValue("workbench.activityBar.location" ) === "top" ;
+        return this.configurationService.getValue("workbench.activityBar.location" ) === "top" ;
     }
     shouldShowActivityBar() {
         if (this.shouldShowCompositeBar()) {
@@ -222,9 +216,7 @@ SidebarPart = SidebarPart_1 = ( __decorate([
     ( __param(8, IContextKeyService)),
     ( __param(9, IExtensionService)),
     ( __param(10, IConfigurationService)),
-    ( __param(11, ITelemetryService)),
-    ( __param(12, ILifecycleService)),
-    ( __param(13, IMenuService))
+    ( __param(11, IMenuService))
 ], SidebarPart));
 
 export { SidebarPart };