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

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

@@ -20,7 +20,6 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CompositeDragAndDropObserver, toggleDropEffect } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { ToolBar } from 'vscode/vscode/vs/base/browser/ui/toolbar/toolbar';
 import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -30,22 +29,27 @@ import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { ViewsSubMenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 
 var AbstractPaneCompositePart_1;
+const _moduleId = "vs/workbench/browser/parts/paneCompositePart";
 var CompositeBarPosition;
-( (function(CompositeBarPosition) {
+( ((function(CompositeBarPosition) {
     CompositeBarPosition[CompositeBarPosition["TOP"] = 0] = "TOP";
     CompositeBarPosition[CompositeBarPosition["TITLE"] = 1] = "TITLE";
     CompositeBarPosition[CompositeBarPosition["BOTTOM"] = 2] = "BOTTOM";
-})(CompositeBarPosition || (CompositeBarPosition = {})));
+})(CompositeBarPosition || (CompositeBarPosition = {}))));
 let AbstractPaneCompositePart = class AbstractPaneCompositePart extends CompositePart {
     static { AbstractPaneCompositePart_1 = this; }
     static { this.MIN_COMPOSITE_BAR_WIDTH = 50; }
     get snap() {
         return this.layoutService.isVisible(this.partId) || !!this.paneCompositeBar.value?.getVisiblePaneCompositeIds().length;
     }
-    get onDidPaneCompositeOpen() { return ( Event.map(this.onDidCompositeOpen.event, compositeEvent => compositeEvent.composite)); }
-    constructor(partId, partOptions, activePaneCompositeSettingsKey, activePaneContextKey, paneFocusContextKey, nameForTelemetry, compositeCSSClass, titleForegroundColor, notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService) {
+    get onDidPaneCompositeOpen() { return (
+         (Event.map(this.onDidCompositeOpen.event, compositeEvent => compositeEvent.composite))
+    ); }
+    constructor(partId, partOptions, activePaneCompositeSettingsKey, activePaneContextKey, paneFocusContextKey, nameForTelemetry, compositeCSSClass, titleForegroundColor, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService) {
         let location = 0 ;
         let registryId = Extensions.Viewlets;
         let globalActionsMenuId = MenuId.SidebarTitle;
@@ -59,7 +63,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             registryId = Extensions.Auxiliary;
             globalActionsMenuId = MenuId.AuxiliaryBarTitle;
         }
-        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, ( Registry.as(registryId)), activePaneCompositeSettingsKey, viewDescriptorService.getDefaultViewContainer(location)?.id || '', nameForTelemetry, compositeCSSClass, titleForegroundColor, partId, partOptions);
+        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, ( (Registry.as(registryId))), activePaneCompositeSettingsKey, viewDescriptorService.getDefaultViewContainer(location)?.id || '', nameForTelemetry, compositeCSSClass, titleForegroundColor, partId, partOptions);
         this.partId = partId;
         this.activePaneContextKey = activePaneContextKey;
         this.paneFocusContextKey = paneFocusContextKey;
@@ -68,8 +72,8 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.extensionService = extensionService;
         this.menuService = menuService;
         this.onDidPaneCompositeClose = this.onDidCompositeClose.event;
-        this.headerFooterCompositeBarDispoables = this._register(( new DisposableStore()));
-        this.paneCompositeBar = this._register(( new MutableDisposable()));
+        this.headerFooterCompositeBarDispoables = this._register(( (new DisposableStore())));
+        this.paneCompositeBar = this._register(( (new MutableDisposable())));
         this.compositeBarPosition = undefined;
         this.blockOpening = false;
         this.location = location;
@@ -137,11 +141,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         this.emptyPaneMessageElement.classList.add('empty-pane-message-area');
         const messageElement = document.createElement('div');
         messageElement.classList.add('empty-pane-message');
-        messageElement.innerText = ( localizeWithPath(
-            'vs/workbench/browser/parts/paneCompositePart',
-            'pane.emptyMessage',
-            "Drag a view here to display."
-        ));
+        messageElement.innerText = ( localizeWithPath(_moduleId, 0, "Drag a view here to display."));
         this.emptyPaneMessageElement.appendChild(messageElement);
         parent.appendChild(this.emptyPaneMessageElement);
         this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.emptyPaneMessageElement, {
@@ -179,25 +179,22 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     createTitleArea(parent) {
         const titleArea = super.createTitleArea(parent);
         this._register(addDisposableListener(titleArea, EventType.CONTEXT_MENU, e => {
-            this.onTitleAreaContextMenu(( new StandardMouseEvent(getWindow(titleArea), e)));
+            this.onTitleAreaContextMenu(( (new StandardMouseEvent(getWindow(titleArea), e))));
         }));
         this._register(Gesture.addTarget(titleArea));
         this._register(addDisposableListener(titleArea, EventType$1.Contextmenu, e => {
-            this.onTitleAreaContextMenu(( new StandardMouseEvent(getWindow(titleArea), e)));
+            this.onTitleAreaContextMenu(( (new StandardMouseEvent(getWindow(titleArea), e))));
         }));
         const globalTitleActionsContainer = titleArea.appendChild($('.global-actions'));
-        this.globalToolBar = this._register(( new ToolBar(globalTitleActionsContainer, this.contextMenuService, {
+        this.globalToolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, globalTitleActionsContainer, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
             orientation: 0 ,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-            toggleMenuTitle: ( localizeWithPath(
-                'vs/workbench/browser/parts/paneCompositePart',
-                'moreActions',
-                "More Actions..."
-            )),
-            hoverDelegate: this.toolbarHoverDelegate
-        })));
+            toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "More Actions...")),
+            hoverDelegate: this.toolbarHoverDelegate,
+            hiddenItemStrategy: -1
+        }));
         this.updateGlobalToolbarActions();
         return titleArea;
     }
