@codingame/monaco-vscode-api 27.0.0 → 28.0.0

package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js

@@ -49,6 +49,12 @@ class SelectListRenderer {
         } else {
             data.root.classList.remove("option-disabled");
         }
+        if (element.isSeparator) {
+            data.root.classList.add("option-separator");
+            data.root.classList.add("option-disabled");
+        } else {
+            data.root.classList.remove("option-separator");
+        }
     }
     disposeTemplate(_templateData) {}
 }
@@ -300,12 +306,12 @@ class SelectBoxList extends Disposable {
         }
         if (this.styles.listFocusOutline) {
             content.push(
-                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.focused { outline: 1.6px dotted ${this.styles.listFocusOutline} !important; outline-offset: -1.6px !important; }`
+                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.focused { outline: 1px solid ${this.styles.listFocusOutline} !important; outline-offset: -1px !important; }`
             );
         }
         if (this.styles.listHoverOutline) {
             content.push(
-                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row:not(.option-disabled):not(.focused):hover { outline: 1.6px dashed ${this.styles.listHoverOutline} !important; outline-offset: -1.6px !important; }`
+                `.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row:not(.option-disabled):not(.focused):hover { outline: 1px solid ${this.styles.listHoverOutline} !important; outline-offset: -1px !important; }`
             );
         }
         content.push(
@@ -327,11 +333,9 @@ class SelectBoxList extends Disposable {
     styleList() {
         const background = this.styles.selectBackground ?? "";
         const listBackground = asCssValueWithDefault(this.styles.selectListBackground, background);
+        this.selectDropDownContainer.style.backgroundColor = listBackground;
         this.selectDropDownListContainer.style.backgroundColor = listBackground;
         this.selectionDetailsPane.style.backgroundColor = listBackground;
-        const optionsBorder = this.styles.focusBorder ?? "";
-        this.selectDropDownContainer.style.outlineColor = optionsBorder;
-        this.selectDropDownContainer.style.outlineOffset = "-1px";
         this.selectList.style(this.styles);
     }
     createOption(value, index, disabled) {
@@ -387,6 +391,10 @@ class SelectBoxList extends Disposable {
     }
     renderSelectDropDown(container, preLayoutPosition) {
         container.appendChild(this.selectDropDownContainer);
+        const computedFontSize = getWindow(this.selectElement).getComputedStyle(this.selectElement).fontSize;
+        if (computedFontSize) {
+            this.selectDropDownContainer.style.fontSize = computedFontSize;
+        }
         this.layoutSelectDropDown(preLayoutPosition);
         return {
             dispose: () => {
@@ -525,6 +533,9 @@ class SelectBoxList extends Disposable {
                 mouseSupport: false,
                 accessibilityProvider: {
                     getAriaLabel: element => {
+                        if (element.isSeparator) {
+                            return localize(30, "separator");
+                        }
                         let label = element.text;
                         if (element.detail) {
                             label += `. ${element.detail}`;
@@ -537,7 +548,7 @@ class SelectBoxList extends Disposable {
                         }
                         return label;
                     },
-                    getWidgetAriaLabel: () => ( localize(30, "Select Box")),
+                    getWidgetAriaLabel: () => ( localize(31, "Select Box")),
                     getRole: () => isMacintosh ? "" : "option",
                     getWidgetRole: () => "listbox"
                 }
@@ -585,9 +596,9 @@ class SelectBoxList extends Disposable {
             EventType.POINTER_UP,
             e => this.onPointerUp(e)
         ));
-        this._register(
-            this.selectList.onMouseOver(e => typeof e.index !== "undefined" && this.selectList.setFocus([e.index]))
-        );
+        this._register(this.selectList.onMouseOver(
+            e => typeof e.index !== "undefined" && !this.options[e.index]?.isDisabled && this.selectList.setFocus([e.index])
+        ));
         this._register(this.selectList.onDidChangeFocus(e => this.onListFocus(e)));
         this._register(
             addDisposableListener(this.selectDropDownContainer, EventType.FOCUS_OUT, e => {
@@ -703,6 +714,10 @@ class SelectBoxList extends Disposable {
     }
     onEnter(e) {
         EventHelper.stop(e);
+        if (this.options[this.selected]?.isDisabled) {
+            this.hideSelectDropDown(true);
+            return;
+        }
         if (this.selected !== this._currentSelection) {
             this._currentSelection = this.selected;
             this._onDidSelect.fire({
@@ -718,14 +733,14 @@ class SelectBoxList extends Disposable {
     onDownArrow(e) {
         if (this.selected < this.options.length - 1) {
             EventHelper.stop(e, true);
-            const nextOptionDisabled = this.options[this.selected + 1].isDisabled;
-            if (nextOptionDisabled && this.options.length > this.selected + 2) {
-                this.selected += 2;
-            } else if (nextOptionDisabled) {
+            let next = this.selected + 1;
+            while (next < this.options.length && this.options[next].isDisabled) {
+                next++;
+            }
+            if (next >= this.options.length) {
                 return;
-            } else {
-                this.selected++;
             }
+            this.selected = next;
             this.select(this.selected);
             this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selectList.getFocus()[0]);
@@ -734,12 +749,14 @@ class SelectBoxList extends Disposable {
     onUpArrow(e) {
         if (this.selected > 0) {
             EventHelper.stop(e, true);
-            const previousOptionDisabled = this.options[this.selected - 1].isDisabled;
-            if (previousOptionDisabled && this.selected > 1) {
-                this.selected -= 2;
-            } else {
-                this.selected--;
+            let prev = this.selected - 1;
+            while (prev >= 0 && this.options[prev].isDisabled) {
+                prev--;
+            }
+            if (prev < 0) {
+                return;
             }
+            this.selected = prev;
             this.select(this.selected);
             this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selectList.getFocus()[0]);
@@ -749,11 +766,15 @@ class SelectBoxList extends Disposable {
         EventHelper.stop(e);
         this.selectList.focusPreviousPage();
         setTimeout(() => {
-            this.selected = this.selectList.getFocus()[0];
-            if (this.options[this.selected].isDisabled && this.selected < this.options.length - 1) {
-                this.selected++;
-                this.selectList.setFocus([this.selected]);
+            let candidate = this.selectList.getFocus()[0];
+            while (candidate > 0 && this.options[candidate].isDisabled) {
+                candidate--;
             }
+            if (this.options[candidate].isDisabled) {
+                return;
+            }
+            this.selected = candidate;
+            this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selected);
             this.select(this.selected);
         }, 1);
@@ -762,11 +783,15 @@ class SelectBoxList extends Disposable {
         EventHelper.stop(e);
         this.selectList.focusNextPage();
         setTimeout(() => {
-            this.selected = this.selectList.getFocus()[0];
-            if (this.options[this.selected].isDisabled && this.selected > 0) {
-                this.selected--;
-                this.selectList.setFocus([this.selected]);
+            let candidate = this.selectList.getFocus()[0];
+            while (candidate < this.options.length - 1 && this.options[candidate].isDisabled) {
+                candidate++;
             }
+            if (this.options[candidate].isDisabled) {
+                return;
+            }
+            this.selected = candidate;
+            this.selectList.setFocus([this.selected]);
             this.selectList.reveal(this.selected);
             this.select(this.selected);
         }, 1);
@@ -776,10 +801,14 @@ class SelectBoxList extends Disposable {
         if (this.options.length < 2) {
             return;
         }
-        this.selected = 0;
-        if (this.options[this.selected].isDisabled && this.selected > 1) {
-            this.selected++;
+        let candidate = 0;
+        while (candidate < this.options.length - 1 && this.options[candidate].isDisabled) {
+            candidate++;
+        }
+        if (this.options[candidate].isDisabled) {
+            return;
         }
+        this.selected = candidate;
         this.selectList.setFocus([this.selected]);
         this.selectList.reveal(this.selected);
         this.select(this.selected);
@@ -789,10 +818,14 @@ class SelectBoxList extends Disposable {
         if (this.options.length < 2) {
             return;
         }
-        this.selected = this.options.length - 1;
-        if (this.options[this.selected].isDisabled && this.selected > 1) {
-            this.selected--;
+        let candidate = this.options.length - 1;
+        while (candidate > 0 && this.options[candidate].isDisabled) {
+            candidate--;
+        }
+        if (this.options[candidate].isDisabled) {
+            return;
         }
+        this.selected = candidate;
         this.selectList.setFocus([this.selected]);
         this.selectList.reveal(this.selected);
         this.select(this.selected);

package/vscode/src/vs/base/browser/ui/selectBox/selectBoxNative.js

@@ -67,7 +67,9 @@ class SelectBoxNative extends Disposable {
             this.options = options;
             this.selectElement.options.length = 0;
             this.options.forEach((option, index) => {
-                this.selectElement.add(this.createOption(option.text, index, option.isDisabled));
+                this.selectElement.add(
+                    this.createOption(option.text, index, option.isDisabled, option.isSeparator)
+                );
             });
         }
         if (selected !== undefined) {
@@ -130,11 +132,14 @@ class SelectBoxNative extends Disposable {
             this.selectElement.style.borderColor = this.styles.selectBorder ?? "";
         }
     }
-    createOption(value, index, disabled) {
+    createOption(value, index, disabled, isSeparator) {
         const option = createElement("option");
         option.value = value;
         option.text = value;
-        option.disabled = !!disabled;
+        option.disabled = !!disabled || !!isSeparator;
+        if (isSeparator) {
+            option.setAttribute("role", "separator");
+        }
         return option;
     }
 }

package/vscode/src/vs/base/browser/ui/splitview/paneview.js

@@ -67,7 +67,7 @@ class Pane extends Disposable {
         return headerSize + maximumBodySize;
     }
     getAriaHeaderLabel(title) {
-        return localize(31, "{0} Section", title);
+        return localize(32, "{0} Section", title);
     }
     constructor(options) {
         super();

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

@@ -283,7 +283,7 @@ class ToggleMenuAction extends Action {
         this.ID = "toolbar.toggle.more";
     }
     constructor(toggleDropdownMenu, title) {
-        title = title || ( localize(32, "More Actions..."));
+        title = title || ( localize(33, "More Actions..."));
         super(ToggleMenuAction.ID, title, undefined, true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;

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

@@ -734,7 +734,7 @@ class FindWidget extends Disposable {
         }))))));
         const history = options?.history || [];
         this.findInput = this._register(( new FindInput(this.elements.findInput, contextViewProvider, {
-            label: ( localize(33, "Type to search")),
+            label: ( localize(34, "Type to search")),
             placeholder,
             additionalToggles: this.toggles,
             showCommonFindToggles: false,
@@ -772,7 +772,7 @@ class FindWidget extends Disposable {
                 return;
             }
         }));
-        const closeAction = this._register(( new Action("close", ( localize(34, "Close")), "codicon codicon-close", true, () => this.dispose())));
+        const closeAction = this._register(( new Action("close", ( localize(35, "Close")), "codicon codicon-close", true, () => this.dispose())));
         this.actionbar.push(closeAction, {
             icon: true,
             label: false
@@ -841,7 +841,7 @@ class AbstractFindController {
         this.enabledDisposables = ( new DisposableStore());
         this.disposables = ( new DisposableStore());
         this.toggles = ( new FindToggles(options.toggles ?? []));
-        this._placeholder = options.placeholder ?? ( localize(33, "Type to search"));
+        this._placeholder = options.placeholder ?? ( localize(34, "Type to search"));
     }
     isOpened() {
         return !!this.widget;
@@ -908,7 +908,7 @@ class AbstractFindController {
             if (this.tree.options.showNotFoundMessage ?? true) {
                 this.widget?.showMessage({
                     type: MessageType.WARNING,
-                    content: warningMessage ?? ( localize(35, "No results found."))
+                    content: warningMessage ?? ( localize(36, "No results found."))
                 });
             } else {
                 this.widget?.showMessage({
@@ -921,9 +921,9 @@ class AbstractFindController {
     }
     alertResults(results) {
         if (!results) {
-            alert(( localize(36, "No results")));
+            alert(( localize(37, "No results")));
         } else {
-            alert(( localize(37, "{0} results", results)));
+            alert(( localize(38, "{0} results", results)));
         }
     }
     dispose() {
@@ -943,7 +943,7 @@ class FindController extends AbstractFindController {
         }
         const isFilterMode = mode === TreeFindMode.Filter;
         this.updateToggleState(DefaultTreeToggles.Mode, isFilterMode);
-        this.placeholder = isFilterMode ? ( localize(38, "Type to filter")) : ( localize(33, "Type to search"));
+        this.placeholder = isFilterMode ? ( localize(39, "Type to filter")) : ( localize(34, "Type to search"));
         this.filter.findMode = mode;
         this.tree.refilter();
         this.render();
@@ -968,12 +968,12 @@ class FindController extends AbstractFindController {
         const toggleContributions = [{
             id: DefaultTreeToggles.Mode,
             icon: Codicon.listFilter,
-            title: ( localize(39, "Filter")),
+            title: ( localize(40, "Filter")),
             isChecked: defaultFindMode === TreeFindMode.Filter
         }, {
             id: DefaultTreeToggles.MatchType,
             icon: Codicon.searchFuzzy,
-            title: ( localize(40, "Fuzzy Match")),
+            title: ( localize(41, "Fuzzy Match")),
             isChecked: defaultFindMatchType === TreeFindMatchType.Fuzzy
         }];
         filter.findMatchType = defaultFindMatchType;
@@ -2692,7 +2692,7 @@ class AbstractTree {
                     deep
                 } = e;
                 if (node.collapsible && !deep && this.isDOMFocused()) {
-                    alert(node.collapsed ? ( localize(41, "collapsed")) : ( localize(42, "expanded")));
+                    alert(node.collapsed ? ( localize(42, "collapsed")) : ( localize(43, "expanded")));
                 }
             }));
         }

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

@@ -291,7 +291,7 @@ class AsyncFindController extends FindController {
         this.toggles.set(e.id, e.isChecked);
         this.filter.findMode = this.mode;
         this.filter.findMatchType = this.matchType;
-        this.placeholder = this.mode === TreeFindMode.Filter ? ( localize(43, "Type to filter")) : ( localize(44, "Type to search"));
+        this.placeholder = this.mode === TreeFindMode.Filter ? ( localize(44, "Type to filter")) : ( localize(45, "Type to search"));
         this.applyPattern(this.pattern);
     }
     shouldAllowFocus(node) {

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

@@ -4,7 +4,7 @@ import { localize } from '../../../../nls.js';
 
 class CollapseAllAction extends Action {
     constructor(viewer, enabled) {
-        super("vs.tree.collapse", ( localize(45, "Collapse All")), "collapse-all", enabled);
+        super("vs.tree.collapse", ( localize(46, "Collapse All")), "collapse-all", enabled);
         this.viewer = viewer;
     }
     async run() {

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

@@ -101,6 +101,10 @@ export declare class Separator implements IAction {
      * Joins all non-empty lists of actions with separators.
      */
     static join(...actionLists: readonly IAction[][]): IAction[];
+    /**
+     * Removes leading, trailing, and consecutive duplicate separators in-place and returns the actions.
+     */
+    static clean(actions: IAction[]): IAction[];
     static readonly ID = "vs.actions.separator";
     readonly id: string;
     readonly label: string;

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

@@ -151,6 +151,20 @@ class Separator {
         }
         return out;
     }
+    static clean(actions) {
+        while (actions.length > 0 && actions[0].id === Separator.ID) {
+            actions.shift();
+        }
+        while (actions.length > 0 && actions[actions.length - 1].id === Separator.ID) {
+            actions.pop();
+        }
+        for (let i = actions.length - 2; i >= 0; i--) {
+            if (actions[i].id === Separator.ID && actions[i + 1].id === Separator.ID) {
+                actions.splice(i + 1, 1);
+            }
+        }
+        return actions;
+    }
     static {
         this.ID = "vs.actions.separator";
     }
@@ -176,7 +190,7 @@ class EmptySubmenuAction extends Action {
         this.ID = "vs.actions.empty";
     }
     constructor() {
-        super(EmptySubmenuAction.ID, ( localize(46, "(empty)")), undefined, false);
+        super(EmptySubmenuAction.ID, ( localize(47, "(empty)")), undefined, false);
     }
 }
 function toAction(props) {

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

@@ -11,32 +11,32 @@ const month = day * 30;
 const year = day * 365;
 function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
     if (typeof date === "undefined") {
-        return localize(47, "unknown");
+        return localize(48, "unknown");
     }
     if (typeof date !== "number") {
         date = date.getTime();
     }
     const seconds = Math.round((( new Date()).getTime() - date) / 1000);
     if (seconds < -30) {
-        return localize(48, "in {0}", fromNow(( new Date()).getTime() + seconds * 1000, false));
+        return localize(49, "in {0}", fromNow(( new Date()).getTime() + seconds * 1000, false));
     }
     if (!disallowNow && seconds < 30) {
-        return localize(49, "now");
+        return localize(50, "now");
     }
     let value;
     if (seconds < minute) {
         value = seconds;
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(50, "{0} second ago", value)) : ( localize(51, "{0} sec ago", value));
+                return useFullTimeWords ? ( localize(51, "{0} second ago", value)) : ( localize(52, "{0} sec ago", value));
             } else {
-                return useFullTimeWords ? ( localize(52, "{0} seconds ago", value)) : ( localize(53, "{0} secs ago", value));
+                return useFullTimeWords ? ( localize(53, "{0} seconds ago", value)) : ( localize(54, "{0} secs ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(54, "{0} second", value)) : ( localize(55, "{0} sec", value));
+                return useFullTimeWords ? ( localize(55, "{0} second", value)) : ( localize(56, "{0} sec", value));
             } else {
-                return useFullTimeWords ? ( localize(56, "{0} seconds", value)) : ( localize(57, "{0} secs", value));
+                return useFullTimeWords ? ( localize(57, "{0} seconds", value)) : ( localize(58, "{0} secs", value));
             }
         }
     }
@@ -44,15 +44,15 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         value = Math.round(seconds / minute);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(58, "{0} minute ago", value)) : ( localize(59, "{0} min ago", value));
+                return useFullTimeWords ? ( localize(59, "{0} minute ago", value)) : ( localize(60, "{0} min ago", value));
             } else {
-                return useFullTimeWords ? ( localize(60, "{0} minutes ago", value)) : ( localize(61, "{0} mins ago", value));
+                return useFullTimeWords ? ( localize(61, "{0} minutes ago", value)) : ( localize(62, "{0} mins ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(62, "{0} minute", value)) : ( localize(63, "{0} min", value));
+                return useFullTimeWords ? ( localize(63, "{0} minute", value)) : ( localize(64, "{0} min", value));
             } else {
-                return useFullTimeWords ? ( localize(64, "{0} minutes", value)) : ( localize(65, "{0} mins", value));
+                return useFullTimeWords ? ( localize(65, "{0} minutes", value)) : ( localize(66, "{0} mins", value));
             }
         }
     }
@@ -60,39 +60,39 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         value = Math.round(seconds / hour);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(66, "{0} hour ago", value)) : ( localize(67, "{0} hr ago", value));
+                return useFullTimeWords ? ( localize(67, "{0} hour ago", value)) : ( localize(68, "{0} hr ago", value));
             } else {
-                return useFullTimeWords ? ( localize(68, "{0} hours ago", value)) : ( localize(69, "{0} hrs ago", value));
+                return useFullTimeWords ? ( localize(69, "{0} hours ago", value)) : ( localize(70, "{0} hrs ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(70, "{0} hour", value)) : ( localize(71, "{0} hr", value));
+                return useFullTimeWords ? ( localize(71, "{0} hour", value)) : ( localize(72, "{0} hr", value));
             } else {
-                return useFullTimeWords ? ( localize(72, "{0} hours", value)) : ( localize(73, "{0} hrs", value));
+                return useFullTimeWords ? ( localize(73, "{0} hours", value)) : ( localize(74, "{0} hrs", value));
             }
         }
     }
     if (seconds < week) {
         value = Math.round(seconds / day);
         if (appendAgoLabel) {
-            return value === 1 ? ( localize(74, "{0} day ago", value)) : ( localize(75, "{0} days ago", value));
+            return value === 1 ? ( localize(75, "{0} day ago", value)) : ( localize(76, "{0} days ago", value));
         } else {
-            return value === 1 ? ( localize(76, "{0} day", value)) : ( localize(77, "{0} days", value));
+            return value === 1 ? ( localize(77, "{0} day", value)) : ( localize(78, "{0} days", value));
         }
     }
     if (seconds < month) {
         value = Math.round(seconds / week);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(78, "{0} week ago", value)) : ( localize(79, "{0} wk ago", value));
+                return useFullTimeWords ? ( localize(79, "{0} week ago", value)) : ( localize(80, "{0} wk ago", value));
             } else {
-                return useFullTimeWords ? ( localize(80, "{0} weeks ago", value)) : ( localize(81, "{0} wks ago", value));
+                return useFullTimeWords ? ( localize(81, "{0} weeks ago", value)) : ( localize(82, "{0} wks ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(82, "{0} week", value)) : ( localize(83, "{0} wk", value));
+                return useFullTimeWords ? ( localize(83, "{0} week", value)) : ( localize(84, "{0} wk", value));
             } else {
-                return useFullTimeWords ? ( localize(84, "{0} weeks", value)) : ( localize(85, "{0} wks", value));
+                return useFullTimeWords ? ( localize(85, "{0} weeks", value)) : ( localize(86, "{0} wks", value));
             }
         }
     }
@@ -100,48 +100,48 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         value = Math.round(seconds / month);
         if (appendAgoLabel) {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(86, "{0} month ago", value)) : ( localize(87, "{0} mo ago", value));
+                return useFullTimeWords ? ( localize(87, "{0} month ago", value)) : ( localize(88, "{0} mo ago", value));
             } else {
-                return useFullTimeWords ? ( localize(88, "{0} months ago", value)) : ( localize(89, "{0} mos ago", value));
+                return useFullTimeWords ? ( localize(89, "{0} months ago", value)) : ( localize(90, "{0} mos ago", value));
             }
         } else {
             if (value === 1) {
-                return useFullTimeWords ? ( localize(90, "{0} month", value)) : ( localize(91, "{0} mo", value));
+                return useFullTimeWords ? ( localize(91, "{0} month", value)) : ( localize(92, "{0} mo", value));
             } else {
-                return useFullTimeWords ? ( localize(92, "{0} months", value)) : ( localize(93, "{0} mos", value));
+                return useFullTimeWords ? ( localize(93, "{0} months", value)) : ( localize(94, "{0} mos", value));
             }
         }
     }
     value = Math.round(seconds / year);
     if (appendAgoLabel) {
         if (value === 1) {
-            return useFullTimeWords ? ( localize(94, "{0} year ago", value)) : ( localize(95, "{0} yr ago", value));
+            return useFullTimeWords ? ( localize(95, "{0} year ago", value)) : ( localize(96, "{0} yr ago", value));
         } else {
-            return useFullTimeWords ? ( localize(96, "{0} years ago", value)) : ( localize(97, "{0} yrs ago", value));
+            return useFullTimeWords ? ( localize(97, "{0} years ago", value)) : ( localize(98, "{0} yrs ago", value));
         }
     } else {
         if (value === 1) {
-            return useFullTimeWords ? ( localize(98, "{0} year", value)) : ( localize(99, "{0} yr", value));
+            return useFullTimeWords ? ( localize(99, "{0} year", value)) : ( localize(100, "{0} yr", value));
         } else {
-            return useFullTimeWords ? ( localize(100, "{0} years", value)) : ( localize(101, "{0} yrs", value));
+            return useFullTimeWords ? ( localize(101, "{0} years", value)) : ( localize(102, "{0} yrs", value));
         }
     }
 }
 function getDurationString(ms, useFullTimeWords) {
     const seconds = Math.abs(ms / 1000);
     if (seconds < 1) {
-        return useFullTimeWords ? ( localize(102, "{0} milliseconds", ms)) : ( localize(103, "{0}ms", ms));
+        return useFullTimeWords ? ( localize(103, "{0} milliseconds", ms)) : ( localize(104, "{0}ms", ms));
     }
     if (seconds < minute) {
-        return useFullTimeWords ? ( localize(104, "{0} seconds", Math.round(ms) / 1000)) : ( localize(105, "{0}s", Math.round(ms) / 1000));
+        return useFullTimeWords ? ( localize(105, "{0} seconds", Math.round(ms) / 1000)) : ( localize(106, "{0}s", Math.round(ms) / 1000));
     }
     if (seconds < hour) {
-        return useFullTimeWords ? ( localize(106, "{0} minutes", Math.round(ms / (1000 * minute)))) : ( localize(107, "{0} mins", Math.round(ms / (1000 * minute))));
+        return useFullTimeWords ? ( localize(107, "{0} minutes", Math.round(ms / (1000 * minute)))) : ( localize(108, "{0} mins", Math.round(ms / (1000 * minute))));
     }
     if (seconds < day) {
-        return useFullTimeWords ? ( localize(108, "{0} hours", Math.round(ms / (1000 * hour)))) : ( localize(109, "{0} hrs", Math.round(ms / (1000 * hour))));
+        return useFullTimeWords ? ( localize(109, "{0} hours", Math.round(ms / (1000 * hour)))) : ( localize(110, "{0} hrs", Math.round(ms / (1000 * hour))));
     }
-    return localize(110, "{0} days", Math.round(ms / (1000 * day)));
+    return localize(111, "{0} days", Math.round(ms / (1000 * day)));
 }
 function toLocalISOString(date) {
     return date.getFullYear() + "-" + String(date.getMonth() + 1).padStart(2, "0") + "-" + String(date.getDate()).padStart(2, "0") + "T" + String(date.getHours()).padStart(2, "0") + ":" + String(date.getMinutes()).padStart(2, "0") + ":" + String(date.getSeconds()).padStart(2, "0") + "." + (date.getMilliseconds() / 1000).toFixed(3).slice(2, 5) + "Z";

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(
-            111,
+            112,
             "{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(112, "A system error occurred ({0})", exception.message);
+        return localize(113, "A system error occurred ({0})", exception.message);
     }
-    return exception.message || ( localize(113, "An unknown error occurred. Please consult the log for more details."));
+    return exception.message || ( localize(114, "An unknown error occurred. Please consult the log for more details."));
 }
 function toErrorMessage(error = null, verbose = false) {
     if (!error) {
-        return localize(113, "An unknown error occurred. Please consult the log for more details.");
+        return localize(114, "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(114, "{0} ({1} errors in total)", msg, errors.length);
+            return localize(115, "{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(113, "An unknown error occurred. Please consult the log for more details.");
+    return localize(114, "An unknown error occurred. Please consult the log for more details.");
 }
 function isErrorWithActions(obj) {
     const candidate = obj;

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

@@ -198,6 +198,7 @@ export declare namespace Event {
      * returned event causes this utility to leak a listener on the original event.
      *
      * @param event The event source for the new event.
+     * @param debugName A name for this buffer, used in leak detection warnings.
      * @param flushAfterTimeout Determines whether to flush the buffer after a timeout immediately or after a
      * `setTimeout` when the first event listener is added.
      * @param _buffer Internal: A source event array used for tests.
@@ -207,10 +208,10 @@ export declare namespace Event {
      * // Start accumulating events, when the first listener is attached, flush
      * // the event after a timeout such that multiple listeners attached before
      * // the timeout would receive the event
-     * this.onInstallExtension = Event.buffer(service.onInstallExtension, true);
+     * this.onInstallExtension = Event.buffer(service.onInstallExtension, 'onInstallExtension', true);
      * ```
      */
-    function buffer<T>(event: Event<T>, flushAfterTimeout?: boolean, _buffer?: T[], disposable?: DisposableStore): Event<T>;
+    function buffer<T>(event: Event<T>, debugName: string, flushAfterTimeout?: boolean, _buffer?: T[], disposable?: DisposableStore): Event<T>;
     /**
      * Wraps the event in an {@link IChainableEvent}, allowing a more functional programming style.
      *