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

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { $, getWindow, getActiveElement, isAncestorOfActiveElement, addDisposableGenericMouseDownListener, EventHelper, Dimension } from 'vscode/vscode/vs/base/browser/dom';
-import { Relay, Event, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Relay, Event, Emitter, PauseableEmitter } from 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import { contrastBorder } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -104,7 +104,7 @@ let EditorPart = class EditorPart extends Part {
         this.onDidActivateGroup = this._onDidActivateGroup.event;
         this._onDidAddGroup = this._register(( new Emitter()));
         this.onDidAddGroup = this._onDidAddGroup.event;
-        this._onDidRemoveGroup = this._register(( new Emitter()));
+        this._onDidRemoveGroup = this._register(( new PauseableEmitter()));
         this.onDidRemoveGroup = this._onDidRemoveGroup.event;
         this._onDidMoveGroup = this._register(( new Emitter()));
         this.onDidMoveGroup = this._onDidMoveGroup.event;
@@ -623,26 +623,31 @@ let EditorPart = class EditorPart extends Part {
             editors.push({ editor, options });
             index++;
         }
+        let result = true;
         if (options?.mode === 0 ) {
             sourceView.copyEditors(editors, targetView);
         }
         else {
-            sourceView.moveEditors(editors, targetView);
+            result = sourceView.moveEditors(editors, targetView);
         }
         if (sourceView.isEmpty && !sourceView.disposed ) {
             this.removeGroup(sourceView, true);
         }
-        return targetView;
+        return result;
     }
     mergeAllGroups(target) {
         const targetView = this.assertGroupView(target);
+        let result = true;
         for (const group of this.getGroups(1 )) {
             if (group === targetView) {
                 continue;
             }
-            this.mergeGroup(group, targetView);
+            const merged = this.mergeGroup(group, targetView);
+            if (!merged) {
+                result = false;
+            }
         }
-        return targetView;
+        return result;
     }
     assertGroupView(group) {
         let groupView;
@@ -952,17 +957,41 @@ let EditorPart = class EditorPart extends Part {
             mostRecentActiveGroups: this.mostRecentActiveGroups
         };
     }
