@codingame/monaco-vscode-api 2.2.1 → 3.0.0

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

@@ -38,7 +38,7 @@ const panelOffIcon = registerIcon('panel-layout-icon-off', Codicon.layoutPanelOf
 )));
 class TogglePanelAction extends Action2 {
     static { this.ID = 'workbench.action.togglePanel'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'togglePanelVisibility',
         "Toggle Panel Visibility"
@@ -46,7 +46,7 @@ class TogglePanelAction extends Action2 {
     constructor() {
         super({
             id: TogglePanelAction.ID,
-            title: { value: TogglePanelAction.LABEL, original: 'Toggle Panel Visibility' },
+            title: TogglePanelAction.LABEL,
             toggled: {
                 condition: PanelVisibleContext,
                 title: ( localizeWithPath('vs/workbench/browser/parts/panel/panelActions', 'toggle panel', "Panel")),
@@ -134,67 +134,67 @@ function createAlignmentPanelActionConfig(id, title, shortLabel, alignment) {
     return createPanelActionConfig(id, title, shortLabel, alignment, ( PanelAlignmentContext.notEqualsTo(alignment)));
 }
 const PositionPanelActionConfigs = [
-    createPositionPanelActionConfig(PositionPanelActionId.LEFT, { value: ( localizeWithPath(
+    createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'positionPanelLeft',
-        'Move Panel Left'
-    )), original: 'Move Panel Left' }, ( localizeWithPath(
+        "Move Panel Left"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'positionPanelLeftShort',
         "Left"
     )), 0 ),
-    createPositionPanelActionConfig(PositionPanelActionId.RIGHT, { value: ( localizeWithPath(
+    createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'positionPanelRight',
-        'Move Panel Right'
-    )), original: 'Move Panel Right' }, ( localizeWithPath(
+        "Move Panel Right"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'positionPanelRightShort',
         "Right"
     )), 1 ),
-    createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, { value: ( localizeWithPath(
+    createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'positionPanelBottom',
-        'Move Panel To Bottom'
-    )), original: 'Move Panel To Bottom' }, ( localizeWithPath(
+        "Move Panel To Bottom"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'positionPanelBottomShort',
         "Bottom"
     )), 2 ),
 ];
 const AlignPanelActionConfigs = [
-    createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, { value: ( localizeWithPath(
+    createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelLeft',
-        'Set Panel Alignment to Left'
-    )), original: 'Set Panel Alignment to Left' }, ( localizeWithPath(
+        "Set Panel Alignment to Left"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelLeftShort',
         "Left"
     )), 'left'),
-    createAlignmentPanelActionConfig(AlignPanelActionId.RIGHT, { value: ( localizeWithPath(
+    createAlignmentPanelActionConfig(AlignPanelActionId.RIGHT, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelRight',
-        'Set Panel Alignment to Right'
-    )), original: 'Set Panel Alignment to Right' }, ( localizeWithPath(
+        "Set Panel Alignment to Right"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelRightShort',
         "Right"
     )), 'right'),
-    createAlignmentPanelActionConfig(AlignPanelActionId.CENTER, { value: ( localizeWithPath(
+    createAlignmentPanelActionConfig(AlignPanelActionId.CENTER, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelCenter',
-        'Set Panel Alignment to Center'
-    )), original: 'Set Panel Alignment to Center' }, ( localizeWithPath(
+        "Set Panel Alignment to Center"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelCenterShort',
         "Center"
     )), 'center'),
-    createAlignmentPanelActionConfig(AlignPanelActionId.JUSTIFY, { value: ( localizeWithPath(
+    createAlignmentPanelActionConfig(AlignPanelActionId.JUSTIFY, ( localize2WithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelJustify',
-        'Set Panel Alignment to Justify'
-    )), original: 'Set Panel Alignment to Justify' }, ( localizeWithPath(
+        "Set Panel Alignment to Justify"
+    )), ( localizeWithPath(
         'vs/workbench/browser/parts/panel/panelActions',
         'alignPanelJustifyShort',
         "Justify"
@@ -251,7 +251,7 @@ AlignPanelActionConfigs.forEach(alignPanelAction => {
         constructor() {
             super({
                 id,
-                title: title,
+                title,
                 category: Categories.View,
                 toggled: ( when.negate()),
                 f1: true
@@ -301,14 +301,11 @@ class SwitchPanelViewAction extends Action2 {
 }
 registerAction2(class extends SwitchPanelViewAction {
     constructor() {
-        super('workbench.action.previousPanelView', {
-            value: ( localizeWithPath(
-                'vs/workbench/browser/parts/panel/panelActions',
-                'previousPanelView',
-                'Previous Panel View'
-            )),
-            original: 'Previous Panel View'
-        });
+        super('workbench.action.previousPanelView', ( localize2WithPath(
+            'vs/workbench/browser/parts/panel/panelActions',
+            'previousPanelView',
+            "Previous Panel View"
+        )));
     }
     run(accessor) {
         return super.run(accessor, -1);
@@ -316,14 +313,11 @@ registerAction2(class extends SwitchPanelViewAction {
 });
 registerAction2(class extends SwitchPanelViewAction {
     constructor() {
-        super('workbench.action.nextPanelView', {
-            value: ( localizeWithPath(
-                'vs/workbench/browser/parts/panel/panelActions',
-                'nextPanelView',
-                'Next Panel View'
-            )),
-            original: 'Next Panel View'
-        });
+        super('workbench.action.nextPanelView', ( localize2WithPath(
+            'vs/workbench/browser/parts/panel/panelActions',
+            'nextPanelView',
+            "Next Panel View"
+        )));
     }
     run(accessor) {
         return super.run(accessor, 1);
@@ -389,7 +383,7 @@ registerAction2(class extends Action2 {
             title: ( localize2WithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'closePanel',
-                'Close Panel'
+                'Hide Panel'
             )),
             category: Categories.View,
             icon: closeIcon,
@@ -414,7 +408,7 @@ registerAction2(class extends Action2 {
             title: ( localize2WithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'closeSecondarySideBar',
-                'Close Secondary Side Bar'
+                'Hide Secondary Side Bar'
             )),
             category: Categories.View,
             icon: closeIcon,
@@ -493,14 +487,11 @@ class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(1 , 2 , {
             id: MovePanelToSidePanelAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/panel/panelActions',
-                    'movePanelToSecondarySideBar',
-                    "Move Panel Views To Secondary Side Bar"
-                )),
-                original: 'Move Panel Views To Secondary Side Bar'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/panel/panelActions',
+                'movePanelToSecondarySideBar',
+                "Move Panel Views To Secondary Side Bar"
+            )),
             category: Categories.View,
             f1: false
         });
@@ -511,14 +502,11 @@ class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(1 , 2 , {
             id: MovePanelToSecondarySideBarAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/panel/panelActions',
-                    'movePanelToSecondarySideBar',
-                    "Move Panel Views To Secondary Side Bar"
-                )),
-                original: 'Move Panel Views To Secondary Side Bar'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/panel/panelActions',
+                'movePanelToSecondarySideBar',
+                "Move Panel Views To Secondary Side Bar"
+            )),
             category: Categories.View,
             f1: true
         });
@@ -531,14 +519,11 @@ class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(2 , 1 , {
             id: MoveSidePanelToPanelAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/panel/panelActions',
-                    'moveSidePanelToPanel',
-                    "Move Secondary Side Bar Views To Panel"
-                )),
-                original: 'Move Secondary Side Bar Views To Panel'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/panel/panelActions',
+                'moveSidePanelToPanel',
+                "Move Secondary Side Bar Views To Panel"
+            )),
             category: Categories.View,
             f1: false
         });
@@ -549,14 +534,11 @@ class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(2 , 1 , {
             id: MoveSecondarySideBarToPanelAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/panel/panelActions',
-                    'moveSidePanelToPanel',
-                    "Move Secondary Side Bar Views To Panel"
-                )),
-                original: 'Move Secondary Side Bar Views To Panel'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/panel/panelActions',
+                'moveSidePanelToPanel',
+                "Move Secondary Side Bar Views To Panel"
+            )),
             category: Categories.View,
             f1: true
         });

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

@@ -72,7 +72,7 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
             activityHoverOptions: {
                 position: () => this.layoutService.getPanelPosition() === 2  && !this.layoutService.isPanelMaximized() ? 3  : 2 ,
             },
-            fillExtraContextMenuActions: actions => ( this.fillExtraContextMenuActions(actions)),
+            fillExtraContextMenuActions: actions => this.fillExtraContextMenuActions(actions),
             compositeSize: 0,
             iconSize: 16,
             overflowActionSize: 44,

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

@@ -20,7 +20,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { registerAction2, Action2, IMenuService } from '../../../../platform/actions/common/actions.js';
 import { Separator } from '../../../../base/common/actions.js';
 import { ToggleActivityBarVisibilityActionId } from '../../actions/layoutActions.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath } from '../../../../nls.js';
 var SidebarPart_1;
 let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
     static { SidebarPart_1 = this; }
@@ -181,14 +181,11 @@ let SidebarPart = class SidebarPart extends AbstractPaneCompositePart {
             constructor() {
                 super({
                     id: ToggleActivityBarVisibilityActionId,
-                    title: {
-                        value: ( localizeWithPath(
-                            'vs/workbench/browser/parts/sidebar/sidebarPart',
-                            'toggleActivityBar',
-                            "Toggle Activity Bar Visibility"
-                        )),
-                        original: 'Toggle Activity Bar Visibility'
-                    },
+                    title: ( localize2WithPath(
+                        'vs/workbench/browser/parts/sidebar/sidebarPart',
+                        'toggleActivityBar',
+                        "Toggle Activity Bar Visibility"
+                    )),
                 });
             }
             run() {

package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js

@@ -564,7 +564,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
                     if (!this.focusInsideMenubar) {
                         const actions = [];
                         updateActions(this.toActionsArray(menu), actions, title);
-                        this.menubar?.updateMenu({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
+                        this.menubar?.updateMenu({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
                     }
                 }));
                 if (menu === this.menus.File) {
@@ -572,7 +572,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
                         if (!this.focusInsideMenubar) {
                             const actions = [];
                             updateActions(this.toActionsArray(menu), actions, title);
-                            this.menubar?.updateMenu({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
+                            this.menubar?.updateMenu({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
                         }
                     }));
                 }
@@ -583,10 +583,10 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
             }
             if (this.menubar) {
                 if (!firstTime) {
-                    this.menubar.updateMenu({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
+                    this.menubar.updateMenu({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
                 }
                 else {
-                    this.menubar.push({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
+                    this.menubar.push({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
                 }
             }
         }

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.d.ts

@@ -3,6 +3,10 @@ import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IView } from '../../../../base/browser/ui/grid/grid.js';
 import '../../../../editor/editor.api.js';
 
+interface ITitleVariable {
+    readonly name: string;
+    readonly contextKey: string;
+}
 interface ITitleProperties {
     isPure?: boolean;
     isAdmin?: boolean;
@@ -17,10 +21,14 @@ interface ITitlebarPart extends IDisposable {
      * Update some environmental title properties.
      */
     updateProperties(properties: ITitleProperties): void;
+    /**
+     * Adds variables to be supported in the window title.
+     */
+    registerVariables(variables: ITitleVariable[]): void;
 }
 interface IAuxiliaryTitlebarPart extends ITitlebarPart, IView {
     readonly container: HTMLElement;
     readonly height: number;
 }
 
-export type { IAuxiliaryTitlebarPart, ITitleProperties, ITitlebarPart };
+export type { IAuxiliaryTitlebarPart, ITitleProperties, ITitleVariable, ITitlebarPart };

package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js

@@ -7,7 +7,7 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { isWindows, isMacintosh, isWeb } from '../../../../base/common/platform.js';
+import { isWindows, isMacintosh, isWeb, isNative } from '../../../../base/common/platform.js';
 import { trim } from '../../../../base/common/strings.js';
 import { template } from '../../../../base/common/labels.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
@@ -19,7 +19,19 @@ import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/comm
 import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 var WindowTitle_1;
+const defaultWindowTitle = (() => {
+    if (isMacintosh && isNative) {
+        return '${activeEditorShort}${separator}${rootName}${separator}${profileName}';
+    }
+    const base = '${dirty}${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}${appName}';
+    if (isWeb) {
+        return base + '${separator}${remoteName}';
+    }
+    return base;
+})();
+const defaultWindowTitleSeparator = isMacintosh ? ' \u2014 ' : ' - ';
 let WindowTitle = class WindowTitle extends Disposable {
     static { WindowTitle_1 = this; }
     static { this.NLS_USER_IS_ADMIN = isWindows ? ( localizeWithPath(
@@ -48,10 +60,11 @@ let WindowTitle = class WindowTitle extends Disposable {
         const dirty = activeEditor?.isDirty() && !activeEditor.isSaving() ? WindowTitle_1.TITLE_DIRTY : '';
         return `${dirty}${fileName}`;
     }
-    constructor(targetWindow, editorGroupsContainer, configurationService, editorService, environmentService, contextService, labelService, userDataProfileService, productService, viewsService) {
+    constructor(targetWindow, editorGroupsContainer, configurationService, contextKeyService, editorService, environmentService, contextService, labelService, userDataProfileService, productService, viewsService) {
         super();
         this.targetWindow = targetWindow;
         this.configurationService = configurationService;
+        this.contextKeyService = contextKeyService;
         this.environmentService = environmentService;
         this.contextService = contextService;
         this.labelService = labelService;
@@ -59,6 +72,7 @@ let WindowTitle = class WindowTitle extends Disposable {
         this.productService = productService;
         this.viewsService = viewsService;
         this.properties = { isPure: true, isAdmin: false, prefix: undefined };
+        this.variables = ( new Map());
         this.activeEditorListeners = this._register(( new DisposableStore()));
         this.titleUpdater = this._register(( new RunOnceScheduler(() => this.doUpdateTitle(), 0)));
         this.onDidChangeEmitter = ( new Emitter());
@@ -81,6 +95,11 @@ let WindowTitle = class WindowTitle extends Disposable {
                 this.titleUpdater.schedule();
             }
         }));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(this.variables)) {
+                this.titleUpdater.schedule();
+            }
+        }));
     }
     onConfigurationChanged(event) {
         if (event.affectsConfiguration("window.title" )) {
@@ -170,6 +189,18 @@ let WindowTitle = class WindowTitle extends Disposable {
             this.titleUpdater.schedule();
         }
     }
+    registerVariables(variables) {
+        let changed = false;
+        for (const { name, contextKey } of variables) {
+            if (!( this.variables.has(contextKey))) {
+                this.variables.set(contextKey, name);
+                changed = true;
+            }
+        }
+        if (changed) {
+            this.titleUpdater.schedule();
+        }
+    }
     getWindowTitle() {
         const editor = this.editorService.activeEditor;
         const workspace = this.contextService.getWorkspace();
@@ -216,10 +247,21 @@ let WindowTitle = class WindowTitle extends Disposable {
         const dirty = editor?.isDirty() && !editor.isSaving() ? WindowTitle_1.TITLE_DIRTY : '';
         const appName = this.productService.nameLong;
         const profileName = this.userDataProfileService.currentProfile.isDefault ? '' : this.userDataProfileService.currentProfile.name;
-        const separator = this.configurationService.getValue("window.titleSeparator" );
-        const titleTemplate = this.configurationService.getValue("window.title" );
         const focusedView = this.viewsService.getFocusedViewName();
+        const variables = {};
+        for (const [contextKey, name] of this.variables) {
+            variables[name] = this.contextKeyService.getContextKeyValue(contextKey) ?? '';
+        }
+        let titleTemplate = this.configurationService.getValue("window.title" );
+        if (typeof titleTemplate !== 'string') {
+            titleTemplate = defaultWindowTitle;
+        }
+        let separator = this.configurationService.getValue("window.titleSeparator" );
+        if (typeof separator !== 'string') {
+            separator = defaultWindowTitleSeparator;
+        }
         return template(titleTemplate, {
+            ...variables,
             activeEditorShort,
             activeEditorLong,
             activeEditorMedium,
@@ -247,12 +289,13 @@ let WindowTitle = class WindowTitle extends Disposable {
 };
 WindowTitle = WindowTitle_1 = ( __decorate([
     ( __param(2, IConfigurationService)),
-    ( __param(3, IEditorService)),
-    ( __param(4, IBrowserWorkbenchEnvironmentService)),
-    ( __param(5, IWorkspaceContextService)),
-    ( __param(6, ILabelService)),
-    ( __param(7, IUserDataProfileService)),
-    ( __param(8, IProductService)),
-    ( __param(9, IViewsService))
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IEditorService)),
+    ( __param(5, IBrowserWorkbenchEnvironmentService)),
+    ( __param(6, IWorkspaceContextService)),
+    ( __param(7, ILabelService)),
+    ( __param(8, IUserDataProfileService)),
+    ( __param(9, IProductService)),
+    ( __param(10, IViewsService))
 ], WindowTitle));
-export { WindowTitle };
+export { WindowTitle, defaultWindowTitle, defaultWindowTitleSeparator };

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -13,7 +13,7 @@ import { isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { createMatches } from '../../../../base/common/filters.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { basename, dirname } from '../../../../base/common/resources.js';
@@ -52,7 +52,7 @@ import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../common/theme.js'
 import { ResolvableTreeItem, TreeItemCollapsibleState, Extensions, IViewDescriptorService } from '../../../common/views.js';
 import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { WorkbenchHoverDelegate, IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { ITreeViewsService } from '../../../services/views/browser/treeViewsService.js';
 import { LocalSelectionTransfer, CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { toExternalVSDataTransfer } from '../../../../editor/browser/dnd.js';
@@ -211,6 +211,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
         this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
         this._onDidCompleteRefresh = this._register(( new Emitter()));
         this._isInitialized = false;
+        this._activity = this._register(( new MutableDisposable()));
         this._height = 0;
         this._width = 0;
         this.refreshing = false;
@@ -350,17 +351,13 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             this._badge?.tooltip === badge?.tooltip) {
             return;
         }
-        if (this._badgeActivity) {
-            this._badgeActivity.dispose();
-            this._badgeActivity = undefined;
-        }
         this._badge = badge;
         if (badge) {
             const activity = {
                 badge: ( new NumberBadge(badge.value, () => badge.tooltip)),
                 priority: 50
             };
-            this._badgeActivity = this.activityService.showViewActivity(this.id, activity);
+            this._activity.value = this.activityService.showViewActivity(this.id, activity);
         }
     }
     get canSelectMany() {
@@ -937,7 +934,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
     static { TreeRenderer_1 = this; }
     static { this.ITEM_HEIGHT = 22; }
     static { this.TREE_TEMPLATE_ID = 'treeExplorer'; }
-    constructor(treeViewId, menus, labels, actionViewItemProvider, aligner, checkboxStateHandler, manuallyManageCheckboxes, themeService, configurationService, labelService, hoverService, treeViewsService, contextKeyService) {
+    constructor(treeViewId, menus, labels, actionViewItemProvider, aligner, checkboxStateHandler, manuallyManageCheckboxes, themeService, configurationService, labelService, treeViewsService, contextKeyService, instantiationService) {
         super();
         this.treeViewId = treeViewId;
         this.menus = menus;
@@ -949,17 +946,13 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         this.themeService = themeService;
         this.configurationService = configurationService;
         this.labelService = labelService;
-        this.hoverService = hoverService;
         this.treeViewsService = treeViewsService;
         this.contextKeyService = contextKeyService;
         this._onDidChangeCheckboxState = this._register(( new Emitter()));
         this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
         this._hasCheckbox = false;
         this._renderedElements = ( new Map());
-        this._hoverDelegate = {
-            showHover: (options) => this.hoverService.showHover(options),
-            delay: this.configurationService.getValue('workbench.hover.delay')
-        };
+        this._hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, { persistence: undefined  }));
         this._register(this.themeService.onDidFileIconThemeChange(() => this.rerender()));
         this._register(this.themeService.onDidColorThemeChange(() => this.rerender()));
         this._register(checkboxStateHandler.onDidChangeCheckboxState(items => {
@@ -1256,9 +1249,9 @@ TreeRenderer = TreeRenderer_1 = ( __decorate([
     ( __param(7, IThemeService)),
     ( __param(8, IConfigurationService)),
     ( __param(9, ILabelService)),
-    ( __param(10, IHoverService)),
-    ( __param(11, ITreeViewsService)),
-    ( __param(12, IContextKeyService))
+    ( __param(10, ITreeViewsService)),
+    ( __param(11, IContextKeyService)),
+    ( __param(12, IInstantiationService))
 ], TreeRenderer));
 class Aligner extends Disposable {
     constructor(themeService) {

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -315,7 +315,7 @@ let ViewPane = class ViewPane extends Pane {
         actions.classList.toggle('show-expanded', this.showActions === ViewPaneShowActions.WhenExpanded);
         this.toolbar = this.instantiationService.createInstance(WorkbenchToolBar, actions, {
             orientation: 0 ,
-            actionViewItemProvider: action => this.getActionViewItem(action),
+            actionViewItemProvider: (action, options) => this.getActionViewItem(action, options),
             ariaLabel: ( localizeWithPath(
                 'vs/workbench/browser/parts/views/viewPane',
                 'viewToolbarAriaLabel',

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.d.ts

@@ -19,6 +19,7 @@ import { Component } from '../../../common/component.js';
 import { IViewPaneContainer, IViewDescriptorService, ViewContainer, IViewContainerModel, IView, IViewDescriptor, IAddedViewDescriptorRef } from '../../../common/views.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 interface IViewPaneContainerOptions extends IPaneViewOptions {
     mergeViewWithContainerWhenSingleView: boolean;
@@ -72,7 +73,7 @@ declare class ViewPaneContainer extends Component implements IViewPaneContainer
     getTitle(): string;
     private showContextMenu;
     getActionsContext(): unknown;
-    getActionViewItem(action: IAction): IActionViewItem | undefined;
+    getActionViewItem(action: IAction, options: IBaseActionViewItemOptions): IActionViewItem | undefined;
     focus(): void;
     private get orientation();
     layout(dimension: Dimension): void;

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -433,11 +433,11 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
     getActionsContext() {
         return undefined;
     }
-    getActionViewItem(action) {
+    getActionViewItem(action, options) {
         if (this.isViewMergedWithContainer()) {
-            return this.paneItems[0].pane.getActionViewItem(action);
+            return this.paneItems[0].pane.getActionViewItem(action, options);
         }
-        return createActionViewItem(this.instantiationService, action);
+        return createActionViewItem(this.instantiationService, action, options);
     }
     focus() {
         let paneToFocus = undefined;
@@ -493,7 +493,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
     }
     addPanes(panes) {
         const wasMerged = this.isViewMergedWithContainer();
-        for (const { pane: pane, size, index, disposable } of panes) {
+        for (const { pane, size, index, disposable } of panes) {
             this.addPane(pane, size, disposable, index);
         }
         this.updateViewHeaders();

package/vscode/src/vs/workbench/browser/quickaccess.js

@@ -39,12 +39,19 @@ class EditorViewState {
             };
         }
     }
-    async restore() {
+    async restore(shouldCloseCurrEditor = false) {
         if (this._editorViewState) {
             const options = {
                 viewState: this._editorViewState.state,
                 preserveFocus: true
             };
+            if (shouldCloseCurrEditor) {
+                const activeEditorPane = this.editorService.activeEditorPane;
+                const currEditor = activeEditorPane?.input;
+                if (currEditor && currEditor !== this._editorViewState.editor && activeEditorPane?.group.isPinned(currEditor) !== true) {
+                    await activeEditorPane.group.closeEditor(currEditor);
+                }
+            }
             await this._editorViewState.group.openEditor(this._editorViewState.editor, options);
         }
     }