@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -14,7 +14,7 @@ import { isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { createMatches } from '../../../../base/common/filters.js';
 import { MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, toDisposable, MutableDisposable, DisposableStore } 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';
@@ -24,7 +24,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import './media/views.css.js';
 import { VSDataTransfer } from '../../../../base/common/dataTransfer.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createActionViewItem, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId, MenuRegistry, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
@@ -73,7 +73,6 @@ import { Button } from '../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IAccessibleViewInformationService } from '../../../services/accessibility/common/accessibleViewInformationService.service.js';
 var TreeRenderer_1;
-const _moduleId = "vs/workbench/browser/parts/views/treeView";
 let TreeViewPane = class TreeViewPane extends ViewPane {
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, notificationService, hoverService, accessibleViewService) {
         super({ ...options, titleMenuId: MenuId.ViewTitle, donotForwardArgs: false }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService);
@@ -175,11 +174,7 @@ function isTreeCommandEnabled(treeCommand, contextKeyService) {
 function isRenderedMessageValue(messageValue) {
     return !!messageValue && typeof messageValue !== 'string' && 'element' in messageValue && 'disposables' in messageValue;
 }
-const noDataProviderMessage = ( localizeWithPath(
-    _moduleId,
-    0,
-    "There is no data provider registered that can provide view data."
-));
+const noDataProviderMessage = ( localize(8804, "There is no data provider registered that can provide view data."));
 const RawCustomTreeViewContextKey = ( (new RawContextKey('customTreeView', false)));
 class Tree extends WorkbenchAsyncDataTree {
 }
@@ -416,9 +411,8 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeShowCollapseAllAction(startingValue = false) {
         if (!this.collapseAllContext) {
-            this.collapseAllContextKey = ( (new RawContextKey(`treeView.${this.id}.enableCollapseAll`, startingValue, ( localizeWithPath(
-                _moduleId,
-                1,
+            this.collapseAllContextKey = ( (new RawContextKey(`treeView.${this.id}.enableCollapseAll`, startingValue, ( localize(
+                8805,
                 "Whether the the tree view with id {0} enables collapse all.",
                 this.id
             )))));
@@ -436,12 +430,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeShowRefreshAction(startingValue = false) {
         if (!this.refreshContext) {
-            this.refreshContextKey = ( (new RawContextKey(`treeView.${this.id}.enableRefresh`, startingValue, ( localizeWithPath(
-                _moduleId,
-                2,
-                "Whether the tree view with id {0} enables refresh.",
-                this.id
-            )))));
+            this.refreshContextKey = ( (new RawContextKey(`treeView.${this.id}.enableRefresh`, startingValue, ( localize(8806, "Whether the tree view with id {0} enables refresh.", this.id)))));
             this.refreshContext = this.refreshContextKey.bindTo(this.contextKeyService);
         }
     }
@@ -459,7 +448,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.treeView.${that.id}.refresh`,
-                    title: ( localizeWithPath(_moduleId, 3, "Refresh")),
+                    title: ( localize(8807, "Refresh")),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( (ContextKeyExpr.and(
@@ -480,7 +469,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.treeView.${that.id}.collapseAll`,
-                    title: ( localizeWithPath(_moduleId, 4, "Collapse All")),
+                    title: ( localize(8808, "Collapse All")),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( (ContextKeyExpr.and(
@@ -615,6 +604,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             dnd: this.treeViewDnd,
             overrideStyles: getLocationBasedViewColors(this.viewLocation).listOverrideStyles
         }));
+        this.treeDisposables.add(renderer.onDidChangeMenuContext(e => e.forEach(e => this.tree?.rerender(e))));
         this.treeDisposables.add(this.tree);
         treeMenus.setContextKeyService(this.tree.contextKeyService);
         aligner.tree = this.tree;
@@ -947,9 +937,8 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeCollapseAllToggle() {
         if (!this.collapseAllToggleContext) {
-            this.collapseAllToggleContextKey = ( (new RawContextKey(`treeView.${this.id}.toggleCollapseAll`, false, ( localizeWithPath(
-                _moduleId,
-                5,
+            this.collapseAllToggleContextKey = ( (new RawContextKey(`treeView.${this.id}.toggleCollapseAll`, false, ( localize(
+                8809,
                 "Whether collapse all is toggled for the tree view with id {0}.",
                 this.id
             )))));
@@ -1055,6 +1044,8 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         this.hoverService = hoverService;
         this._onDidChangeCheckboxState = this._register(( (new Emitter())));
         this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
+        this._onDidChangeMenuContext = this._register(( (new Emitter())));
+        this.onDidChangeMenuContext = this._onDidChangeMenuContext.event;
         this._hasCheckbox = false;
         this._renderedElements = ( (new Map()));
         this._hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, {}));
@@ -1063,6 +1054,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         this._register(checkboxStateHandler.onDidChangeCheckboxState(items => {
             this.updateCheckboxes(items);
         }));
+        this._register(this.contextKeyService.onDidChangeContext(e => this.onDidChangeContext(e)));
     }
     get templateId() {
         return TreeRenderer_1.TREE_TEMPLATE_ID;
@@ -1079,7 +1071,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         const actionBar = ( (new ActionBar(actionsContainer, {
             actionViewItemProvider: this.actionViewItemProvider
         })));
-        return { resourceLabel, icon, checkboxContainer, actionBar, container, elementDisposable: ( (new DisposableStore())) };
+        return { resourceLabel, icon, checkboxContainer, actionBar, container };
     }
     getHover(label, resource, node) {
         if (!(node instanceof ResolvableTreeItem) || !node.hasResolve) {
@@ -1193,8 +1185,8 @@ let TreeRenderer = class TreeRenderer extends Disposable {
             }
         }
         templateData.actionBar.context = { $treeViewId: this.treeViewId, $treeItemHandle: node.handle };
-        const menuActions = this.menus.getResourceActions([node], templateData.elementDisposable);
-        templateData.actionBar.push(menuActions.actions, { icon: true, label: false });
+        const menuActions = this.menus.getResourceActions([node]);
+        templateData.actionBar.push(menuActions, { icon: true, label: false });
         if (this._actionRunner) {
             templateData.actionBar.actionRunner = this._actionRunner;
         }
@@ -1268,6 +1260,19 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         }
         return node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE;
     }
+    onDidChangeContext(e) {
+        const items = [];
+        for (const [_, elements] of this._renderedElements) {
+            for (const element of elements) {
+                if (e.affectsSome(this.menus.getElementOverlayContexts(element.original.element)) || e.affectsSome(this.menus.getEntireMenuContexts())) {
+                    items.push(element.original.element);
+                }
+            }
+        }
+        if (items.length) {
+            this._onDidChangeMenuContext.fire(items);
+        }
+    }
     updateCheckboxes(items) {
         const additionalItems = [];
         if (!this.manuallyManageCheckboxes()) {
@@ -1333,7 +1338,6 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         this._onDidChangeCheckboxState.fire(items);
     }
     disposeElement(resource, index, templateData) {
-        templateData.elementDisposable.clear();
         const itemRenders = this._renderedElements.get(resource.element.handle) ?? [];
         const renderedIndex = itemRenders.findIndex(renderedItem => templateData === renderedItem.rendered);
         if (itemRenders.length === 1) {
@@ -1348,7 +1352,6 @@ let TreeRenderer = class TreeRenderer extends Disposable {
     disposeTemplate(templateData) {
         templateData.resourceLabel.dispose();
         templateData.actionBar.dispose();
-        templateData.elementDisposable.dispose();
     }
 };
 TreeRenderer = TreeRenderer_1 = ( (__decorate([
@@ -1409,9 +1412,8 @@ class MultipleSelectionActionRunner extends ActionRunner {
         this.getSelectedResources = getSelectedResources;
         this._register(this.onDidRun(e => {
             if (e.error && !isCancellationError(e.error)) {
-                notificationService.error(( localizeWithPath(
-                    _moduleId,
-                    6,
+                notificationService.error(( localize(
+                    8810,
                     'Error running command {1}: {0}. This is likely caused by the extension that contributes {1}.',
                     e.error.message,
                     e.action.id
@@ -1444,12 +1446,12 @@ let TreeMenus = class TreeMenus {
         this._onDidChange = ( (new Emitter()));
         this.onDidChange = this._onDidChange.event;
     }
-    getResourceActions(elements, disposableStore) {
-        const actions = this.getActions(MenuId.ViewItemContext, elements, disposableStore);
-        return { actions: actions.primary };
+    getResourceActions(elements) {
+        const actions = this.getActions(this.getMenuId(), elements);
+        return actions.primary;
     }
     getResourceContextActions(elements) {
-        return this.getActions(MenuId.ViewItemContext, elements).secondary;
+        return this.getActions(this.getMenuId(), elements).secondary;
     }
     setContextKeyService(service) {
         this.contextKeyService = service;
@@ -1492,7 +1494,21 @@ let TreeMenus = class TreeMenus {
         groups.push(group);
         return groups;
     }
-    getActions(menuId, elements, listen) {
+    getElementOverlayContexts(element) {
+        return (
+             (new Map([
+                ['view', this.id],
+                ['viewItem', element.contextValue]
+            ]))
+        );
+    }
+    getEntireMenuContexts() {
+        return this.menuService.getMenuContexts(this.getMenuId());
+    }
+    getMenuId() {
+        return MenuId.ViewItemContext;
+    }
+    getActions(menuId, elements) {
         if (!this.contextKeyService) {
             return { primary: [], secondary: [] };
         }
@@ -1500,15 +1516,12 @@ let TreeMenus = class TreeMenus {
         let secondaryGroups = [];
         for (let i = 0; i < elements.length; i++) {
             const element = elements[i];
-            const contextKeyService = this.contextKeyService.createOverlay([
-                ['view', this.id],
-                ['viewItem', element.contextValue]
-            ]);
-            const menu = this.menuService.createMenu(menuId, contextKeyService);
+            const contextKeyService = this.contextKeyService.createOverlay(this.getElementOverlayContexts(element));
+            const menuData = this.menuService.getMenuActions(menuId, contextKeyService, { shouldForwardArgs: true });
             const primary = [];
             const secondary = [];
-            const result = { primary, secondary, menu };
-            createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
+            const result = { primary, secondary };
+            createAndFillInContextMenuActions(menuData, result, 'inline');
             if (i === 0) {
                 primaryGroups = this.createGroups(result.primary);
                 secondaryGroups = this.createGroups(result.secondary);
@@ -1517,13 +1530,6 @@ let TreeMenus = class TreeMenus {
                 this.filterNonUniversalActions(primaryGroups, result.primary);
                 this.filterNonUniversalActions(secondaryGroups, result.secondary);
             }
-            if (listen && elements.length === 1) {
-                listen.add(menu.onDidChange(() => this._onDidChange.fire(element)));
-                listen.add(menu);
-            }
-            else {
-                menu.dispose();
-            }
         }
         return { primary: this.buildMenu(primaryGroups), secondary: this.buildMenu(secondaryGroups) };
     }

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

@@ -15,7 +15,7 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import { badgeBackground, badgeForeground } from '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -29,12 +29,11 @@ import { SubmenuEntryActionViewItem } from '../../../../platform/actions/browser
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-const _moduleId = "vs/workbench/browser/parts/views/viewFilter";
 const viewFilterMenu = ( (new MenuId('menu.view.filter')));
 const viewFilterSubmenu = ( (new MenuId('submenu.view.filter')));
 MenuRegistry.appendMenuItem(viewFilterMenu, {
     submenu: viewFilterSubmenu,
-    title: ( localizeWithPath(_moduleId, 0, "More Filters...")),
+    title: ( localize(5623, "More Filters...")),
     group: 'navigation',
     icon: Codicon.filter,
 });

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

@@ -49,7 +49,7 @@ declare abstract class ViewPane extends Pane implements IView {
     protected themeService: IThemeService;
     protected telemetryService: ITelemetryService;
     protected readonly hoverService: IHoverService;
-    protected readonly accessibleViewService?: IAccessibleViewInformationService | undefined;
+    protected readonly accessibleViewInformationService?: IAccessibleViewInformationService | undefined;
     private static readonly AlwaysShowActionsConfig;
     private _onDidFocus;
     readonly onDidFocus: Event<void>;
@@ -84,7 +84,7 @@ declare abstract class ViewPane extends Pane implements IView {
     protected twistiesContainer?: HTMLElement;
     private viewWelcomeController;
     protected readonly scopedContextKeyService: IContextKeyService;
-    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService, accessibleViewService?: IAccessibleViewInformationService | undefined);
+    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService, accessibleViewInformationService?: IAccessibleViewInformationService | undefined);
     get headerVisible(): boolean;
     set headerVisible(visible: boolean);
     setVisible(visible: boolean): void;

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/paneviewlet.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { foreground } from '../../../../platform/theme/common/colors/baseColors.js';
@@ -56,7 +56,6 @@ import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BORDER, SIDE_BAR_STICKY_SCROLL_SHADOW, PANEL_BACKGROUND, PANEL_STICKY_SCROLL_BACKGROUND, PANEL_STICKY_SCROLL_BORDER, PANEL_STICKY_SCROLL_SHADOW } from '../../../common/theme.js';
 var ViewPane_1;
-const _moduleId = "vs/workbench/browser/parts/views/viewPane";
 var ViewPaneShowActions;
 ( ((function(ViewPaneShowActions) {
     ViewPaneShowActions[ViewPaneShowActions["Default"] = 0] = "Default";
@@ -64,8 +63,8 @@ var ViewPaneShowActions;
     ViewPaneShowActions[ViewPaneShowActions["Always"] = 2] = "Always";
 })(ViewPaneShowActions || (ViewPaneShowActions = {}))));
 const VIEWPANE_FILTER_ACTION = ( (new Action('viewpane.action.filter')));
-const viewPaneContainerExpandedIcon = registerIcon('view-pane-container-expanded', Codicon.chevronDown, ( localizeWithPath(_moduleId, 0, 'Icon for an expanded view pane container.')));
-const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collapsed', Codicon.chevronRight, ( localizeWithPath(_moduleId, 1, 'Icon for a collapsed view pane container.')));
+const viewPaneContainerExpandedIcon = registerIcon('view-pane-container-expanded', Codicon.chevronDown, ( localize(5342, 'Icon for an expanded view pane container.')));
+const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collapsed', Codicon.chevronRight, ( localize(5343, 'Icon for a collapsed view pane container.')));
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 let ViewWelcomeController = class ViewWelcomeController {
     get enabled() { return this._enabled; }
@@ -252,7 +251,7 @@ let ViewPane = class ViewPane extends Pane {
     get singleViewPaneContainerTitle() {
         return this._singleViewPaneContainerTitle;
     }
-    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService) {
+    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewInformationService) {
         super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === ViewContainerLocation.Panel ? Orientation.HORIZONTAL : Orientation.VERTICAL } });
         this.keybindingService = keybindingService;
         this.contextMenuService = contextMenuService;
@@ -264,7 +263,7 @@ let ViewPane = class ViewPane extends Pane {
         this.themeService = themeService;
         this.telemetryService = telemetryService;
         this.hoverService = hoverService;
-        this.accessibleViewService = accessibleViewService;
+        this.accessibleViewInformationService = accessibleViewInformationService;
         this._onDidFocus = this._register(( (new Emitter())));
         this.onDidFocus = this._onDidFocus.event;
         this._onDidBlur = this._register(( (new Emitter())));
@@ -285,7 +284,8 @@ let ViewPane = class ViewPane extends Pane {
         this.scopedContextKeyService.createKey('view', this.id);
         const viewLocationKey = this.scopedContextKeyService.createKey('viewLocation', ViewContainerLocationToString(viewDescriptorService.getViewLocationById(this.id)));
         this._register(Event.filter(viewDescriptorService.onDidChangeLocation, e => ( (e.views.some(view => view.id === this.id))))(() => viewLocationKey.set(ViewContainerLocationToString(viewDescriptorService.getViewLocationById(this.id)))));
-        this.menuActions = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))).createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs, renderShortTitle: true }));
+        const childInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))));
+        this.menuActions = this._register(childInstantiationService.createInstance(CompositeMenuActions, options.titleMenuId ?? MenuId.ViewTitle, MenuId.ViewTitleContext, { shouldForwardArgs: !options.donotForwardArgs, renderShortTitle: true }));
         this._register(this.menuActions.onDidChange(() => this.updateActions()));
     }
     get headerVisible() {
@@ -334,7 +334,7 @@ let ViewPane = class ViewPane extends Pane {
         this.toolbar = this.instantiationService.createInstance(WorkbenchToolBar, actions, {
             orientation: ActionsOrientation.HORIZONTAL,
             actionViewItemProvider: (action, options) => this.getActionViewItem(action, options),
-            ariaLabel: ( localizeWithPath(_moduleId, 2, "{0} actions", this.title)),
+            ariaLabel: ( localize(5344, "{0} actions", this.title)),
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             renderDropdownAsChildElement: true,
             actionRunner: this.getActionRunner(),
@@ -416,11 +416,11 @@ let ViewPane = class ViewPane extends Pane {
     }
     _getAriaLabel(title) {
         const viewHasAccessibilityHelpContent = this.viewDescriptorService.getViewDescriptorById(this.id)?.accessibilityHelpContent;
-        const accessibleViewHasShownForView = this.accessibleViewService?.hasShownAccessibleView(this.id);
+        const accessibleViewHasShownForView = this.accessibleViewInformationService?.hasShownAccessibleView(this.id);
         if (!viewHasAccessibilityHelpContent || accessibleViewHasShownForView) {
             return title;
         }
-        return ( localizeWithPath(_moduleId, 3, 'Use Alt+F1 for accessibility help {0}', title));
+        return ( localize(5345, 'Use Alt+F1 for accessibility help {0}', title));
     }
     updateTitle(title) {
         const calculatedTitle = this.calculateTitle(title);
@@ -576,7 +576,8 @@ ViewPane = ViewPane_1 = ( (__decorate([
 let FilterViewPane = class FilterViewPane extends ViewPane {
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService);
-        this.filterWidget = this._register(instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))).createInstance(FilterWidget, options.filterOptions));
+        const childInstantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))));
+        this.filterWidget = this._register(childInstantiationService.createInstance(FilterWidget, options.filterOptions));
     }
     getFilterWidget() {
         return this.filterWidget;

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

@@ -10,7 +10,7 @@ import { KeyChord, KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/k
 import { toDisposable, combinedDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import './media/paneviewlet.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
@@ -45,13 +45,12 @@ import { IViewDescriptorService } from '../../../common/views.service.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
-import { LayoutSettings, Position } from '../../../services/layout/browser/layoutService.js';
+import { LayoutSettings, isHorizontal } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
-const _moduleId = "vs/workbench/browser/parts/views/viewPaneContainer";
 const ViewsSubMenu = ( (new MenuId('Views')));
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     submenu: ViewsSubMenu,
-    title: ( localizeWithPath(_moduleId, 0, "Views")),
+    title: ( localize(5295, "Views")),
     order: 1,
 });
 var DropDirection;
@@ -485,8 +484,9 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             case ViewContainerLocation.Sidebar:
             case ViewContainerLocation.AuxiliaryBar:
                 return Orientation.VERTICAL;
-            case ViewContainerLocation.Panel:
-                return this.layoutService.getPanelPosition() === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+            case ViewContainerLocation.Panel: {
+                return isHorizontal(this.layoutService.getPanelPosition()) ? Orientation.HORIZONTAL : Orientation.VERTICAL;
+            }
         }
         return Orientation.VERTICAL;
     }
@@ -992,7 +992,7 @@ registerAction2(class MoveViewUp extends MoveViewPosition {
     constructor() {
         super({
             id: 'views.moveViewUp',
-            title: ( localizeWithPath(_moduleId, 1, "Move View Up")),
+            title: ( localize(5296, "Move View Up")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.UpArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1005,7 +1005,7 @@ registerAction2(class MoveViewLeft extends MoveViewPosition {
     constructor() {
         super({
             id: 'views.moveViewLeft',
-            title: ( localizeWithPath(_moduleId, 2, "Move View Left")),
+            title: ( localize(5297, "Move View Left")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.LeftArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1018,7 +1018,7 @@ registerAction2(class MoveViewDown extends MoveViewPosition {
     constructor() {
         super({
             id: 'views.moveViewDown',
-            title: ( localizeWithPath(_moduleId, 3, "Move View Down")),
+            title: ( localize(5298, "Move View Down")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.DownArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1031,7 +1031,7 @@ registerAction2(class MoveViewRight extends MoveViewPosition {
     constructor() {
         super({
             id: 'views.moveViewRight',
-            title: ( localizeWithPath(_moduleId, 4, "Move View Right")),
+            title: ( localize(5299, "Move View Right")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.RightArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1044,7 +1044,7 @@ registerAction2(class MoveViews extends Action2 {
     constructor() {
         super({
             id: 'vscode.moveViews',
-            title: ( localizeWithPath(_moduleId, 5, "Move Views")),
+            title: ( localize(5300, "Move Views")),
         });
     }
     async run(accessor, options) {

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../nls.js';
+import { localize } from '../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../platform/keybinding/common/keybinding.service.js';
 import { IQuickInputService } from '../../platform/quickinput/common/quickInput.service.js';
@@ -7,9 +7,8 @@ import { Disposable } from '../../base/common/lifecycle.js';
 import { getIEditor } from '../../editor/browser/editorBrowser.js';
 import { IEditorGroupsService } from '../services/editor/common/editorGroupsService.service.js';
 import { IEditorService } from '../services/editor/common/editorService.service.js';
-const _moduleId = "vs/workbench/browser/quickaccess";
 const inQuickPickContextKeyValue = 'inQuickOpen';
-const InQuickPickContextKey = ( (new RawContextKey(inQuickPickContextKeyValue, false, ( localizeWithPath(_moduleId, 0, "Whether keyboard focus is inside the quick open control")))));
+const InQuickPickContextKey = ( (new RawContextKey(inQuickPickContextKeyValue, false, ( localize(4789, "Whether keyboard focus is inside the quick open control")))));
 const inQuickPickContext = ( (ContextKeyExpr.has(inQuickPickContextKeyValue)));
 const defaultQuickAccessContextKeyValue = 'inFilesPicker';
 const defaultQuickAccessContext = ( (ContextKeyExpr.and(

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

@@ -10,7 +10,7 @@ import { matchesScheme, Schemas } from '../../base/common/network.js';
 import { isMacintosh, isIOS } from '../../base/common/platform.js';
 import Severity$1 from '../../base/common/severity.js';
 import { URI } from '../../base/common/uri.js';
-import { localizeWithPath } from '../../nls.js';
+import { localize } from '../../nls.js';
 import { CommandsRegistry } from '../../platform/commands/common/commands.js';
 import { IDialogService } from '../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
@@ -28,7 +28,6 @@ import { createSingleCallFunction } from '../../base/common/functional.js';
 import { IConfigurationService } from '../../platform/configuration/common/configuration.service.js';
 import { IWorkbenchEnvironmentService } from '../services/environment/common/environmentService.service.js';
 var BaseWindow_1;
-const _moduleId = "vs/workbench/browser/window";
 let BaseWindow = class BaseWindow extends Disposable {
     static { BaseWindow_1 = this; }
     static { this.TIMEOUT_HANDLES = Number.MIN_SAFE_INTEGER; }
@@ -114,16 +113,16 @@ let BaseWindow = class BaseWindow extends Disposable {
         const dialogService = accessor.get(IDialogService);
         const configurationService = accessor.get(IConfigurationService);
         const message = reason === ShutdownReason.QUIT ?
-            (isMacintosh ? ( localizeWithPath(_moduleId, 0, "Are you sure you want to quit?")) : ( localizeWithPath(_moduleId, 1, "Are you sure you want to exit?"))) :
-            ( localizeWithPath(_moduleId, 2, "Are you sure you want to close the window?"));
+            (isMacintosh ? ( localize(3536, "Are you sure you want to quit?")) : ( localize(3537, "Are you sure you want to exit?"))) :
+            ( localize(3538, "Are you sure you want to close the window?"));
         const primaryButton = reason === ShutdownReason.QUIT ?
-            (isMacintosh ? ( localizeWithPath(_moduleId, 3, "&&Quit")) : ( localizeWithPath(_moduleId, 4, "&&Exit"))) :
-            ( localizeWithPath(_moduleId, 5, "&&Close Window"));
+            (isMacintosh ? ( localize(3539, "&&Quit")) : ( localize(3540, "&&Exit"))) :
+            ( localize(3541, "&&Close Window"));
         const res = await dialogService.confirm({
             message,
             primaryButton,
             checkbox: {
-                label: ( localizeWithPath(_moduleId, 6, "Do not ask me again"))
+                label: ( localize(3542, "Do not ask me again"))
             }
         });
         if (res.confirmed && res.checkboxChecked) {
@@ -168,15 +167,11 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
             await timeout(3000);
             await this.dialogService.prompt({
                 type: Severity$1.Error,
-                message: ( localizeWithPath(
-                    _moduleId,
-                    7,
-                    "An unexpected error occurred that requires a reload of this page."
-                )),
-                detail: ( localizeWithPath(_moduleId, 8, "The workbench was unexpectedly disposed while running.")),
+                message: ( localize(3543, "An unexpected error occurred that requires a reload of this page.")),
+                detail: ( localize(3544, "The workbench was unexpectedly disposed while running.")),
                 buttons: [
                     {
-                        label: ( localizeWithPath(_moduleId, 9, "&&Reload")),
+                        label: ( localize(3545, "&&Reload")),
                         run: () => mainWindow.location.reload()
                     }
                 ]
@@ -212,19 +207,18 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
                         if (!opened) {
                             await this.dialogService.prompt({
                                 type: Severity$1.Warning,
-                                message: ( localizeWithPath(
-                                    _moduleId,
-                                    10,
+                                message: ( localize(
+                                    3546,
                                     "The browser interrupted the opening of a new tab or window. Press 'Open' to open it anyway."
                                 )),
                                 detail: href,
                                 buttons: [
                                     {
-                                        label: ( localizeWithPath(_moduleId, 11, "&&Open")),
+                                        label: ( localize(3547, "&&Open")),
                                         run: () => isAllowedOpener ? windowOpenPopup(href) : windowOpenNoOpener(href)
                                     },
                                     {
-                                        label: ( localizeWithPath(_moduleId, 12, "&&Learn More")),
+                                        label: ( localize(3548, "&&Learn More")),
                                         run: () => this.openerService.open(( (URI.parse('https://aka.ms/allow-vscode-popup'))))
                                     }
                                 ],
@@ -248,20 +242,19 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
                         let detail;
                         const buttons = [
                             {
-                                label: ( localizeWithPath(_moduleId, 13, "&&Try Again")),
+                                label: ( localize(3549, "&&Try Again")),
                                 run: () => invokeProtocolHandler()
                             }
                         ];
                         if (downloadUrl !== undefined) {
-                            detail = ( localizeWithPath(
-                                _moduleId,
-                                14,
+                            detail = ( localize(
+                                3550,
                                 "We launched {0} on your computer.\n\nIf {1} did not launch, try again or install it below.",
                                 this.productService.nameLong,
                                 this.productService.nameLong
                             ));
                             buttons.push({
-                                label: ( localizeWithPath(_moduleId, 15, "&&Install")),
+                                label: ( localize(3551, "&&Install")),
                                 run: async () => {
                                     await this.openerService.open(( (URI.parse(downloadUrl))));
                                     showProtocolUrlOpenedDialog();
@@ -269,9 +262,8 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
                             });
                         }
                         else {
-                            detail = ( localizeWithPath(
-                                _moduleId,
-                                16,
+                            detail = ( localize(
+                                3552,
                                 "We launched {0} on your computer.\n\nIf {1} did not launch, try again below.",
                                 this.productService.nameLong,
                                 this.productService.nameLong
@@ -279,7 +271,7 @@ let BrowserWindow = class BrowserWindow extends BaseWindow {
                         }
                         await this.hostService.withExpectedShutdown(() => this.dialogService.prompt({
                             type: Severity$1.Info,
-                            message: ( localizeWithPath(_moduleId, 17, "All done. You can close this tab now.")),
+                            message: ( localize(3553, "All done. You can close this tab now.")),
                             detail,
                             buttons,
                             cancelButton: true