@codingame/monaco-vscode-api 24.2.0 → 25.0.0

package/vscode/src/vs/base/browser/ui/findinput/findInput.d.ts

@@ -6,6 +6,8 @@ import { CaseSensitiveToggle, RegexToggle, WholeWordsToggle } from "./findInputT
 import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBoxMessage } from "../inputbox/inputBox.js";
 import { Widget } from "../widget.js";
 import { Event } from "../../../common/event.js";
+import { IAction } from "../../../common/actions.js";
+import type { IActionViewItemProvider } from "../actionbar/actionbar.js";
 import { IHistory } from "../../../common/history.js";
 import type { IHoverLifecycleOptions } from "../hover/hover.js";
 export interface IFindInputOptions {
@@ -21,6 +23,8 @@ export interface IFindInputOptions {
     readonly appendWholeWordsLabel?: string;
     readonly appendRegexLabel?: string;
     readonly additionalToggles?: Toggle[];
+    readonly actions?: ReadonlyArray<IAction>;
+    readonly actionViewItemProvider?: IActionViewItemProvider;
     readonly showHistoryHint?: () => boolean;
     readonly toggleStyles: IToggleStyles;
     readonly inputBoxStyles: IInputBoxStyles;
@@ -70,6 +74,7 @@ export declare class FindInput extends Widget {
     setFocusInputOnOptionClick(value: boolean): void;
     setEnabled(enabled: boolean): void;
     setAdditionalToggles(toggles: Toggle[] | undefined): void;
+    setActions(actions: ReadonlyArray<IAction> | undefined, actionViewItemProvider?: IActionViewItemProvider): void;
     private updateInputBoxPadding;
     clear(): void;
     getValue(): string;

package/vscode/src/vs/base/browser/ui/findinput/findInput.js

@@ -58,7 +58,9 @@ class FindInput extends Widget {
             flexibleWidth,
             flexibleMaxHeight,
             inputBoxStyles: options.inputBoxStyles,
-            history: options.history
+            history: options.history,
+            actions: options.actions,
+            actionViewItemProvider: options.actionViewItemProvider
         })));
         if (this.showCommonFindToggles) {
             const hoverLifecycleOptions = options?.hoverLifecycleOptions || { groupId: 'find-input' };
@@ -228,6 +230,9 @@ class FindInput extends Widget {
         }
         this.updateInputBoxPadding();
     }