-    async applyState(state) {
-        for (const group of this.getGroups(1 )) {
-            const closed = await group.closeAllEditors();
-            if (!closed) {
-                return false;
-            }
+    applyState(state) {
+        if (state === 'empty') {
+            return this.doApplyEmptyState();
         }
-        this.disposeGroups();
+        else {
+            return this.doApplyState(state);
+        }
+    }
+    async doApplyState(state) {
+        const groups = await this.doPrepareApplyState();
+        const resumeEvents = this.disposeGroups(true );
         this.mostRecentActiveGroups = state.mostRecentActiveGroups;
-        this.doApplyGridState(state.serializedGrid, state.activeGroup);
-        return true;
+        try {
+            this.doApplyGridState(state.serializedGrid, state.activeGroup);
+        }
+        finally {
+            resumeEvents();
+        }
+        await this.activeGroup.openEditors(( groups
+            .flatMap(group => group.editors)
+            .filter(editor => this.editorPartsView.groups.every(groupView => !groupView.contains(editor)))
+            .map(editor => ({
+            editor, options: { pinned: true, preserveFocus: true, inactive: true }
+        }))));
+    }
+    async doApplyEmptyState() {
+        await this.doPrepareApplyState();
+        this.mergeAllGroups(this.activeGroup);
+    }
+    async doPrepareApplyState() {
+        const groups = this.getGroups(1 );
+        for (const group of groups) {
+            await group.closeAllEditors({ excludeConfirming: true });
+        }
+        return groups;
     }
     doApplyGridState(gridState, activeGroupId, editorGroupViewsToReuse) {
         this.doCreateGridControlWithState(gridState, activeGroupId, editorGroupViewsToReuse);
@@ -989,13 +1018,19 @@ let EditorPart = class EditorPart extends Part {
             type: "workbench.parts.editor"
         };
     }
-    disposeGroups() {
+    disposeGroups(surpressEvents) {
+        if (surpressEvents) {
+            this._onDidRemoveGroup.pause();
+        }
         for (const group of this.groups) {
             group.dispose();
             this._onDidRemoveGroup.fire(group);
         }
         this.groupViews.clear();
         this.mostRecentActiveGroups = [];
+        if (surpressEvents) {
+            return () => this._onDidRemoveGroup.resume();
+        }
     }
     dispose() {
         this.disposeGroups();

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

@@ -10,16 +10,18 @@ import { MultiWindowParts } from 'vscode/vscode/vs/workbench/browser/part';
 import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { getWindow } from 'vscode/vscode/vs/base/browser/dom';
-import { getZoomLevel } from 'vscode/vscode/vs/base/browser/browser';
+import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 
 var EditorParts_1;
 const _moduleId = "vs/workbench/browser/parts/editor/editorParts";
 let EditorParts = class EditorParts extends MultiWindowParts {
     static { EditorParts_1 = this; }
-    constructor(instantiationService, storageService, themeService) {
+    constructor(instantiationService, storageService, themeService, auxiliaryWindowService) {
         super('workbench.editorParts', themeService, storageService);
         this.instantiationService = instantiationService;
+        this.storageService = storageService;
+        this.auxiliaryWindowService = auxiliaryWindowService;
         this.mainPart = this._register(this.createMainEditorPart());
         this.mostRecentActiveParts = [this.mainPart];
         this._onDidCreateAuxiliaryEditorPart = this._register(( (new Emitter())));
@@ -30,6 +32,13 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         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, 1 );
+            if (workingSetsRaw) {
+                return JSON.parse(workingSetsRaw);
+            }
+            return [];
+        })();
         this._onDidActiveGroupChange = this._register(( (new Emitter())));
         this.onDidChangeActiveGroup = this._onDidActiveGroupChange.event;
         this._onDidAddGroup = this._register(( (new Emitter())));
@@ -163,27 +172,10 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     createState() {
         return {
             auxiliary: ( (this.parts.filter(part => part !== this.mainPart).map(part => {
+                const auxiliaryWindow = this.auxiliaryWindowService.getWindow(part.windowId);
                 return {
                     state: part.createState(),
-                    bounds: (() => {
-                        const auxiliaryWindow = getWindow(part.getContainer());
-                        if (auxiliaryWindow) {
-                            return {
-                                x: auxiliaryWindow.screenX,
-                                y: auxiliaryWindow.screenY,
-                                width: auxiliaryWindow.outerWidth,
-                                height: auxiliaryWindow.outerHeight
-                            };
-                        }
-                        return undefined;
-                    })(),
-                    zoomLevel: (() => {
-                        const auxiliaryWindow = getWindow(part.getContainer());
-                        if (auxiliaryWindow) {
-                            return getZoomLevel(auxiliaryWindow);
-                        }
-                        return undefined;
-                    })()
+                    ...auxiliaryWindow?.createState()
                 };
             }))),
             mru: ( (this.mostRecentActiveParts.map(part => this.parts.indexOf(part))))
@@ -193,11 +185,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         if (state.auxiliary.length) {
             const auxiliaryEditorPartPromises = [];
             for (const auxiliaryEditorPartState of state.auxiliary) {
-                auxiliaryEditorPartPromises.push(this.createAuxiliaryEditorPart({
-                    bounds: auxiliaryEditorPartState.bounds,
-                    state: auxiliaryEditorPartState.state,
-                    zoomLevel: auxiliaryEditorPartState.zoomLevel
-                }));
+                auxiliaryEditorPartPromises.push(this.createAuxiliaryEditorPart(auxiliaryEditorPartState));
             }
             await Promise.allSettled(auxiliaryEditorPartPromises);
             if (state.mru.length === this.parts.length) {
@@ -229,16 +217,79 @@ let EditorParts = class EditorParts extends MultiWindowParts {
                 continue;
             }
             for (const group of part.getGroups(1 )) {
-                const closed = await group.closeAllEditors();
-                if (!closed) {
-                    return false;
-                }
+                await group.closeAllEditors({ excludeConfirming: true });
             }
-            part.close();
+            const closed = part.close();
+            if (!closed) {
+                return false;
+            }
+        }
+        if (state !== 'empty') {
+            await this.restoreState(state);
+        }
+        return true;
+    }
+    static { this.EDITOR_WORKING_SETS_STORAGE_KEY = 'editor.workingSets'; }
+    saveWorkingSet(name) {
+        const workingSet = {
+            id: generateUuid(),
+            name,
+            main: this.mainPart.createState(),
+            auxiliary: this.createState()
+        };
+        this.editorWorkingSets.push(workingSet);
+        this.saveWorkingSets();
+        return {
+            id: workingSet.id,
+            name: workingSet.name
+        };
+    }
+    getWorkingSets() {
+        return (
+             (this.editorWorkingSets.map(workingSet => ({ id: workingSet.id, name: workingSet.name })))
+        );
+    }
+    deleteWorkingSet(workingSet) {
+        const index = this.indexOfWorkingSet(workingSet);
+        if (typeof index === 'number') {
+            this.editorWorkingSets.splice(index, 1);
+            this.saveWorkingSets();
+        }
+    }
+    async applyWorkingSet(workingSet) {
+        let workingSetState;
+        if (workingSet === 'empty') {
+            workingSetState = 'empty';
+        }
+        else {
+            workingSetState = this.editorWorkingSets[this.indexOfWorkingSet(workingSet) ?? -1];
+        }
+        if (!workingSetState) {
+            return false;
+        }
+        const applied = await this.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.auxiliary);
+        if (!applied) {
+            return false;
+        }
+        await this.mainPart.applyState(workingSetState === 'empty' ? workingSetState : workingSetState.main);
+        const mostRecentActivePart = firstOrDefault(this.mostRecentActiveParts);
+        if (mostRecentActivePart) {
+            await mostRecentActivePart.whenReady;
+            mostRecentActivePart.activeGroup.focus();
         }
-        await this.restoreState(state);
         return true;
     }
+    indexOfWorkingSet(workingSet) {
+        for (let i = 0; i < this.editorWorkingSets.length; i++) {
+            if (this.editorWorkingSets[i].id === workingSet.id) {
+                return i;
+            }
+        }
+        return undefined;
+    }
+    saveWorkingSets() {
+        this.storageService.store(EditorParts_1.EDITOR_WORKING_SETS_STORAGE_KEY, JSON.stringify(this.editorWorkingSets), 1 , 1 );
+    }
     get activeGroup() {
         return this.activePart.activeGroup;
     }
@@ -300,14 +351,14 @@ let EditorParts = class EditorParts extends MultiWindowParts {
     setSize(group, size) {
         this.getPart(group).setSize(group, size);
     }
-    arrangeGroups(arrangement, group) {
-        (group !== undefined ? this.getPart(group) : this.activePart).arrangeGroups(arrangement, group);
+    arrangeGroups(arrangement, group = this.activePart.activeGroup) {
+        this.getPart(group).arrangeGroups(arrangement, group);
     }
-    toggleMaximizeGroup(group) {
-        (group !== undefined ? this.getPart(group) : this.activePart).toggleMaximizeGroup(group);
+    toggleMaximizeGroup(group = this.activePart.activeGroup) {
+        this.getPart(group).toggleMaximizeGroup(group);
     }
-    toggleExpandGroup(group) {
-        (group !== undefined ? this.getPart(group) : this.activePart).toggleExpandGroup(group);
+    toggleExpandGroup(group = this.activePart.activeGroup) {
+        this.getPart(group).toggleExpandGroup(group);
     }
     restoreGroup(group) {
         return this.getPart(group).restoreGroup(group);
@@ -383,7 +434,8 @@ let EditorParts = class EditorParts extends MultiWindowParts {
 EditorParts = EditorParts_1 = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, IStorageService))),
-    ( (__param(2, IThemeService)))
+    ( (__param(2, IThemeService))),
+    ( (__param(3, IAuxiliaryWindowService)))
 ], EditorParts)));
 
 export { EditorParts };

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,6 +29,8 @@ 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";
@@ -48,7 +49,7 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
     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) {
+    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;
@@ -62,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;
@@ -185,14 +186,15 @@ let AbstractPaneCompositePart = class AbstractPaneCompositePart extends Composit
             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(_moduleId, 1, "More Actions...")),
-            hoverDelegate: this.toolbarHoverDelegate
-        }))));
+            hoverDelegate: this.toolbarHoverDelegate,
+            hiddenItemStrategy: -1
+        }));
         this.updateGlobalToolbarActions();
         return titleArea;
     }
