@codingame/monaco-vscode-api 22.1.8 → 23.0.0

package/vscode/src/vs/platform/mcp/common/mcpGalleryManifest.js

@@ -3,9 +3,10 @@
 var McpGalleryResourceType;
 (function (McpGalleryResourceType) {
     McpGalleryResourceType["McpServersQueryService"] = "McpServersQueryService";
-    McpGalleryResourceType["McpServersSearchService"] = "McpServersSearchService";
     McpGalleryResourceType["McpServerWebUri"] = "McpServerWebUriTemplate";
-    McpGalleryResourceType["McpServerResourceUri"] = "McpServerResourceUriTemplate";
+    McpGalleryResourceType["McpServerVersionUri"] = "McpServerVersionUriTemplate";
+    McpGalleryResourceType["McpServerIdUri"] = "McpServerIdUriTemplate";
+    McpGalleryResourceType["McpServerLatestVersionUri"] = "McpServerLatestVersionUriTemplate";
     McpGalleryResourceType["McpServerNamedResourceUri"] = "McpServerNamedResourceUriTemplate";
     McpGalleryResourceType["PublisherUriTemplate"] = "PublisherUriTemplate";
     McpGalleryResourceType["ContactSupportUri"] = "ContactSupportUri";

package/vscode/src/vs/platform/mcp/common/mcpManagement.service.d.ts

@@ -1,18 +1,19 @@
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Event } from "../../../base/common/event.js";
 import { IMarkdownString } from "../../../base/common/htmlContent.js";
-import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
+import { IIterativePager } from "@codingame/monaco-vscode-2eda793f-4b5b-58e8-83c5-1bfd3bad15f1-common/vscode/vs/base/common/paging";
 import { URI } from "../../../base/common/uri.js";
-import { IQueryOptions, IGalleryMcpServer, IGalleryMcpServerConfiguration, type DidUninstallMcpServerEvent, type IInstallableMcpServer, type ILocalMcpServer, type InstallMcpServerEvent, type InstallMcpServerResult, type InstallOptions, type McpServerConfigurationParseResult, type RegistryType, type UninstallMcpServerEvent, type UninstallOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IQueryOptions, IGalleryMcpServer, type DidUninstallMcpServerEvent, type IGalleryMcpServerConfiguration, type IInstallableMcpServer, type ILocalMcpServer, type InstallMcpServerEvent, type InstallMcpServerResult, type InstallOptions, type McpServerConfigurationParseResult, type RegistryType, type UninstallMcpServerEvent, type UninstallOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
 export declare const IMcpGalleryService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IMcpGalleryService>;
 export interface IMcpGalleryService {
     readonly _serviceBrand: undefined;
     isEnabled(): boolean;
-    query(options?: IQueryOptions, token?: CancellationToken): Promise<IPager<IGalleryMcpServer>>;
-    getMcpServersFromGallery(urls: string[]): Promise<IGalleryMcpServer[]>;
+    query(options?: IQueryOptions, token?: CancellationToken): Promise<IIterativePager<IGalleryMcpServer>>;
+    getMcpServersFromGallery(infos: {
+        name: string;
+        id?: string;
+    }[]): Promise<IGalleryMcpServer[]>;
     getMcpServer(url: string): Promise<IGalleryMcpServer | undefined>;
-    getMcpServerByName(name: string): Promise<IGalleryMcpServer | undefined>;
-    getMcpServerConfiguration(extension: IGalleryMcpServer, token: CancellationToken): Promise<IGalleryMcpServerConfiguration>;
     getReadme(extension: IGalleryMcpServer, token: CancellationToken): Promise<string>;
 }
 export declare const IMcpManagementService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IMcpManagementService>;

package/vscode/src/vs/platform/notification/common/notification.js

@@ -47,12 +47,12 @@ class NoOpProgress {
 }
 function withSeverityPrefix(label, severity) {
     if (severity === Severity$1.Error) {
-        return localize(1976, "Error: {0}", label);
+        return localize(1985, "Error: {0}", label);
     }
     if (severity === Severity$1.Warning) {
-        return localize(1977, "Warning: {0}", label);
+        return localize(1986, "Warning: {0}", label);
     }
-    return localize(1978, "Info: {0}", label);
+    return localize(1987, "Info: {0}", label);
 }
 
 export { NeverShowAgainScope, NoOpNotification, NoOpProgress, NotificationPriority, NotificationsFilter, Severity$1 as Severity, isNotificationSource, withSeverityPrefix };

package/vscode/src/vs/platform/product/common/product.js

@@ -4,9 +4,9 @@ import productJson from '../../../../../product.json.js';
 var product = {
   ...productJson,
   quality: 'stable',
-  version: '1.105.0',
-  commit: '03c265b1adee71ac88f833e065f7bb956b60550a',
-  date: '2025-11-10T21:01:28.661Z',
+  version: '1.106.0',
+  commit: 'ac4cbdf48759c7d8c3eb91ffe6bb04316e263c57',
+  date: '2025-11-14T09:03:06.176Z',
   ...(globalThis._VSCODE_PRODUCT_JSON ?? {})
 };
 

package/vscode/src/vs/platform/quickinput/browser/quickInput.d.ts

@@ -99,9 +99,9 @@ export interface QuickInputUI {
     progressBar: ProgressBar;
     list: QuickInputList;
     tree: QuickInputTreeController;
-    onDidAccept: Event<void>;
-    onDidCustom: Event<void>;
-    onDidTriggerButton: Event<IQuickInputButton>;
+    readonly onDidAccept: Event<void>;
+    readonly onDidCustom: Event<void>;
+    readonly onDidTriggerButton: Event<IQuickInputButton>;
     ignoreFocusOut: boolean;
     keyMods: Writeable<IKeyMods>;
     show(controller: QuickInput): void;
@@ -146,7 +146,7 @@ export declare abstract class QuickInput extends Disposable implements IQuickInp
     private buttonsUpdated;
     private _toggles;
     private togglesUpdated;
-    protected noValidationMessage: string;
+    protected noValidationMessage: string | undefined;
     private _validationMessage;
     private _lastValidationMessage;
     private _severity;
@@ -249,6 +249,7 @@ export declare class QuickPick<T extends IQuickPickItem, O extends {
     private _hideCheckAll;
     private _focusEventBufferer;
     readonly type = QuickInputType.QuickPick;
+    constructor(ui: QuickInputUI);
     get quickNavigate(): IQuickNavigateConfiguration | undefined;
     set quickNavigate(quickNavigate: IQuickNavigateConfiguration | undefined);
     get value(): string;
@@ -259,6 +260,8 @@ export declare class QuickPick<T extends IQuickPickItem, O extends {
     get ariaLabel(): string | undefined;
     get placeholder(): string | undefined;
     set placeholder(placeholder: string | undefined);
+    get prompt(): string | undefined;
+    set prompt(prompt: string | undefined);
     onDidChangeValue: Event<string>;
     onWillAccept: Event<IQuickPickWillAcceptEvent>;
     onDidAccept: Event<IQuickPickDidAcceptEvent>;

package/vscode/src/vs/platform/quickinput/browser/quickInput.js

@@ -26,25 +26,25 @@ import { observableValue } from '../../../base/common/observableInternal/observa
 
 registerCss(quickInput);
 const inQuickInputContextKeyValue = 'inQuickInput';
-const InQuickInputContextKey = ( new RawContextKey(inQuickInputContextKeyValue, false, ( localize(1986, "Whether keyboard focus is inside the quick input control"))));
+const InQuickInputContextKey = ( new RawContextKey(inQuickInputContextKeyValue, false, ( localize(1995, "Whether keyboard focus is inside the quick input control"))));
 const inQuickInputContext = ( ContextKeyExpr.has(inQuickInputContextKeyValue));
 const quickInputAlignmentContextKeyValue = 'quickInputAlignment';
-const QuickInputAlignmentContextKey = ( new RawContextKey(quickInputAlignmentContextKeyValue, 'top', ( localize(1987, "The alignment of the quick input"))));
+const QuickInputAlignmentContextKey = ( new RawContextKey(quickInputAlignmentContextKeyValue, 'top', ( localize(1996, "The alignment of the quick input"))));
 const quickInputTypeContextKeyValue = 'quickInputType';
-const QuickInputTypeContextKey = ( new RawContextKey(quickInputTypeContextKeyValue, undefined, ( localize(1988, "The type of the currently visible quick input"))));
+const QuickInputTypeContextKey = ( new RawContextKey(quickInputTypeContextKeyValue, undefined, ( localize(1997, "The type of the currently visible quick input"))));
 const endOfQuickInputBoxContextKeyValue = 'cursorAtEndOfQuickInputBox';
 const EndOfQuickInputBoxContextKey = ( new RawContextKey(endOfQuickInputBoxContextKeyValue, false, ( localize(
-    1989,
+    1998,
     "Whether the cursor in the quick input is at the end of the input box"
 ))));
 const endOfQuickInputBoxContext = ( ContextKeyExpr.has(endOfQuickInputBoxContextKeyValue));
 const backButton = {
     iconClass: ThemeIcon.asClassName(Codicon.quickInputBack),
-    tooltip: ( localize(1990, "Back")),
+    tooltip: ( localize(1999, "Back")),
     handle: -1
 };
 class QuickInput extends Disposable {
-    static { this.noPromptMessage = ( localize(1991, "Press 'Enter' to confirm your input or 'Escape' to cancel")); }
+    static { this.noPromptMessage = ( localize(2000, "Press 'Enter' to confirm your input or 'Escape' to cancel")); }
     constructor(ui) {
         super();
         this.ui = ui;
@@ -254,11 +254,13 @@ class QuickInput extends Disposable {
             this.busyDelay.setIfNotSet(() => {
                 if (this.visible) {
                     this.ui.progressBar.infinite();
+                    this.ui.progressBar.getContainer().removeAttribute('aria-hidden');
                 }
             }, 800);
         }
         if (!this.busy && this.busyDelay) {
             this.ui.progressBar.stop();
+            this.ui.progressBar.getContainer().setAttribute('aria-hidden', 'true');
             this.busyDelay.cancel();
             this.busyDelay = undefined;
         }
@@ -287,6 +289,9 @@ class QuickInput extends Disposable {
             this.togglesUpdated = false;
             const concreteToggles = this.toggles?.filter(opts => opts instanceof Toggle) ?? [];
             this.ui.inputBox.toggles = concreteToggles;
+            const toggleOffset = concreteToggles.length * 22;
+            this.ui.countContainer.style.right = toggleOffset > 0 ? `${4 + toggleOffset}px` : '4px';
+            this.ui.visibleCountContainer.style.right = toggleOffset > 0 ? `${4 + toggleOffset}px` : '4px';
         }
         this.ui.ignoreFocusOut = this.ignoreFocusOut;
         this.ui.setEnabled(this.enabled);
@@ -295,12 +300,14 @@ class QuickInput extends Disposable {
         if (this._lastValidationMessage !== validationMessage) {
             this._lastValidationMessage = validationMessage;
             reset(this.ui.message);
-            renderQuickInputDescription(validationMessage, this.ui.message, {
-                callback: (content) => {
-                    this.ui.linkOpenerDelegate(content);
-                },
-                disposables: this.visibleDisposables,
-            });
+            if (validationMessage) {
+                renderQuickInputDescription(validationMessage, this.ui.message, {
+                    callback: (content) => {
+                        this.ui.linkOpenerDelegate(content);
+                    },
+                    disposables: this.visibleDisposables,
+                });
+            }
         }
         if (this._lastSeverity !== this.severity) {
             this._lastSeverity = this.severity;
@@ -324,7 +331,7 @@ class QuickInput extends Disposable {
     }
     getSteps() {
         if (this.step && this.totalSteps) {
-            return localize(1992, "{0}/{1}", this.step, this.totalSteps);
+            return localize(2001, "{0}/{1}", this.step, this.totalSteps);
         }
         if (this.step) {
             return String(this.step);
@@ -354,8 +361,9 @@ class QuickInput extends Disposable {
     }
 }
 class QuickPick extends QuickInput {
-    constructor() {
-        super(...arguments);
+    static { this.DEFAULT_ARIA_LABEL = ( localize(2002, "Type to narrow down results.")); }
+    constructor(ui) {
+        super(ui);
         this._value = '';
         this.onDidChangeValueEmitter = this._register(( new Emitter()));
         this.onWillAcceptEmitter = this._register(( new Emitter()));
@@ -396,8 +404,8 @@ class QuickPick extends QuickInput {
         this.onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
         this.onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;
         this.onDidTriggerSeparatorButton = this.onDidTriggerSeparatorButtonEmitter.event;
+        this.noValidationMessage = undefined;
     }
-    static { this.DEFAULT_ARIA_LABEL = ( localize(1993, "Type to narrow down results.")); }
     get quickNavigate() {
         return this._quickNavigate;
     }
@@ -440,6 +448,13 @@ class QuickPick extends QuickInput {
         this._placeholder = placeholder;
         this.update();
     }
+    get prompt() {
+        return this.noValidationMessage;
+    }
+    set prompt(prompt) {
+        this.noValidationMessage = prompt;
+        this.update();
+    }
     get items() {
         return this._items;
     }
@@ -577,7 +592,7 @@ class QuickPick extends QuickInput {
         this.update();
     }
     get okLabel() {
-        return this._okLabel ?? ( localize(1994, "OK"));
+        return this._okLabel ?? ( localize(2003, "OK"));
     }
     set okLabel(okLabel) {
         this._okLabel = okLabel;
@@ -744,7 +759,7 @@ class QuickPick extends QuickInput {
             count: this.canSelectMany && !this._hideCountBadge,
             ok: this.ok === 'default' ? this.canSelectMany : this.ok,
             list: true,
-            message: !!this.validationMessage,
+            message: !!this.validationMessage || !!this.prompt,
             customButton: this.customButton
         };
         this.ui.setVisibilities(visibilities);
@@ -923,7 +938,7 @@ class InputBox extends QuickInput {
     set prompt(prompt) {
         this._prompt = prompt;
         this.noValidationMessage = prompt
-            ? ( localize(1995, "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt))
+            ? ( localize(2004, "{0} (Press 'Enter' to confirm or 'Escape' to cancel)", prompt))
             : QuickInput.noPromptMessage;
         this.update();
     }

package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js

@@ -14,7 +14,7 @@ function registerQuickInputCommandAndKeybindingRule(rule, options = {}) {
         weight: KeybindingWeight.WorkbenchContrib,
         when: inQuickInputContext,
         metadata: { description: ( localize(
-            1996,
+            2005,
             "Used while in the context of any kind of quick input. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
         )) },
         ...rule,
@@ -27,7 +27,7 @@ function registerQuickPickCommandAndKeybindingRule(rule, options = {}) {
         when: ( ContextKeyExpr.and(( ContextKeyExpr.or((
         ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickPick)), ( ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickTree)))), inQuickInputContext)),
         metadata: { description: ( localize(
-            1997,
+            2006,
             "Used while in the context of the quick pick. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
         )) },
         ...rule,
@@ -78,11 +78,11 @@ registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.last', primary: ctrl
 registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.next', primary: KeyCode.DownArrow, handler: focusHandler(QuickPickFocus.Next) }, { withCtrlMod: true });
 registerQuickPickCommandAndKeybindingRule({ id: 'quickInput.previous', primary: KeyCode.UpArrow, handler: focusHandler(QuickPickFocus.Previous) }, { withCtrlMod: true });
 const nextSeparatorFallbackDesc = ( localize(
-    1998,
+    2007,
     "If we're in quick access mode, this will navigate to the next item. If we are not in quick access mode, this will navigate to the next separator."
 ));
 const prevSeparatorFallbackDesc = ( localize(
-    1999,
+    2008,
     "If we're in quick access mode, this will navigate to the previous item. If we are not in quick access mode, this will navigate to the previous separator."
 ));
 if (isMacintosh) {
@@ -140,9 +140,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: KeyCode.Enter,
     weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and((
-    ContextKeyExpr.notEquals(quickInputTypeContextKeyValue, QuickInputType.QuickWidget)), inQuickInputContext)),
+    ContextKeyExpr.notEquals(quickInputTypeContextKeyValue, QuickInputType.QuickWidget)), inQuickInputContext, ContextKeyExpr.not('isComposing'))),
     metadata: { description: ( localize(
-        2000,
+        2009,
         "Used while in the context of some quick input. If you change one keybinding for this command, you should change all of the other keybindings (modifier variants) of this command as well."
     )) },
     handler: (accessor) => {

package/vscode/src/vs/platform/quickinput/browser/quickInputController.js

@@ -26,7 +26,7 @@ import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
 import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { IConfigurationService } from '../../configuration/common/configuration.service.js';
-import { platform, Platform } from '../../../base/common/platform.js';
+import { setTimeout0, platform, Platform } from '../../../base/common/platform.js';
 import { getWindowControlsStyle, WindowControlsStyle } from '../../window/common/window.js';
 import { getZoomFactor } from '../../../base/browser/browser.js';
 import { TriStateCheckbox } from '../../../base/browser/ui/toggle/toggle.js';
@@ -109,7 +109,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         const rightActionBar = this._register(( new ActionBar(titleBar, { hoverDelegate: this.options.hoverDelegate })));
         rightActionBar.domNode.classList.add('quick-input-right-action-bar');
         const headerContainer = append(container, $('.quick-input-header'));
-        const checkAll = this._register(( new TriStateCheckbox(( localize(2001, "Toggle all checkboxes")), false, { ...defaultCheckboxStyles, size: 15 })));
+        const checkAll = this._register(( new TriStateCheckbox(( localize(2010, "Toggle all checkboxes")), false, { ...defaultCheckboxStyles, size: 15 })));
         append(headerContainer, checkAll.domNode);
         this._register(checkAll.onChange(() => {
             const checked = checkAll.checked;
@@ -128,21 +128,21 @@ let QuickInputController = class QuickInputController extends Disposable {
         const visibleCountContainer = append(filterContainer, $('.quick-input-visible-count'));
         visibleCountContainer.setAttribute('aria-live', 'polite');
         visibleCountContainer.setAttribute('aria-atomic', 'true');
-        const visibleCount = this._register(( new CountBadge(visibleCountContainer, { countFormat: ( localize(2002, "{0} Results")) }, this.styles.countBadge)));
+        const visibleCount = this._register(( new CountBadge(visibleCountContainer, { countFormat: ( localize(2011, "{0} Results")) }, this.styles.countBadge)));
         const countContainer = append(filterContainer, $('.quick-input-count'));
         countContainer.setAttribute('aria-live', 'polite');
-        const count = this._register(( new CountBadge(countContainer, { countFormat: ( localize(2003, "{0} Selected")) }, this.styles.countBadge)));
+        const count = this._register(( new CountBadge(countContainer, { countFormat: ( localize(2012, "{0} Selected")) }, this.styles.countBadge)));
         const inlineActionBar = this._register(( new ActionBar(headerContainer, { hoverDelegate: this.options.hoverDelegate })));
         inlineActionBar.domNode.classList.add('quick-input-inline-action-bar');
         const okContainer = append(headerContainer, $('.quick-input-action'));
         const ok = this._register(( new Button(okContainer, this.styles.button)));
-        ok.label = ( localize(2004, "OK"));
+        ok.label = ( localize(2013, "OK"));
         this._register(ok.onDidClick(e => {
             this.onDidAcceptEmitter.fire();
         }));
         const customButtonContainer = append(headerContainer, $('.quick-input-action'));
         const customButton = this._register(( new Button(customButtonContainer, { ...this.styles.button, supportIcons: true })));
-        customButton.label = ( localize(2005, "Custom"));
+        customButton.label = ( localize(2014, "Custom"));
         this._register(customButton.onDidClick(e => {
             this.onDidCustomEmitter.fire();
         }));
@@ -167,7 +167,7 @@ let QuickInputController = class QuickInputController extends Disposable {
             visibleCount.setCount(c);
         }));
         this._register(list.onChangedCheckedCount(c => {
-            count.setCount(c);
+            setTimeout0(() => count.setCount(c));
         }));
         this._register(list.onLeave(() => {
             setTimeout(() => {
@@ -393,6 +393,7 @@ let QuickInputController = class QuickInputController extends Disposable {
             }
             input.canSelectMany = !!options.canPickMany;
             input.placeholder = options.placeHolder;
+            input.prompt = options.prompt;
             input.ignoreFocusOut = !!options.ignoreFocusLost;
             input.matchOnDescription = !!options.matchOnDescription;
             input.matchOnDetail = !!options.matchOnDetail;
@@ -536,15 +537,21 @@ let QuickInputController = class QuickInputController extends Disposable {
         ui.count.setCount(0);
         reset(ui.message);
         ui.progressBar.stop();
+        ui.progressBar.getContainer().setAttribute('aria-hidden', 'true');
         ui.list.setElements([]);
         ui.list.matchOnDescription = false;
         ui.list.matchOnDetail = false;
         ui.list.matchOnLabel = true;
         ui.list.sortByLabel = true;
+        ui.tree.updateFilterOptions({
+            matchOnDescription: false,
+            matchOnLabel: true
+        });
+        ui.tree.sortByLabel = true;
         ui.ignoreFocusOut = false;
         ui.inputBox.toggles = undefined;
         const backKeybindingLabel = this.options.backKeybindingLabel();
-        backButton.tooltip = backKeybindingLabel ? ( localize(2006, "Back ({0})", backKeybindingLabel)) : ( localize(2007, "Back"));
+        backButton.tooltip = backKeybindingLabel ? ( localize(2015, "Back ({0})", backKeybindingLabel)) : ( localize(2016, "Back"));
         ui.container.style.display = '';
         this.updateLayout();
         this.dndController?.layoutContainer();

package/vscode/src/vs/platform/quickinput/browser/quickInputList.d.ts

@@ -22,13 +22,13 @@ export declare class QuickInputList extends Disposable {
     */
     readonly onLeave: Event<void>;
     private readonly _visibleCountObservable;
-    onChangedVisibleCount: Event<number>;
+    readonly onChangedVisibleCount: Event<number>;
     private readonly _allVisibleCheckedObservable;
-    onChangedAllVisibleChecked: Event<boolean>;
+    readonly onChangedAllVisibleChecked: Event<boolean>;
     private readonly _checkedCountObservable;
-    onChangedCheckedCount: Event<number>;
+    readonly onChangedCheckedCount: Event<number>;
     private readonly _checkedElementsObservable;
-    onChangedCheckedElements: Event<IQuickPickItem[]>;
+    readonly onChangedCheckedElements: Event<IQuickPickItem[]>;
     private readonly _onButtonTriggered;
     onButtonTriggered: Event<IQuickPickItemButtonEvent<IQuickPickItem>>;
     private readonly _onSeparatorButtonTriggered;

package/vscode/src/vs/platform/quickinput/browser/quickInputList.js

@@ -190,7 +190,7 @@ class QuickInputItemDelegate {
 }
 class QuickInputAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(2008, "Quick Input");
+        return localize(2017, "Quick Input");
     }
     getAriaLabel(element) {
         return element.separator?.label

package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js

@@ -60,7 +60,7 @@ function renderQuickInputDescription(description, container, actionHandler) {
             let title = node.title;
             if (!title && node.href.startsWith('command:')) {
                 title = ( localize(
-                    2009,
+                    2018,
                     "Click to execute command '{0}'",
                     node.href.substring('command:'.length)
                 ));

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTree.d.ts

@@ -5,4 +5,4 @@ export interface IQuickTreeFilterData {
     readonly labelHighlights?: IMatch[];
     readonly descriptionHighlights?: IMatch[];
 }
-export declare function getParentNodeState(parentChildren: ITreeNode<IQuickTreeItem | null, IQuickTreeFilterData>[] | IObjectTreeElement<IQuickTreeItem>[]): boolean | "partial";
+export declare function getParentNodeState(parentChildren: ITreeNode<IQuickTreeItem | null, IQuickTreeFilterData>[] | IObjectTreeElement<IQuickTreeItem>[]): boolean | "mixed";

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTree.js

@@ -3,11 +3,11 @@
 function getParentNodeState(parentChildren) {
     let containsChecks = false;
     let containsUnchecks = false;
-    let containsPartial = false;
+    let containsMixed = false;
     for (const element of parentChildren) {
         switch (element.element?.checked) {
-            case 'partial':
-                containsPartial = true;
+            case 'mixed':
+                containsMixed = true;
                 break;
             case true:
                 containsChecks = true;
@@ -16,18 +16,18 @@ function getParentNodeState(parentChildren) {
                 containsUnchecks = true;
                 break;
         }
-        if (containsChecks && containsUnchecks && containsPartial) {
+        if (containsChecks && containsUnchecks && containsMixed) {
             break;
         }
     }
     const newState = containsUnchecks
-        ? containsPartial
-            ? 'partial'
+        ? containsMixed
+            ? 'mixed'
             : containsChecks
-                ? 'partial'
+                ? 'mixed'
                 : false
-        : containsPartial
-            ? 'partial'
+        : containsMixed
+            ? 'mixed'
             : containsChecks;
     return newState;
 }

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeAccessibilityProvider.d.ts

@@ -1,4 +1,5 @@
 import { AriaRole } from "../../../../base/browser/ui/aria/aria.js";
+import { CheckBoxAccessibleState } from "../../../../base/browser/ui/list/listView.js";
 import { IListAccessibilityProvider } from "../../../../base/browser/ui/list/listWidget.js";
 import { Event, IValueWithChangeEvent } from "../../../../base/common/event.js";
 import { IQuickTreeCheckboxEvent, IQuickTreeItem } from "../../common/quickInput.js";
@@ -12,5 +13,5 @@ export declare class QuickTreeAccessibilityProvider<T extends IQuickTreeItem> im
     getAriaLabel(element: T): string;
     getWidgetRole(): AriaRole;
     getRole(_element: T): AriaRole;
-    isChecked(element: T): IValueWithChangeEvent<boolean> | undefined;
+    isChecked(element: T): IValueWithChangeEvent<CheckBoxAccessibleState> | undefined;
 }

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeAccessibilityProvider.js

@@ -8,7 +8,7 @@ class QuickTreeAccessibilityProvider {
         this.onCheckedEvent = onCheckedEvent;
     }
     getWidgetAriaLabel() {
-        return localize(2013, "Quick Tree");
+        return localize(2022, "Quick Tree");
     }
     getAriaLabel(element) {
         return element.ariaLabel || ( [element.label, element.description]
@@ -24,7 +24,7 @@ class QuickTreeAccessibilityProvider {
     }
     isChecked(element) {
         return {
-            get value() { return element.checked === true; },
+            get value() { return element.checked === 'mixed' ? 'mixed' : !!element.checked; },
             onDidChange: e => Event.filter(this.onCheckedEvent, e => e.item === element)(_ => e()),
         };
     }

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeController.d.ts

@@ -10,6 +10,7 @@ export declare class QuickInputTreeController extends Disposable {
     private readonly instantiationService;
     private readonly _renderer;
     private readonly _filter;
+    private readonly _sorter;
     private readonly _tree;
     private readonly _onDidTriggerButton;
     readonly onDidTriggerButton: Event<IQuickTreeItemButtonEvent<IQuickTreeItem>>;
@@ -33,6 +34,8 @@ export declare class QuickInputTreeController extends Disposable {
     get renderer(): QuickInputTreeRenderer<IQuickTreeItem>;
     get displayed(): boolean;
     set displayed(value: boolean);
+    get sortByLabel(): boolean;
+    set sortByLabel(value: boolean);
     getActiveDescendant(): string | null;
     filter(input: string): void;
     updateFilterOptions(options: {
@@ -45,6 +48,6 @@ export declare class QuickInputTreeController extends Disposable {
     registerOnOpenListener(): void;
     getCheckedLeafItems(): IQuickTreeItem[];
     getActiveItems(): readonly IQuickTreeItem[];
-    check(element: IQuickTreeItem, checked: boolean | "partial"): void;
-    checkAll(checked: boolean | "partial"): void;
+    check(element: IQuickTreeItem, checked: boolean | "mixed"): void;
+    checkAll(checked: boolean | "mixed"): void;
 }

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeController.js

@@ -13,6 +13,7 @@ import { getParentNodeState } from './quickInputTree.js';
 import { QuickTreeAccessibilityProvider } from './quickInputTreeAccessibilityProvider.js';
 import { QuickInputTreeFilter } from './quickInputTreeFilter.js';
 import { QuickInputTreeRenderer } from './quickInputTreeRenderer.js';
+import { QuickInputTreeSorter } from './quickInputTreeSorter.js';
 
 const $ = $$1;
 let QuickInputTreeController = class QuickInputTreeController extends Disposable {
@@ -32,6 +33,7 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
         this._container = append(container, $('.quick-input-tree'));
         this._renderer = this._register(this.instantiationService.createInstance(QuickInputTreeRenderer, hoverDelegate, this._onDidTriggerButton, this.onDidChangeCheckboxState));
         this._filter = this.instantiationService.createInstance(QuickInputTreeFilter);
+        this._sorter = this._register(( new QuickInputTreeSorter()));
         this._tree = this._register(this.instantiationService.createInstance((WorkbenchObjectTree), 'QuickInputTree', this._container, ( new QuickInputTreeDelegate()), [this._renderer], {
             accessibilityProvider: ( new QuickTreeAccessibilityProvider(this.onDidChangeCheckboxState)),
             horizontalScrolling: false,
@@ -43,31 +45,7 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
             expandOnDoubleClick: true,
             expandOnlyOnTwistieClick: true,
             disableExpandOnSpacebar: true,
-            sorter: {
-                compare: (a, b) => {
-                    if (a.label < b.label) {
-                        return -1;
-                    }
-                    else if (a.label > b.label) {
-                        return 1;
-                    }
-                    if (a.description && b.description) {
-                        if (a.description < b.description) {
-                            return -1;
-                        }
-                        else if (a.description > b.description) {
-                            return 1;
-                        }
-                    }
-                    else if (a.description) {
-                        return -1;
-                    }
-                    else if (b.description) {
-                        return 1;
-                    }
-                    return 0;
-                }
-            },
+            sorter: this._sorter,
             filter: this._filter
         }));
         this.registerOnOpenListener();
@@ -84,6 +62,13 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
     set displayed(value) {
         this._container.style.display = value ? '' : 'none';
     }
+    get sortByLabel() {
+        return this._sorter.sortByLabel;
+    }
+    set sortByLabel(value) {
+        this._sorter.sortByLabel = value;
+        this._tree.resort(null, true);
+    }
     getActiveDescendant() {
         return this._tree.getHTMLElement().getAttribute('aria-activedescendant');
     }
@@ -280,6 +265,10 @@ let QuickInputTreeController = class QuickInputTreeController extends Disposable
                 toUpdate.push(...update.children);
                 updated.add(update.element);
                 this._tree.rerender(update.element);
+                this._onDidChangeCheckboxState.fire({
+                    item: update.element,
+                    checked: update.element.checked
+                });
             }
         }
         if (fireCheckedChangeEvent) {

package/vscode/src/vs/platform/quickinput/browser/tree/quickInputTreeSorter.d.ts

@@ -0,0 +1,9 @@
+import { ITreeSorter } from "../../../../base/browser/ui/tree/tree.js";
+import { IQuickTreeItem } from "../../common/quickInput.js";
+import { Disposable } from "../../../../base/common/lifecycle.js";
+export declare class QuickInputTreeSorter extends Disposable implements ITreeSorter<IQuickTreeItem> {
+    private _sortByLabel;
+    get sortByLabel(): boolean;
+    set sortByLabel(value: boolean);
+    compare(a: IQuickTreeItem, b: IQuickTreeItem): number;
+}