@@ -223,7 +220,9 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         if (wasCompositeBarVisible) {
             const previousCompositeBarContainer = previousPosition === CompositeBarPosition.TITLE ? this.titleContainer : this.headerFooterCompositeBarContainer;
             if (!this.paneCompositeBarContainer || !this.paneCompositeBar.value || !previousCompositeBarContainer) {
-                throw new Error('Composite bar containers should exist when removing the previous composite bar');
+                throw ( (new Error(
+                    'Composite bar containers should exist when removing the previous composite bar'
+                )));
             }
             this.paneCompositeBarContainer.remove();
             this.paneCompositeBarContainer = undefined;
@@ -250,7 +249,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         }
         if (isCompositeBarVisible) {
             if (this.paneCompositeBarContainer || this.paneCompositeBar.value || !newCompositeBarContainer) {
-                throw new Error('Invalid composite bar state when creating the new composite bar');
+                throw ( (new Error('Invalid composite bar state when creating the new composite bar')));
             }
             newCompositeBarContainer.classList.add('has-composite-bar');
             this.paneCompositeBarContainer = prepend(newCompositeBarContainer, $('.composite-bar-container'));
@@ -275,15 +274,15 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     }
     createHeaderFooterCompositeBarArea(area) {
         if (this.headerFooterCompositeBarContainer) {
-            throw new Error('Header or Footer composite bar already exists');
+            throw ( (new Error('Header or Footer composite bar already exists')));
         }
         this.headerFooterCompositeBarContainer = area;
         this.headerFooterCompositeBarDispoables.add(addDisposableListener(area, EventType.CONTEXT_MENU, e => {
-            this.onCompositeBarAreaContextMenu(( new StandardMouseEvent(getWindow(area), e)));
+            this.onCompositeBarAreaContextMenu(( (new StandardMouseEvent(getWindow(area), e))));
         }));
         this.headerFooterCompositeBarDispoables.add(Gesture.addTarget(area));
         this.headerFooterCompositeBarDispoables.add(addDisposableListener(area, EventType$1.Contextmenu, e => {
-            this.onCompositeBarAreaContextMenu(( new StandardMouseEvent(getWindow(area), e)));
+            this.onCompositeBarAreaContextMenu(( (new StandardMouseEvent(getWindow(area), e))));
         }));
         return area;
     }
@@ -369,7 +368,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
         if (!this.layoutService.isVisible(this.partId)) {
             return;
         }
-        this.contentDimension = ( new Dimension(width, height));
+        this.contentDimension = ( (new Dimension(width, height)));
         super.layout(this.contentDimension.width, this.contentDimension.height, top, left);
         this.layoutCompositeBar();
         this.layoutEmptyMessage();