@@ -458,12 +460,13 @@ AbstractPaneCompositePart = AbstractPaneCompositePart_1 = ( (__decorate([
     ( (__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)))
+    ( (__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,6 +33,7 @@ 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";
@@ -53,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;
@@ -145,13 +146,14 @@ PanelPart = PanelPart_1 = ( (__decorate([
     ( (__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)))
+    ( (__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/sidebarPart.js

@@ -33,12 +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) {
@@ -50,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;
@@ -223,13 +225,14 @@ SidebarPart = SidebarPart_1 = ( (__decorate([
     ( (__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)))
+    ( (__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 };

package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js

@@ -29,6 +29,7 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { nativeHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var LanguageStatus_1;
 const _moduleId = "vs/workbench/contrib/languageStatus/browser/languageStatus.contribution";
@@ -77,10 +78,11 @@ let LanguageStatus = class LanguageStatus {
     static { LanguageStatus_1 = this; }
     static { this._id = 'status.languageStatus'; }
     static { this._keyDedicatedItems = 'languageStatus.dedicated'; }
-    constructor(_languageStatusService, _statusBarService, _editorService, _openerService, _storageService) {
+    constructor(_languageStatusService, _statusBarService, _editorService, _hoverService, _openerService, _storageService) {
         this._languageStatusService = _languageStatusService;
         this._statusBarService = _statusBarService;
         this._editorService = _editorService;
+        this._hoverService = _hoverService;
         this._openerService = _openerService;
         this._storageService = _storageService;
         this._disposables = ( (new DisposableStore()));
@@ -271,7 +273,7 @@ let LanguageStatus = class LanguageStatus {
                 href: ( (( (URI.from({
                     scheme: 'command', path: command.id, query: command.arguments && JSON.stringify(command.arguments)
                 }))).toString()))
-            }, { hoverDelegate: nativeHoverDelegate }, this._openerService))));
+            }, { hoverDelegate: nativeHoverDelegate }, this._hoverService, this._openerService))));
         }
         const actionBar = ( (new ActionBar(right, { hoverDelegate: nativeHoverDelegate })));
         store.add(actionBar);
@@ -317,7 +319,7 @@ let LanguageStatus = class LanguageStatus {
                 append(target, ...parts);
             }
             else {
-                store.add(( (new Link(target, node, undefined, this._openerService))));
+                store.add(( (new Link(target, node, undefined, this._hoverService, this._openerService))));
             }
         }
     }
@@ -357,8 +359,9 @@ LanguageStatus = LanguageStatus_1 = ( (__decorate([
     ( (__param(0, ILanguageStatusService))),
     ( (__param(1, IStatusbarService))),
     ( (__param(2, IEditorService))),
-    ( (__param(3, IOpenerService))),
-    ( (__param(4, IStorageService)))
+    ( (__param(3, IHoverService))),
+    ( (__param(4, IOpenerService))),
+    ( (__param(5, IStorageService)))
 ], LanguageStatus)));
 ( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, 3 );
 registerAction2(class extends Action2 {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -7,6 +7,7 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js

@@ -5,6 +5,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { observableFromEvent, observableSignalFromEvent, observableSignal } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 
 class EditorGutter extends Disposable {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { reset, h } from 'vscode/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { BugIndicatingError } from 'vscode/vscode/vs/base/common/errors';
+import 'vscode/vscode/vs/base/common/arrays';
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { h } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js

@@ -11,6 +11,7 @@ import { derivedOpts, derived } from 'vscode/vscode/vs/base/common/observableInt
 import { autorunOpts, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js

@@ -10,6 +10,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { isEqual, basename } from 'vscode/vscode/vs/base/common/resources';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import './media/mergeEditor.css.js';