+    setActions(actions, actionViewItemProvider) {
+        this.inputBox.setActions(actions, actionViewItemProvider);
+    }
     updateInputBoxPadding(controlsHidden = false) {
         if (controlsHidden) {
             this.inputBox.paddingRight = 0;

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.d.ts

@@ -1,4 +1,5 @@
 import { IHistoryNavigationWidget } from "../../history.js";
+import { IActionViewItemProvider } from "../actionbar/actionbar.js";
 import { IContextViewProvider } from "../contextview/contextview.js";
 import { Widget } from "../widget.js";
 import { IAction } from "../../../common/actions.js";
@@ -15,6 +16,7 @@ export interface IInputOptions {
     readonly flexibleWidth?: boolean;
     readonly flexibleMaxHeight?: number;
     readonly actions?: ReadonlyArray<IAction>;
+    readonly actionViewItemProvider?: IActionViewItemProvider;
     readonly inputBoxStyles: IInputBoxStyles;
     readonly history?: IHistory<string>;
 }
@@ -76,6 +78,7 @@ export declare class InputBox extends Widget {
     private _onDidHeightChange;
     get onDidHeightChange(): Event<number>;
     constructor(container: HTMLElement, contextViewProvider: IContextViewProvider | undefined, options: IInputOptions);
+    setActions(actions: ReadonlyArray<IAction> | undefined, actionViewItemProvider?: IActionViewItemProvider): void;
     protected onBlur(): void;
     protected onFocus(): void;
     setPlaceHolder(placeHolder: string): void;

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js

@@ -108,11 +108,27 @@ class InputBox extends Widget {
         this._register(this.ignoreGesture(this.input));
         setTimeout(() => this.updateMirror(), 0);
         if (this.options.actions) {
-            this.actionbar = this._register(( new ActionBar(this.element)));
+            this.actionbar = this._register(( new ActionBar(this.element, {
+                actionViewItemProvider: this.options.actionViewItemProvider
+            })));
             this.actionbar.push(this.options.actions, { icon: true, label: false });
         }
         this.applyStyles();
     }
+    setActions(actions, actionViewItemProvider) {
+        if (this.actionbar) {
+            this.actionbar.clear();
+            if (actions) {
+                this.actionbar.push(actions, { icon: true, label: false });
+            }
+        }
+        else if (actions) {
+            this.actionbar = this._register(( new ActionBar(this.element, {
+                actionViewItemProvider: actionViewItemProvider ?? this.options.actionViewItemProvider
+            })));
+            this.actionbar.push(actions, { icon: true, label: false });
+        }
+    }
     onBlur() {
         this._hideMessage();
         if (this.options.showPlaceholderOnFocus) {

package/vscode/src/vs/base/browser/ui/list/list.css

@@ -8,6 +8,7 @@
 	height: 100%;
 	width: 100%;
 	white-space: nowrap;
+	overflow: hidden;
 }
 
 .monaco-list.mouse-support {

package/vscode/src/vs/base/browser/ui/toggle/toggle.d.ts

@@ -1,14 +1,16 @@
 import { IAction } from "../../../common/actions.js";
 import { Emitter, Event } from "../../../common/event.js";
+import { IMarkdownString } from "../../../common/htmlContent.js";
 import { ThemeIcon } from "../../../common/themables.js";
 import { IKeyboardEvent } from "../../keyboardEvent.js";
 import { BaseActionViewItem, IActionViewItemOptions } from "../actionbar/actionViewItems.js";
+import { IActionViewItemProvider } from "../actionbar/actionbar.js";
 import { IHoverLifecycleOptions } from "../hover/hover.js";
 import { Widget } from "../widget.js";
 export interface IToggleOpts extends IToggleStyles {
     readonly actionClassName?: string;
     readonly icon?: ThemeIcon;
-    readonly title: string;
+    readonly title: string | IMarkdownString | HTMLElement;
     readonly isChecked: boolean;
     readonly notFocusable?: boolean;
     readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
@@ -63,7 +65,7 @@ export declare class Toggle extends Widget {
     protected applyStyles(): void;
     enable(): void;
     disable(): void;
-    setTitle(newTitle: string): void;
+    setTitle(newTitle: string | IMarkdownString | HTMLElement): void;
     set visible(visible: boolean);
     get visible(): boolean;
 }
@@ -112,4 +114,12 @@ export declare class CheckboxActionViewItem extends BaseActionViewItem {
     blur(): void;
     setFocusable(focusable: boolean): void;
 }
+/**
+ * Creates an action view item provider that renders toggles for actions with a checked state
+ * and falls back to default button rendering for regular actions.
+ *
+ * @param toggleStyles - Optional styles to apply to toggle items
+ * @returns An IActionViewItemProvider that can be used with ActionBar
+ */
+export declare function createToggleActionViewItemProvider(toggleStyles?: IToggleStyles): IActionViewItemProvider;
 export {};

package/vscode/src/vs/base/browser/ui/toggle/toggle.js

@@ -2,9 +2,11 @@
 import { registerCss } from '../../../../../../../css.js';
 import { Codicon } from '../../../common/codicons.js';
 import { Emitter } from '../../../common/event.js';
+import { isMarkdownString } from '../../../common/htmlContent.js';
+import { stripIcons, getCodiconAriaLabel } from '../../../common/iconLabels.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import { ThemeIcon } from '../../../common/themables.js';
-import { createElement, isActiveElement, $, addDisposableListener, EventType } from '../../dom.js';
+import { createElement, isHTMLElement, isActiveElement, $, addDisposableListener, EventType } from '../../dom.js';
 import { BaseActionViewItem } from '../actionbar/actionViewItems.js';
 import { HoverStyle } from '../hover/hover.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
@@ -96,7 +98,7 @@ class Toggle extends Widget {
         }
         this.domNode = createElement('div');
         this._register(getBaseLayerHoverDelegate().setupDelayedHover(this.domNode, () => ({
-            content: this._title,
+            content: !isMarkdownString(this._title) && !isHTMLElement(this._title) ? stripIcons(this._title) : this._title,
             style: HoverStyle.Pointer,
         }), this._opts.hoverLifecycleOptions));
         this.domNode.classList.add(...classes);
@@ -173,7 +175,8 @@ class Toggle extends Widget {
     }
     setTitle(newTitle) {
         this._title = newTitle;
-        this.domNode.setAttribute('aria-label', newTitle);
+        const ariaLabel = typeof newTitle === 'string' ? newTitle : isMarkdownString(newTitle) ? newTitle.value : newTitle.textContent;
+        this.domNode.setAttribute('aria-label', getCodiconAriaLabel(ariaLabel));
     }
     set visible(visible) {
         this.domNode.style.display = visible ? '' : 'none';
@@ -374,5 +377,13 @@ class CheckboxActionViewItem extends BaseActionViewItem {
         this.toggle.domNode.tabIndex = focusable ? 0 : -1;
     }
 }
+function createToggleActionViewItemProvider(toggleStyles) {
+    return (action, options) => {
+        if (action.checked !== undefined) {
+            return ( new ToggleActionViewItem(null, action, { ...options, toggleStyles }));
+        }
+        return undefined;
+    };
+}
 
-export { Checkbox, CheckboxActionViewItem, Toggle, ToggleActionViewItem, TriStateCheckbox, unthemedToggleStyles };
+export { Checkbox, CheckboxActionViewItem, Toggle, ToggleActionViewItem, TriStateCheckbox, createToggleActionViewItemProvider, unthemedToggleStyles };

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js

@@ -178,6 +178,7 @@ class ToolBar extends Disposable {
         if (this.actionBar.isEmpty()) {
             return;
         }
+        containerWidth = Math.max(containerWidth, parseInt(this.element.style.minWidth));
         const actionBarWidth = () => this.actionBar.length() * ACTION_MIN_WIDTH;
         if (actionBarWidth() <= containerWidth && this.hiddenActions.length === 0) {
             return;

package/vscode/src/vs/base/browser/ui/tree/abstractTree.d.ts

@@ -369,6 +369,7 @@ export declare abstract class AbstractTree<T, TFilterData, TRef> implements IDis
     get onDidChangeSelection(): Event<ITreeEvent<T>>;
     get onMouseClick(): Event<ITreeMouseEvent<T>>;
     get onMouseDblClick(): Event<ITreeMouseEvent<T>>;
+    get onMouseMiddleClick(): Event<ITreeMouseEvent<T>>;
     get onMouseOver(): Event<ITreeMouseEvent<T>>;
     get onMouseOut(): Event<ITreeMouseEvent<T>>;
     get onContextMenu(): Event<ITreeContextMenuEvent<T>>;

package/vscode/src/vs/base/browser/ui/tree/abstractTree.js

@@ -1897,6 +1897,7 @@ class AbstractTree {
     get onDidChangeSelection() { return this.eventBufferer.wrapEvent(this.selection.onDidChange); }
     get onMouseClick() { return ( Event.map(this.view.onMouseClick, asTreeMouseEvent)); }
     get onMouseDblClick() { return Event.filter(( Event.map(this.view.onMouseDblClick, asTreeMouseEvent)), e => e.target !== TreeMouseEventTarget.Filter); }
+    get onMouseMiddleClick() { return Event.filter(( Event.map(this.view.onMouseMiddleClick, asTreeMouseEvent)), e => e.target !== TreeMouseEventTarget.Filter); }
     get onMouseOver() { return ( Event.map(this.view.onMouseOver, asTreeMouseEvent)); }
     get onMouseOut() { return ( Event.map(this.view.onMouseOut, asTreeMouseEvent)); }
     get onContextMenu() { return Event.any(Event.filter(( Event.map(this.view.onContextMenu, asTreeContextMenuEvent)), e => !e.isStickyScroll), this.stickyScrollController?.onContextMenu ?? Event.None); }

package/vscode/src/vs/base/common/actions.d.ts

@@ -107,7 +107,7 @@ export declare class Separator implements IAction {
     readonly tooltip: string;
     readonly class: string;
     readonly enabled: boolean;
-    readonly checked: boolean;
+    readonly checked: undefined;
     run(): Promise<void>;
 }
 export declare class SubmenuAction implements IAction {

package/vscode/src/vs/base/common/actions.js

@@ -117,7 +117,7 @@ class Separator {
         this.tooltip = '';
         this.class = 'separator';
         this.enabled = false;
-        this.checked = false;
+        this.checked = undefined;
     }
     static join(...actionLists) {
         let out = [];

package/vscode/src/vs/base/common/codicons.d.ts

@@ -324,6 +324,7 @@ export declare const Codicon: {
     readonly italic: ThemeIcon;
     readonly jersey: ThemeIcon;
     readonly json: ThemeIcon;
+    readonly bracket: ThemeIcon;
     readonly kebabVertical: ThemeIcon;
     readonly key: ThemeIcon;
     readonly law: ThemeIcon;
@@ -550,7 +551,6 @@ export declare const Codicon: {
     readonly graphLine: ThemeIcon;
     readonly graphScatter: ThemeIcon;
     readonly pieChart: ThemeIcon;
-    readonly bracket: ThemeIcon;
     readonly bracketDot: ThemeIcon;
     readonly bracketError: ThemeIcon;
     readonly lockSmall: ThemeIcon;
@@ -681,7 +681,6 @@ export declare const Codicon: {
     readonly cursor: ThemeIcon;
     readonly eraser: ThemeIcon;
     readonly fileText: ThemeIcon;
-    readonly gitLens: ThemeIcon;
     readonly quotes: ThemeIcon;
     readonly rename: ThemeIcon;
     readonly runWithDeps: ThemeIcon;
@@ -711,4 +710,8 @@ export declare const Codicon: {
     readonly collectionSmall: ThemeIcon;
     readonly vmSmall: ThemeIcon;
     readonly cloudSmall: ThemeIcon;
+    readonly addSmall: ThemeIcon;
+    readonly removeSmall: ThemeIcon;
+    readonly worktreeSmall: ThemeIcon;
+    readonly worktree: ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.d.ts

@@ -250,6 +250,7 @@ export declare const codiconsLibrary: {
     readonly italic: import("./themables.js").ThemeIcon;
     readonly jersey: import("./themables.js").ThemeIcon;
     readonly json: import("./themables.js").ThemeIcon;
+    readonly bracket: import("./themables.js").ThemeIcon;
     readonly kebabVertical: import("./themables.js").ThemeIcon;
     readonly key: import("./themables.js").ThemeIcon;
     readonly law: import("./themables.js").ThemeIcon;
@@ -476,7 +477,6 @@ export declare const codiconsLibrary: {
     readonly graphLine: import("./themables.js").ThemeIcon;
     readonly graphScatter: import("./themables.js").ThemeIcon;
     readonly pieChart: import("./themables.js").ThemeIcon;
-    readonly bracket: import("./themables.js").ThemeIcon;
     readonly bracketDot: import("./themables.js").ThemeIcon;
     readonly bracketError: import("./themables.js").ThemeIcon;
     readonly lockSmall: import("./themables.js").ThemeIcon;
@@ -607,7 +607,6 @@ export declare const codiconsLibrary: {
     readonly cursor: import("./themables.js").ThemeIcon;
     readonly eraser: import("./themables.js").ThemeIcon;
     readonly fileText: import("./themables.js").ThemeIcon;
-    readonly gitLens: import("./themables.js").ThemeIcon;
     readonly quotes: import("./themables.js").ThemeIcon;
     readonly rename: import("./themables.js").ThemeIcon;
     readonly runWithDeps: import("./themables.js").ThemeIcon;
@@ -637,4 +636,8 @@ export declare const codiconsLibrary: {
     readonly collectionSmall: import("./themables.js").ThemeIcon;
     readonly vmSmall: import("./themables.js").ThemeIcon;
     readonly cloudSmall: import("./themables.js").ThemeIcon;
+    readonly addSmall: import("./themables.js").ThemeIcon;
+    readonly removeSmall: import("./themables.js").ThemeIcon;
+    readonly worktreeSmall: import("./themables.js").ThemeIcon;
+    readonly worktree: import("./themables.js").ThemeIcon;
 };

package/vscode/src/vs/base/common/codiconsLibrary.js

@@ -253,6 +253,7 @@ const codiconsLibrary = {
     italic: register('italic', 0xeb0d),
     jersey: register('jersey', 0xeb0e),
     json: register('json', 0xeb0f),
+    bracket: register('bracket', 0xeb0f),
     kebabVertical: register('kebab-vertical', 0xeb10),
     key: register('key', 0xeb11),
     law: register('law', 0xeb12),
@@ -479,7 +480,6 @@ const codiconsLibrary = {
     graphLine: register('graph-line', 0xebe2),
     graphScatter: register('graph-scatter', 0xebe3),
     pieChart: register('pie-chart', 0xebe4),
-    bracket: register('bracket', 0xeb0f),
     bracketDot: register('bracket-dot', 0xebe5),
     bracketError: register('bracket-error', 0xebe6),
     lockSmall: register('lock-small', 0xebe7),
@@ -610,7 +610,6 @@ const codiconsLibrary = {
     cursor: register('cursor', 0xec5c),
     eraser: register('eraser', 0xec5d),
     fileText: register('file-text', 0xec5e),
-    gitLens: register('git-lens', 0xec5f),
     quotes: register('quotes', 0xec60),
     rename: register('rename', 0xec61),
     runWithDeps: register('run-with-deps', 0xec62),
@@ -640,6 +639,10 @@ const codiconsLibrary = {
     collectionSmall: register('collection-small', 0xec78),
     vmSmall: register('vm-small', 0xec79),
     cloudSmall: register('cloud-small', 0xec7a),
+    addSmall: register('add-small', 0xec7b),
+    removeSmall: register('remove-small', 0xec7c),
+    worktreeSmall: register('worktree-small', 0xec7d),
+    worktree: register('worktree', 0xec7e),
 };
 
 export { codiconsLibrary };

package/vscode/src/vs/base/common/date.js

@@ -195,37 +195,29 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         }
     }
 }
-function fromNowByDay(date, appendAgoLabel, useFullTimeWords) {
-    if (typeof date !== 'number') {
-        date = date.getTime();
-    }
-    const todayMidnightTime = ( new Date());
-    todayMidnightTime.setHours(0, 0, 0, 0);
-    const yesterdayMidnightTime = ( new Date(todayMidnightTime.getTime()));
-    yesterdayMidnightTime.setDate(yesterdayMidnightTime.getDate() - 1);
-    if (date > todayMidnightTime.getTime()) {
-        return localize(98, 'Today');
-    }
-    if (date > yesterdayMidnightTime.getTime()) {
-        return localize(99, 'Yesterday');
-    }
-    return fromNow(date, appendAgoLabel, useFullTimeWords);
-}
 function getDurationString(ms, useFullTimeWords) {
     const seconds = Math.abs(ms / 1000);
     if (seconds < 1) {
-        return localize(100, '{0}ms', ms);
+        return useFullTimeWords
+            ? ( localize(98, '{0} milliseconds', ms))
+            : ( localize(99, '{0}ms', ms));
     }
     if (seconds < minute) {
-        return localize(101, '{0}s', Math.round(ms) / 1000);
+        return useFullTimeWords
+            ? ( localize(100, '{0} seconds', Math.round(ms) / 1000))
+            : ( localize(101, '{0}s', Math.round(ms) / 1000));
     }
     if (seconds < hour) {
-        return localize(102, '{0} mins', Math.round(ms / (1000 * minute)));
+        return useFullTimeWords
+            ? ( localize(102, '{0} minutes', Math.round(ms / (1000 * minute))))
+            : ( localize(103, '{0} mins', Math.round(ms / (1000 * minute))));
     }
     if (seconds < day) {
-        return localize(103, '{0} hrs', Math.round(ms / (1000 * hour)));
+        return useFullTimeWords
+            ? ( localize(104, '{0} hours', Math.round(ms / (1000 * hour))))
+            : ( localize(105, '{0} hrs', Math.round(ms / (1000 * hour))));
     }
-    return localize(104, '{0} days', Math.round(ms / (1000 * day)));
+    return localize(106, '{0} days', Math.round(ms / (1000 * day)));
 }
 function toLocalISOString(date) {
     return date.getFullYear() +
@@ -290,4 +282,4 @@ const safeIntl = {
     }
 };
 
-export { fromNow, fromNowByDay, getDurationString, safeIntl, toLocalISOString };
+export { fromNow, getDurationString, safeIntl, toLocalISOString };

package/vscode/src/vs/base/common/equals.d.ts

@@ -1,24 +1,45 @@
+/** Represents a function that decides if two values are equal. */
 export type EqualityComparer<T> = (a: T, b: T) => boolean;
+export interface IEquatable<T> {
+    equals(other: T): boolean;
+}
 /**
  * Compares two items for equality using strict equality.
 */
-export declare const strictEquals: <T>(a: T, b: T) => boolean;
+export declare function strictEquals<T>(a: T, b: T): boolean;
+export declare function strictEqualsC<T>(): EqualityComparer<T>;
+/**
+ * Checks if the items of two arrays are equal.
+ * By default, strict equality is used to compare elements, but a custom equality comparer can be provided.
+ */
+export declare function arrayEquals<T>(a: readonly T[], b: readonly T[], itemEquals?: EqualityComparer<T>): boolean;
 /**
  * Checks if the items of two arrays are equal.
  * By default, strict equality is used to compare elements, but a custom equality comparer can be provided.
  */
-export declare function itemsEquals<T>(itemEquals?: EqualityComparer<T>): EqualityComparer<readonly T[]>;
+export declare function arrayEqualsC<T>(itemEquals?: EqualityComparer<T>): EqualityComparer<readonly T[]>;
+/**
+ * Drills into arrays (items ordered) and objects (keys unordered) and uses strict equality on everything else.
+*/
+export declare function structuralEquals<T>(a: T, b: T): boolean;
+export declare function structuralEqualsC<T>(): EqualityComparer<T>;
+/**
+ * `getStructuralKey(a) === getStructuralKey(b) <=> structuralEquals(a, b)`
+ * (assuming that a and b are not cyclic structures and nothing extends globalThis Array).
+*/
+export declare function getStructuralKey(t: unknown): string;
 /**
  * Two items are considered equal, if their stringified representations are equal.
 */
-export declare function jsonStringifyEquals<T>(): EqualityComparer<T>;
-export interface IEquatable<T> {
-    equals(other: T): boolean;
-}
+export declare function jsonStringifyEquals<T>(a: T, b: T): boolean;
+/**
+ * Two items are considered equal, if their stringified representations are equal.
+*/
+export declare function jsonStringifyEqualsC<T>(): EqualityComparer<T>;
 /**
  * Uses `item.equals(other)` to determine equality.
  */
-export declare function itemEquals<T extends IEquatable<T>>(): EqualityComparer<T>;
+export declare function thisEqualsC<T extends IEquatable<T>>(): EqualityComparer<T>;
 /**
  * Checks if two items are both null or undefined, or are equal according to the provided equality comparer.
 */
@@ -26,13 +47,23 @@ export declare function equalsIfDefined<T>(v1: T | undefined | null, v2: T | und
 /**
  * Returns an equality comparer that checks if two items are both null or undefined, or are equal according to the provided equality comparer.
 */
-export declare function equalsIfDefined<T>(equals: EqualityComparer<T>): EqualityComparer<T | undefined | null>;
+export declare function equalsIfDefinedC<T>(equals: EqualityComparer<T>): EqualityComparer<T | undefined | null>;
 /**
- * Drills into arrays (items ordered) and objects (keys unordered) and uses strict equality on everything else.
+ * Each function in this file which offers an equality comparison, has an accompanying
+ * `*C` variant which returns an EqualityComparer function.
+ *
+ * The `*C` variant allows for easier composition of equality comparers and improved type-inference.
 */
-export declare function structuralEquals<T>(a: T, b: T): boolean;
-/**
- * `getStructuralKey(a) === getStructuralKey(b) <=> structuralEquals(a, b)`
- * (assuming that a and b are not cyclic structures and nothing extends globalThis Array).
-*/
-export declare function getStructuralKey(t: unknown): string;
+export declare namespace equals {
+    const strict: typeof strictEquals;
+    const strictC: typeof strictEqualsC;
+    const array: typeof arrayEquals;
+    const arrayC: typeof arrayEqualsC;
+    const structural: typeof structuralEquals;
+    const structuralC: typeof structuralEqualsC;
+    const jsonStringify: typeof jsonStringifyEquals;
+    const jsonStringifyC: typeof jsonStringifyEqualsC;
+    const thisC: typeof thisEqualsC;
+    const ifDefined: typeof equalsIfDefined;
+    const ifDefinedC: typeof equalsIfDefinedC;
+}

package/vscode/src/vs/base/common/equals.js

@@ -1,30 +1,17 @@
 
-import { equals } from './arrays.js';
+import { equals as equals$1 } from './arrays.js';
 
-const strictEquals = (a, b) => a === b;
-function itemsEquals(itemEquals = strictEquals) {
-    return (a, b) => equals(a, b, itemEquals);
+function strictEquals(a, b) {
+    return a === b;
 }
-function itemEquals() {
-    return (a, b) => a.equals(b);
+function strictEqualsC() {
+    return (a, b) => a === b;
 }
-function equalsIfDefined(equalsOrV1, v2, equals) {
-    if (equals !== undefined) {
-        const v1 = equalsOrV1;
-        if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
-            return v2 === v1;
-        }
-        return equals(v1, v2);
-    }
-    else {
-        const equals = equalsOrV1;
-        return (v1, v2) => {
-            if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
-                return v2 === v1;
-            }
-            return equals(v1, v2);
-        };
-    }
+function arrayEquals(a, b, itemEquals) {
+    return equals$1(a, b, itemEquals ?? strictEquals);
+}
+function arrayEqualsC(itemEquals) {
+    return (a, b) => equals$1(a, b, itemEquals ?? strictEquals);
 }
 function structuralEquals(a, b) {
     if (a === b) {
@@ -64,6 +51,9 @@ function structuralEquals(a, b) {
     }
     return false;
 }
+function structuralEqualsC() {
+    return (a, b) => structuralEquals(a, b);
+}
 function getStructuralKey(t) {
     return JSON.stringify(toNormalizedJsonStructure(t));
 }
@@ -93,5 +83,42 @@ function toNormalizedJsonStructure(t) {
     }
     return t;
 }
+function jsonStringifyEquals(a, b) {
+    return JSON.stringify(a) === JSON.stringify(b);
+}
+function jsonStringifyEqualsC() {
+    return (a, b) => JSON.stringify(a) === JSON.stringify(b);
+}
+function thisEqualsC() {
+    return (a, b) => a.equals(b);
+}
+function equalsIfDefined(v1, v2, equals) {
+    if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
+        return v2 === v1;
+    }
+    return equals(v1, v2);
+}
+function equalsIfDefinedC(equals) {
+    return (v1, v2) => {
+        if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
+            return v2 === v1;
+        }
+        return equals(v1, v2);
+    };
+}
+var equals;
+(function (equals) {
+    equals.strict = strictEquals;
+    equals.strictC = strictEqualsC;
+    equals.array = arrayEquals;
+    equals.arrayC = arrayEqualsC;
+    equals.structural = structuralEquals;
+    equals.structuralC = structuralEqualsC;
+    equals.jsonStringify = jsonStringifyEquals;
+    equals.jsonStringifyC = jsonStringifyEqualsC;
+    equals.thisC = thisEqualsC;
+    equals.ifDefined = equalsIfDefined;
+    equals.ifDefinedC = equalsIfDefinedC;
+})(equals || (equals = {}));
 
-export { equalsIfDefined, getStructuralKey, itemEquals, itemsEquals, strictEquals, structuralEquals };
+export { arrayEquals, arrayEqualsC, equals, equalsIfDefined, equalsIfDefinedC, getStructuralKey, jsonStringifyEquals, jsonStringifyEqualsC, strictEquals, strictEqualsC, structuralEquals, structuralEqualsC, thisEqualsC };

package/vscode/src/vs/base/common/errorMessage.js

@@ -6,7 +6,7 @@ import { localize } from '../../nls.js';
 function exceptionToErrorMessage(exception, verbose) {
     if (verbose && (exception.stack || exception.stacktrace)) {
         return localize(
-            105,
+            107,
             "{0}: {1}",
             detectSystemErrorMessage(exception),
             stackToString(exception.stack) || stackToString(exception.stacktrace)
@@ -25,19 +25,19 @@ function detectSystemErrorMessage(exception) {
         return `${exception.message}. Please update the 'security.allowedUNCHosts' setting if you want to allow this host.`;
     }
     if (typeof exception.code === 'string' && typeof exception.errno === 'number' && typeof exception.syscall === 'string') {
-        return localize(106, "A system error occurred ({0})", exception.message);
+        return localize(108, "A system error occurred ({0})", exception.message);
     }
-    return exception.message || ( localize(107, "An unknown error occurred. Please consult the log for more details."));
+    return exception.message || ( localize(109, "An unknown error occurred. Please consult the log for more details."));
 }
 function toErrorMessage(error = null, verbose = false) {
     if (!error) {
-        return localize(107, "An unknown error occurred. Please consult the log for more details.");
+        return localize(109, "An unknown error occurred. Please consult the log for more details.");
     }
     if (Array.isArray(error)) {
         const errors = coalesce(error);
         const msg = toErrorMessage(errors[0], verbose);
         if (errors.length > 1) {
-            return localize(108, "{0} ({1} errors in total)", msg, errors.length);
+            return localize(110, "{0} ({1} errors in total)", msg, errors.length);
         }
         return msg;
     }
@@ -59,7 +59,7 @@ function toErrorMessage(error = null, verbose = false) {
     if (error.message) {
         return error.message;
     }
-    return localize(107, "An unknown error occurred. Please consult the log for more details.");
+    return localize(109, "An unknown error occurred. Please consult the log for more details.");
 }
 function isErrorWithActions(obj) {
     const candidate = obj;