@@ -443,30 +442,31 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     getViewsSubmenuAction() {
         const viewPaneContainer = this.getActivePaneComposite()?.getViewPaneContainer();
         if (viewPaneContainer) {
-            const disposables = ( new DisposableStore());
+            const disposables = ( (new DisposableStore()));
             const viewsActions = [];
             const scopedContextKeyService = disposables.add(this.contextKeyService.createScoped(this.element));
             scopedContextKeyService.createKey('viewContainer', viewPaneContainer.viewContainer.id);
             const menu = disposables.add(this.menuService.createMenu(ViewsSubMenu, scopedContextKeyService));
             createAndFillInActionBarActions(menu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: viewsActions, secondary: [] }, () => true);
             disposables.dispose();
-            return viewsActions.length > 1 && ( viewsActions.some(a => a.enabled)) ? ( new SubmenuAction('views', ( localizeWithPath('vs/workbench/browser/parts/paneCompositePart', 'views', "Views")), viewsActions)) : undefined;
+            return viewsActions.length > 1 && ( (viewsActions.some(a => a.enabled))) ? ( (new SubmenuAction('views', ( localizeWithPath(_moduleId, 2, "Views")), viewsActions))) : undefined;
         }
         return undefined;
     }
 };
-AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( __decorate([
-    ( __param(8, INotificationService)),
-    ( __param(9, IStorageService)),
-    ( __param(10, IContextMenuService)),
-    ( __param(11, IWorkbenchLayoutService)),
-    ( __param(12, IKeybindingService)),
-    ( __param(13, IInstantiationService)),
-    ( __param(14, IThemeService)),
-    ( __param(15, IViewDescriptorService)),
-    ( __param(16, IContextKeyService)),
-    ( __param(17, IExtensionService)),
-    ( __param(18, IMenuService))
-], AbstractPaneCompositePart));
+AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( (__decorate([
+    ( (__param(8, INotificationService))),
+    ( (__param(9, IStorageService))),
+    ( (__param(10, IContextMenuService))),
+    ( (__param(11, IWorkbenchLayoutService))),
+    ( (__param(12, IKeybindingService))),
+    ( (__param(13, IHoverService))),
+    ( (__param(14, IInstantiationService))),
+    ( (__param(15, IThemeService))),
+    ( (__param(16, IViewDescriptorService))),
+    ( (__param(17, IContextKeyService))),
+    ( (__param(18, IExtensionService))),
+    ( (__param(19, IMenuService)))
+], AbstractPaneCompositePart)));
 
 export { AbstractPaneCompositePart, CompositeBarPosition };

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -33,8 +33,10 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneCompositePart.js';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var PanelPart_1;
+const _moduleId = "vs/workbench/browser/parts/panel/panelPart";
 let PanelPart = class PanelPart extends AbstractPaneCompositePart {
     static { PanelPart_1 = this; }
     get preferredHeight() {
@@ -52,8 +54,8 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         return Math.max(width, 300);
     }
     static { this.activePanelSettingsKey = 'workbench.panelpart.activepanelid'; }
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService) {
-        super("workbench.parts.panel" , { hasTitle: true }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), 'panel', 'panel', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService) {
+        super("workbench.parts.panel" , { hasTitle: true }, PanelPart_1.activePanelSettingsKey, ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), 'panel', 'panel', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.commandService = commandService;
         this.minimumWidth = 300;
         this.maximumWidth = Number.POSITIVE_INFINITY;
@@ -110,23 +112,19 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         panelAlignMenu.dispose();
         panelPositionMenu.dispose();
         actions.push(...[
-            ( new Separator()),
-            ( new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(
-                'vs/workbench/browser/parts/panel/panelPart',
-                'panel position',
-                "Panel Position"
-            )), positionActions)),
-            ( new SubmenuAction('workbench.action.panel.align', ( localizeWithPath('vs/workbench/browser/parts/panel/panelPart', 'align panel', "Align Panel")), alignActions)),
-            toAction({ id: TogglePanelAction.ID, label: ( localizeWithPath('vs/workbench/browser/parts/panel/panelPart', 'hidePanel', "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
+            ( (new Separator())),
+            ( (new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(_moduleId, 0, "Panel Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.align', ( localizeWithPath(_moduleId, 1, "Align Panel")), alignActions))),
+            toAction({ id: TogglePanelAction.ID, label: ( localizeWithPath(_moduleId, 2, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
         ]);
     }
     layout(width, height, top, left) {
         let dimensions;
         if (this.layoutService.getPanelPosition() === 1 ) {
-            dimensions = ( new Dimension(width - 1, height));
+            dimensions = ( (new Dimension(width - 1, height)));
         }
         else {
-            dimensions = ( new Dimension(width, height));
+            dimensions = ( (new Dimension(width, height)));
         }
         super.layout(dimensions.width, dimensions.height, top, left);
     }
@@ -142,19 +140,20 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         };
     }
 };
-PanelPart = PanelPart_1 = ( __decorate([
-    ( __param(0, INotificationService)),
-    ( __param(1, IStorageService)),
-    ( __param(2, IContextMenuService)),
-    ( __param(3, IWorkbenchLayoutService)),
-    ( __param(4, IKeybindingService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IThemeService)),
-    ( __param(7, IViewDescriptorService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IExtensionService)),
-    ( __param(10, ICommandService)),
-    ( __param(11, IMenuService))
-], PanelPart));
+PanelPart = PanelPart_1 = ( (__decorate([
+    ( (__param(0, INotificationService))),
+    ( (__param(1, IStorageService))),
+    ( (__param(2, IContextMenuService))),
+    ( (__param(3, IWorkbenchLayoutService))),
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, IHoverService))),
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, IThemeService))),
+    ( (__param(8, IViewDescriptorService))),
+    ( (__param(9, IContextKeyService))),
+    ( (__param(10, IExtensionService))),
+    ( (__param(11, ICommandService))),
+    ( (__param(12, IMenuService)))
+], PanelPart)));
 
 export { PanelPart };

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

@@ -1,6 +1,6 @@
 import n from 'vscode/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 .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,.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>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.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}";
+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{background-color:var(--vscode-sideBarTitle-background)}.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>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.sidebar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,.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>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.sidebar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.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/sidebarActions.js

@@ -5,15 +5,12 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 
+const _moduleId = "vs/workbench/browser/parts/sidebar/sidebarActions";
 class FocusSideBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusSideBar',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/parts/sidebar/sidebarActions',
-                'focusSideBar',
-                'Focus into Primary Side Bar'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Focus into Primary Side Bar')),
             category: Categories.View,
             f1: true,
             keybinding: {

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

@@ -33,11 +33,14 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ToggleActivityBarVisibilityActionId } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var SidebarPart_1;
+const _moduleId = "vs/workbench/browser/parts/sidebar/sidebarPart";
 let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
     static { SidebarPart_1 = this; }
     static { this.activeViewletSettingsKey = 'workbench.sidebar.activeviewletid'; }
+    get snap() { return true; }
     get preferredWidth() {
         const viewlet = this.getActivePaneComposite();
         if (!viewlet) {
@@ -49,8 +52,8 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         }
         return Math.max(width, 300);
     }
-    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);
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, 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, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.configurationService = configurationService;
         this.minimumWidth = 170;
         this.maximumWidth = Number.POSITIVE_INFINITY;
@@ -120,7 +123,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             fillExtraContextMenuActions: actions => {
                 const viewsSubmenuAction = this.getViewsSubmenuAction();
                 if (viewsSubmenuAction) {
-                    actions.push(( new Separator()));
+                    actions.push(( (new Separator())));
                     actions.push(viewsSubmenuAction);
                 }
             },
@@ -201,11 +204,7 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             constructor() {
                 super({
                     id: ToggleActivityBarVisibilityActionId,
-                    title: ( localize2WithPath(
-                        'vs/workbench/browser/parts/sidebar/sidebarPart',
-                        'toggleActivityBar',
-                        "Toggle Activity Bar Visibility"
-                    )),
+                    title: ( localize2WithPath(_moduleId, 0, "Toggle Activity Bar Visibility")),
                 });
             }
             run() {
@@ -220,19 +219,20 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
         };
     }
 };
-SidebarPart = SidebarPart_1 = ( __decorate([
-    ( __param(0, INotificationService)),
-    ( __param(1, IStorageService)),
-    ( __param(2, IContextMenuService)),
-    ( __param(3, IWorkbenchLayoutService)),
-    ( __param(4, IKeybindingService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IThemeService)),
-    ( __param(7, IViewDescriptorService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IExtensionService)),
-    ( __param(10, IConfigurationService)),
-    ( __param(11, IMenuService))
-], SidebarPart));
+SidebarPart = SidebarPart_1 = ( (__decorate([
+    ( (__param(0, INotificationService))),
+    ( (__param(1, IStorageService))),
+    ( (__param(2, IContextMenuService))),
+    ( (__param(3, IWorkbenchLayoutService))),
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, IHoverService))),
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, IThemeService))),
+    ( (__param(8, IViewDescriptorService))),
+    ( (__param(9, IContextKeyService))),
+    ( (__param(10, IExtensionService))),
+    ( (__param(11, IConfigurationService))),
+    ( (__param(12, IMenuService)))
+], SidebarPart)));
 
 export { SidebarPart };