@codingame/monaco-vscode-api 2.2.2 → 3.0.0

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

@@ -5,6 +5,7 @@ import { setupNativeHover, setupCustomHover } from './iconLabelHover.js';
 import { Disposable } from '../../../common/lifecycle.js';
 import { equals } from '../../../common/objects.js';
 import { Range } from '../../../common/range.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
 class FastLabelNode {
     constructor(_element) {
         this._element = _element;
@@ -51,7 +52,7 @@ class IconLabel extends Disposable {
         else {
             this.nameNode = ( new Label(this.nameContainer));
         }
-        this.hoverDelegate = options?.hoverDelegate;
+        this.hoverDelegate = options?.hoverDelegate ?? getDefaultHoverDelegate('mouse');
     }
     get element() {
         return this.domNode.element;
@@ -114,7 +115,7 @@ class IconLabel extends Disposable {
             htmlElement.removeAttribute('title');
             return;
         }
-        if (!this.hoverDelegate) {
+        if (this.hoverDelegate.showNativeHover) {
             setupNativeHover(htmlElement, tooltip);
         }
         else {

package/vscode/src/vs/base/browser/ui/iconLabel/iconLabelHover.js

@@ -110,13 +110,14 @@ function setupCustomHover(hoverDelegate, htmlElement, content, options) {
         }
         if (hadHover) {
             hoverDelegate.onDidHideHover?.();
+            hoverWidget = undefined;
         }
     };
     const triggerShowHover = (delay, focus, target) => {
         return ( new TimeoutTimer(async () => {
             if (!hoverWidget || hoverWidget.isDisposed) {
                 hoverWidget = ( new UpdatableHoverWidget(hoverDelegate, target || htmlElement, delay > 0));
-                await hoverWidget.update(content, focus, options);
+                await hoverWidget.update(typeof content === 'function' ? content() : content, focus, options);
             }
         }, delay));
     };

package/vscode/src/vs/base/browser/ui/list/listView.js

@@ -14,6 +14,7 @@ import { Scrollable } from '../../../common/scrollable.js';
 import { RangeMap, shift } from './rangeMap.js';
 import { RowCache } from './rowCache.js';
 import { BugIndicatingError } from '../../../common/errors.js';
+import { clamp } from '../../../common/numbers.js';
 const StaticDND = {
     CurrentDragAndDropData: undefined
 };
@@ -176,7 +177,7 @@ class ListView {
         }
         this.items = [];
         this.itemId = 0;
-        this.rangeMap = ( new RangeMap(options.paddingTop ?? 0));
+        this.rangeMap = this.createRangeMap(options.paddingTop ?? 0);
         for (const renderer of renderers) {
             this.renderers.set(renderer.templateId, renderer);
         }
@@ -310,6 +311,9 @@ class ListView {
             this._rerender(this.lastRenderTop, this.lastRenderHeight);
         }
     }
+    createRangeMap(paddingTop) {
+        return ( new RangeMap(paddingTop));
+    }
     splice(start, deleteCount, elements = []) {
         if (this.splicing) {
             throw new Error('Can\'t run recursive splices.');
@@ -345,6 +349,7 @@ class ListView {
                 rows.push(item.row);
             }
             item.row = null;
+            item.stale = true;
         }
         const previousRestRange = { start: start + deleteCount, end: this.items.length };
         const previousRenderedRestRange = Range.intersect(previousRestRange, previousRenderRange);
@@ -361,11 +366,12 @@ class ListView {
             uri: undefined,
             dropTarget: false,
             dragStartDisposable: Disposable.None,
-            checkedDisposable: Disposable.None
+            checkedDisposable: Disposable.None,
+            stale: false
         })));
         let deleted;
         if (start === 0 && deleteCount >= this.items.length) {
-            this.rangeMap = ( new RangeMap(this.rangeMap.paddingTop));
+            this.rangeMap = this.createRangeMap(this.rangeMap.paddingTop);
             this.rangeMap.splice(0, 0, inserted);
             deleted = this.items;
             this.items = inserted;
@@ -389,14 +395,13 @@ class ListView {
         }
         const unrenderedRestRanges = ( previousUnrenderedRestRanges.map(r => shift(r, delta)));
         const elementsRange = { start, end: start + elements.length };
-        const insertRanges = ( [elementsRange, ...unrenderedRestRanges].map(r => Range.intersect(renderRange, r)));
-        const beforeElement = this.getNextToLastElement(insertRanges);
+        const insertRanges = ( [elementsRange, ...unrenderedRestRanges].map(r => Range.intersect(renderRange, r))).reverse();
         for (const range of insertRanges) {
-            for (let i = range.start; i < range.end; i++) {
+            for (let i = range.end - 1; i >= range.start; i--) {
                 const item = this.items[i];
                 const rows = rowsToDispose.get(item.templateId);
                 const row = rows?.pop();
-                this.insertItemInDOM(i, beforeElement, row);
+                this.insertItemInDOM(i, row);
             }
         }
         for (const rows of ( rowsToDispose.values())) {
@@ -536,9 +541,8 @@ class ListView {
     }
     render(previousRenderRange, renderTop, renderHeight, renderLeft, scrollWidth, updateItemsInDOM = false) {
         const renderRange = this.getRenderRange(renderTop, renderHeight);
-        const rangesToInsert = Range.relativeComplement(renderRange, previousRenderRange);
+        const rangesToInsert = Range.relativeComplement(renderRange, previousRenderRange).reverse();
         const rangesToRemove = Range.relativeComplement(previousRenderRange, renderRange);
-        const beforeElement = this.getNextToLastElement(rangesToInsert);
         if (updateItemsInDOM) {
             const rangesToUpdate = Range.intersect(previousRenderRange, renderRange);
             for (let i = rangesToUpdate.start; i < rangesToUpdate.end; i++) {
@@ -552,8 +556,8 @@ class ListView {
                 }
             }
             for (const range of rangesToInsert) {
-                for (let i = range.start; i < range.end; i++) {
-                    this.insertItemInDOM(i, beforeElement);
+                for (let i = range.end - 1; i >= range.start; i--) {
+                    this.insertItemInDOM(i);
                 }
             }
         });
@@ -567,17 +571,17 @@ class ListView {
         this.lastRenderTop = renderTop;
         this.lastRenderHeight = renderHeight;
     }
-    insertItemInDOM(index, beforeElement, row) {
+    insertItemInDOM(index, row) {
         const item = this.items[index];
-        let isStale = false;
         if (!item.row) {
             if (row) {
                 item.row = row;
+                item.stale = true;
             }
             else {
                 const result = this.cache.alloc(item.templateId);
                 item.row = result.row;
-                isStale = result.isReusingConnectedDomNode;
+                item.stale ||= result.isReusingConnectedDomNode;
             }
         }
         const role = this.accessibilityProvider.getRole(item.element) || 'listitem';
@@ -591,13 +595,10 @@ class ListView {
             update(checked.value);
             item.checkedDisposable = checked.onDidChange(update);
         }
-        if (isStale || !item.row.domNode.parentElement) {
-            if (beforeElement) {
-                this.rowsContainer.insertBefore(item.row.domNode, beforeElement);
-            }
-            else {
-                this.rowsContainer.appendChild(item.row.domNode);
-            }
+        if (item.stale || !item.row.domNode.parentElement) {
+            const referenceNode = this.items.at(index + 1)?.row?.domNode ?? null;
+            this.rowsContainer.insertBefore(item.row.domNode, referenceNode);
+            item.stale = false;
         }
         this.updateItemInDOM(item, index);
         const renderer = this.renderers.get(item.templateId);
@@ -944,7 +945,8 @@ class ListView {
             return undefined;
         }
         const relativePosition = browserEvent.offsetY / this.items[targetIndex].size;
-        return Math.floor(relativePosition / 0.25);
+        const sector = Math.floor(relativePosition / 0.25);
+        return clamp(sector, 0, 3);
     }
     getItemIndexFromEventTarget(target) {
         const scrollableElement = this.scrollableElement.getDomNode();
@@ -1003,13 +1005,10 @@ class ListView {
                         }
                     }
                 }
-                const renderRanges = Range.relativeComplement(renderRange, previousRenderRange);
+                const renderRanges = Range.relativeComplement(renderRange, previousRenderRange).reverse();
                 for (const range of renderRanges) {
-                    for (let i = range.start; i < range.end; i++) {
-                        const afterIndex = i + 1;
-                        const beforeRow = afterIndex < this.items.length ? this.items[afterIndex].row : null;
-                        const beforeElement = beforeRow ? beforeRow.domNode : null;
-                        this.insertItemInDOM(i, beforeElement);
+                    for (let i = range.end - 1; i >= range.start; i--) {
+                        this.insertItemInDOM(i);
                     }
                 }
                 for (let i = renderRange.start; i < renderRange.end; i++) {
@@ -1067,20 +1066,6 @@ class ListView {
         this.cache.release(row);
         return item.size - size;
     }
-    getNextToLastElement(ranges) {
-        const lastRange = ranges[ranges.length - 1];
-        if (!lastRange) {
-            return null;
-        }
-        const nextToLastItem = this.items[lastRange.end];
-        if (!nextToLastItem) {
-            return null;
-        }
-        if (!nextToLastItem.row) {
-            return null;
-        }
-        return nextToLastItem.row.domNode;
-    }
     getElementDomId(index) {
         return `${this.domId}_${index}`;
     }

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

@@ -767,10 +767,6 @@ ${formatRule(Codicon.menuSubmenu)}
 	cursor: default;
 }
 
-.monaco-menu .monaco-action-bar.animated .action-item.active {
-	transform: scale(1.272019649, 1.272019649); /* 1.272019649 = √φ */
-}
-
 .monaco-menu .monaco-action-bar .action-item .icon,
 .monaco-menu .monaco-action-bar .action-item .codicon {
 	display: inline-block;

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

@@ -2,6 +2,8 @@ import { $ as $$1, append, createStyleSheet, addDisposableListener, addStandardD
 import { DomEmitter } from '../../event.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { renderMarkdown } from '../../markdownRenderer.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
+import { setupCustomHover } from '../iconLabel/iconLabelHover.js';
 import { List } from '../list/listWidget.js';
 import { equals } from '../../../common/arrays.js';
 import { Emitter, Event } from '../../../common/event.js';
@@ -69,6 +71,7 @@ class SelectBoxList extends Disposable {
         if (typeof this.selectBoxOptions.ariaDescription === 'string') {
             this.selectElement.setAttribute('aria-description', this.selectBoxOptions.ariaDescription);
         }
+        this._hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.selectElement, ''));
         this._onDidSelect = ( new Emitter());
         this._register(this._onDidSelect);
         this.registerListeners();
@@ -110,7 +113,7 @@ class SelectBoxList extends Disposable {
                 selected: e.target.value
             });
             if (!!this.options[this.selected] && !!this.options[this.selected].text) {
-                this.selectElement.title = this.options[this.selected].text;
+                this._hover.update(this.options[this.selected].text);
             }
         }));
         this._register(addDisposableListener(this.selectElement, EventType.CLICK, (e) => {
@@ -193,7 +196,7 @@ class SelectBoxList extends Disposable {
         }
         this.selectElement.selectedIndex = this.selected;
         if (!!this.options[this.selected] && !!this.options[this.selected].text) {
-            this.selectElement.title = this.options[this.selected].text;
+            this._hover.update(this.options[this.selected].text);
         }
     }
     setAriaLabel(label) {
@@ -568,7 +571,7 @@ class SelectBoxList extends Disposable {
                     selected: this.options[this.selected].text
                 });
                 if (!!this.options[this.selected] && !!this.options[this.selected].text) {
-                    this.selectElement.title = this.options[this.selected].text;
+                    this._hover.update(this.options[this.selected].text);
                 }
             }
             this.hideSelectDropDown(true);
@@ -643,7 +646,7 @@ class SelectBoxList extends Disposable {
                 selected: this.options[this.selected].text
             });
             if (!!this.options[this.selected] && !!this.options[this.selected].text) {
-                this.selectElement.title = this.options[this.selected].text;
+                this._hover.update(this.options[this.selected].text);
             }
         }
         this.hideSelectDropDown(true);

package/vscode/src/vs/base/browser/ui/table/tableWidget.js

@@ -1,8 +1,10 @@
 import { append, $, createStyleSheet, getContentHeight, getContentWidth, clearNode } from '../../dom.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
+import { setupCustomHover } from '../iconLabel/iconLabelHover.js';
 import { List, unthemedListStyles } from '../list/listWidget.js';
 import { SplitView } from '../splitview/splitview.js';
 import { Event, Emitter } from '../../../common/event.js';
-import { DisposableStore } from '../../../common/lifecycle.js';
+import { DisposableStore, Disposable } from '../../../common/lifecycle.js';
 import './table.css.js';
 class TableListRenderer {
     static { this.TemplateId = 'row'; }
@@ -74,16 +76,18 @@ function asListVirtualDelegate(delegate) {
         getTemplateId() { return TableListRenderer.TemplateId; },
     };
 }
-class ColumnHeader {
+class ColumnHeader extends Disposable {
     get minimumSize() { return this.column.minimumWidth ?? 120; }
     get maximumSize() { return this.column.maximumWidth ?? Number.POSITIVE_INFINITY; }
     get onDidChange() { return this.column.onDidChangeWidthConstraints ?? Event.None; }
     constructor(column, index) {
+        super();
         this.column = column;
         this.index = index;
         this._onDidLayout = ( new Emitter());
         this.onDidLayout = this._onDidLayout.event;
-        this.element = $('.monaco-table-th', { 'data-col-index': index, title: column.tooltip }, column.label);
+        this.element = $('.monaco-table-th', { 'data-col-index': index }, column.label);
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.element, column.tooltip));
     }
     layout(size) {
         this._onDidLayout.fire([this.index, size]);
@@ -122,7 +126,7 @@ class Table {
         this.cachedWidth = 0;
         this.cachedHeight = 0;
         this.domNode = append(container, $(`.monaco-table.${this.domId}`));
-        const headers = ( columns.map((c, i) => ( new ColumnHeader(c, i))));
+        const headers = ( columns.map((c, i) => this.disposables.add(( new ColumnHeader(c, i)))));
         const descriptor = {
             size: headers.reduce((a, b) => a + b.column.weight, 0),
             views: ( headers.map(view => ({ size: view.column.weight, view })))

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

@@ -5,6 +5,8 @@ import { ThemeIcon } from '../../../common/themables.js';
 import { Emitter } from '../../../common/event.js';
 import './toggle.css.js';
 import { $, addDisposableListener, EventType, isActiveElement } from '../../dom.js';
+import { setupCustomHover } from '../iconLabel/iconLabelHover.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
 const unthemedToggleStyles = {
     inputActiveOptionBorder: '#007ACC00',
     inputActiveOptionForeground: '#FFFFFF',
@@ -74,7 +76,7 @@ class Toggle extends Widget {
             classes.push('checked');
         }
         this.domNode = document.createElement('div');
-        this.domNode.title = this._opts.title;
+        this._hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.domNode, this._opts.title));
         this.domNode.classList.add(...classes);
         if (!this._opts.notFocusable) {
             this.domNode.tabIndex = 0;
@@ -143,7 +145,7 @@ class Toggle extends Widget {
         this.domNode.setAttribute('aria-disabled', String(true));
     }
     setTitle(newTitle) {
-        this.domNode.title = newTitle;
+        this._hover.update(newTitle);
         this.domNode.setAttribute('aria-label', newTitle);
     }
 }

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

@@ -7,6 +7,7 @@ import { EventMultiplexer } from '../../../common/event.js';
 import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
 import './toolbar.css.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
 class ToolBar extends Disposable {
     constructor(container, contextMenuProvider, options = { orientation: 0  }) {
         super();
@@ -15,6 +16,7 @@ class ToolBar extends Disposable {
         this._onDidChangeDropdownVisibility = this._register(( new EventMultiplexer()));
         this.onDidChangeDropdownVisibility = this._onDidChangeDropdownVisibility.event;
         this.disposables = this._register(( new DisposableStore()));
+        options.hoverDelegate = options.hoverDelegate ?? this._register(getDefaultHoverDelegate('element', true));
         this.options = options;
         this.lookupKeybindings = typeof this.options.getKeyBinding === 'function';
         this.toggleMenuAction = this._register(( new ToggleMenuAction(() => this.toggleMenuActionViewItem?.show(), options.toggleMenuTitle)));
@@ -27,6 +29,7 @@ class ToolBar extends Disposable {
             actionRunner: options.actionRunner,
             allowContextMenu: options.allowContextMenu,
             highlightToggledItems: options.highlightToggledItems,
+            hoverDelegate: options.hoverDelegate,
             actionViewItemProvider: (action, viewItemOptions) => {
                 if (action.id === ToggleMenuAction.ID) {
                     this.toggleMenuActionViewItem = ( new DropdownMenuActionViewItem(action, action.menuActions, contextMenuProvider, {
@@ -37,7 +40,8 @@ class ToolBar extends Disposable {
                         anchorAlignmentProvider: this.options.anchorAlignmentProvider,
                         menuAsChild: !!this.options.renderDropdownAsChildElement,
                         skipTelemetry: this.options.skipTelemetry,
-                        isMenu: true
+                        isMenu: true,
+                        hoverDelegate: this.options.hoverDelegate
                     }));
                     this.toggleMenuActionViewItem.setActionContext(this.actionBar.context);
                     this.disposables.add(this._onDidChangeDropdownVisibility.add(this.toggleMenuActionViewItem.onDidChangeVisibility));
@@ -57,7 +61,8 @@ class ToolBar extends Disposable {
                         classNames: action.class,
                         anchorAlignmentProvider: this.options.anchorAlignmentProvider,
                         menuAsChild: !!this.options.renderDropdownAsChildElement,
-                        skipTelemetry: this.options.skipTelemetry
+                        skipTelemetry: this.options.skipTelemetry,
+                        hoverDelegate: this.options.hoverDelegate
                     }));
                     result.setActionContext(this.actionBar.context);
                     this.submenuActionViewItems.push(result);

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

@@ -590,6 +590,7 @@ class AsyncDataTree {
             if (treeNode.collapsed) {
                 node.hasChildren = !!this.dataSource.hasChildren(node.element);
                 node.stale = true;
+                this.setChildren(node, [], recursive, viewStateContext);
                 return;
             }
         }

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

@@ -158,7 +158,7 @@ function toAction(props) {
         label: props.label,
         class: props.class,
         enabled: props.enabled ?? true,
-        checked: props.checked ?? false,
+        checked: props.checked,
         run: async (...args) => props.run(...args),
         tooltip: props.label
     };

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

@@ -9,7 +9,7 @@ function assertNever(value, message = 'Unreachable') {
 }
 function softAssert(condition) {
     if (!condition) {
-        onUnexpectedError(( new BugIndicatingError('Assertion Failed')));
+        onUnexpectedError(( new BugIndicatingError('Soft Assertion Failed')));
     }
 }
 function assertFn(condition) {

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

@@ -100,6 +100,15 @@ function asPromise(callback) {
         }
     }));
 }
+function promiseWithResolvers() {
+    let resolve;
+    let reject;
+    const promise = ( new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    }));
+    return { promise, resolve: resolve, reject: reject };
+}
 class Throttler {
     constructor() {
         this.isDisposed = false;
@@ -759,12 +768,7 @@ class TaskSequentializer {
     }
     queue(run) {
         if (!this._queued) {
-            let promiseResolve;
-            let promiseReject;
-            const promise = ( new Promise((resolve, reject) => {
-                promiseResolve = resolve;
-                promiseReject = reject;
-            }));
+            const { promise, resolve: promiseResolve, reject: promiseReject } = promiseWithResolvers();
             this._queued = {
                 run,
                 promise,
@@ -1125,4 +1129,4 @@ class AsyncIterableSource {
         this._emitFn(item);
     }
 }
-export { AbstractIdleValue, AsyncIterableObject, AsyncIterableSource, AutoOpenBarrier, Barrier, CancelableAsyncIterableObject, DeferredPromise, Delayer, GlobalIdleValue, IntervalCounter, IntervalTimer, LazyStatefulPromise, Limiter, Promises, Queue, ResourceQueue, RunOnceScheduler, RunOnceWorker, Sequencer, SequencerByKey, StatefulPromise, TaskSequentializer, ThrottledDelayer, Throttler, TimeoutTimer, _runWhenIdle, asPromise, createCancelableAsyncIterable, createCancelablePromise, disposableTimeout, first, isThenable, raceCancellablePromises, raceCancellation, raceCancellationError, raceTimeout, retry, runWhenGlobalIdle, sequence, timeout };
+export { AbstractIdleValue, AsyncIterableObject, AsyncIterableSource, AutoOpenBarrier, Barrier, CancelableAsyncIterableObject, DeferredPromise, Delayer, GlobalIdleValue, IntervalCounter, IntervalTimer, LazyStatefulPromise, Limiter, Promises, Queue, ResourceQueue, RunOnceScheduler, RunOnceWorker, Sequencer, SequencerByKey, StatefulPromise, TaskSequentializer, ThrottledDelayer, Throttler, TimeoutTimer, _runWhenIdle, asPromise, createCancelableAsyncIterable, createCancelablePromise, disposableTimeout, first, isThenable, promiseWithResolvers, raceCancellablePromises, raceCancellation, raceCancellationError, raceTimeout, retry, runWhenGlobalIdle, sequence, timeout };

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

@@ -556,6 +556,10 @@ declare const Codicon: {
     readonly gitStash: ThemeIcon;
     readonly gitStashApply: ThemeIcon;
     readonly gitStashPop: ThemeIcon;
+    readonly runAllCoverage: ThemeIcon;
+    readonly runCoverage: ThemeIcon;
+    readonly coverage: ThemeIcon;
+    readonly githubProject: ThemeIcon;
     readonly dialogError: ThemeIcon;
     readonly dialogWarning: ThemeIcon;
     readonly dialogInfo: ThemeIcon;

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

@@ -566,6 +566,10 @@ const Codicon = {
     gitStash: register('git-stash', 0xec26),
     gitStashApply: register('git-stash-apply', 0xec27),
     gitStashPop: register('git-stash-pop', 0xec28),
+    runAllCoverage: register('run-all-coverage', 0xec2d),
+    runCoverage: register('run-all-coverage', 0xec2c),
+    coverage: register('coverage', 0xec2e),
+    githubProject: register('github-project', 0xec2f),
     dialogError: register('dialog-error', 'error'),
     dialogWarning: register('dialog-warning', 'warning'),
     dialogInfo: register('dialog-info', 'info'),

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

@@ -381,6 +381,60 @@ function fromNow(date, appendAgoLabel, useFullTimeWords, disallowNow) {
         }
     }
 }
+function getDurationString(ms, useFullTimeWords) {
+    const seconds = Math.abs(ms / 1000);
+    if (seconds < 1) {
+        return useFullTimeWords
+            ? ( localizeWithPath('vs/base/common/date', 'duration.ms.full', '{0} milliseconds', ms))
+            : ( localizeWithPath('vs/base/common/date', 'duration.ms', '{0}ms', ms));
+    }
+    if (seconds < minute) {
+        return useFullTimeWords
+            ? ( localizeWithPath(
+            'vs/base/common/date',
+            'duration.s.full',
+            '{0} seconds',
+            Math.round(ms) / 1000
+        ))
+            : ( localizeWithPath('vs/base/common/date', 'duration.s', '{0}s', Math.round(ms) / 1000));
+    }
+    if (seconds < hour) {
+        return useFullTimeWords
+            ? ( localizeWithPath(
+            'vs/base/common/date',
+            'duration.m.full',
+            '{0} minutes',
+            Math.round(ms / (1000 * minute))
+        ))
+            : ( localizeWithPath(
+            'vs/base/common/date',
+            'duration.m',
+            '{0} mins',
+            Math.round(ms / (1000 * minute))
+        ));
+    }
+    if (seconds < day) {
+        return useFullTimeWords
+            ? ( localizeWithPath(
+            'vs/base/common/date',
+            'duration.h.full',
+            '{0} hours',
+            Math.round(ms / (1000 * hour))
+        ))
+            : ( localizeWithPath(
+            'vs/base/common/date',
+            'duration.h',
+            '{0} hrs',
+            Math.round(ms / (1000 * hour))
+        ));
+    }
+    return ( localizeWithPath(
+        'vs/base/common/date',
+        'duration.d',
+        '{0} days',
+        Math.round(ms / (1000 * day))
+    ));
+}
 function toLocalISOString(date) {
     return date.getFullYear() +
         '-' + String(date.getMonth() + 1).padStart(2, '0') +
@@ -391,4 +445,4 @@ function toLocalISOString(date) {
         '.' + (date.getMilliseconds() / 1000).toFixed(3).slice(2, 5) +
         'Z';
 }
-export { fromNow, toLocalISOString };
+export { fromNow, getDurationString, toLocalISOString };

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

@@ -834,13 +834,15 @@ class EventMultiplexer {
         e.listener = e.event(r => this.emitter.fire(r));
     }
     unhook(e) {
-        if (e.listener) {
-            e.listener.dispose();
-        }
+        e.listener?.dispose();
         e.listener = null;
     }
     dispose() {
         this.emitter.dispose();
+        for (const e of this.events) {
+            e.listener?.dispose();
+        }
+        this.events = [];
     }
 }
 class DynamicListEventMultiplexer {

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

@@ -204,7 +204,7 @@ function matchesCamelCase(word, camelCaseWord) {
         return null;
     }
     if (camelCaseWord.length > 60) {
-        return null;
+        camelCaseWord = camelCaseWord.substring(0, 60);
     }
     const analysis = analyzeCamelCaseWord(camelCaseWord);
     if (!isCamelCaseWord(analysis)) {

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

@@ -20,9 +20,10 @@ function registerGlobalHotReloadHandler() {
     }
     const g = globalThis;
     if (!g.$hotReload_applyNewExports) {
-        g.$hotReload_applyNewExports = oldExports => {
+        g.$hotReload_applyNewExports = args => {
+            const args2 = { config: { mode: undefined }, ...args };
             for (const h of hotReloadHandlers) {
-                const result = h(oldExports);
+                const result = h(args2);
                 if (result) {
                     return result;
                 }
@@ -34,8 +35,8 @@ function registerGlobalHotReloadHandler() {
 }
 let hotReloadHandlers = undefined;
 if (isHotReloadEnabled()) {
-    registerHotReloadHandler(({ oldExports, newSrc }) => {
-        if (newSrc.indexOf('/* ' + 'hot-reload:patch-prototype-methods */') === -1) {
+    registerHotReloadHandler(({ oldExports, newSrc, config }) => {
+        if (config.mode !== 'patch-prototype') {
             return undefined;
         }
         return newExports => {

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

@@ -30,6 +30,7 @@ var Schemas;
     Schemas.vscodeSettings = 'vscode-settings';
     Schemas.vscodeWorkspaceTrust = 'vscode-workspace-trust';
     Schemas.vscodeTerminal = 'vscode-terminal';
+    Schemas.vscodeChatCodeBlock = 'vscode-chat-code-block';
     Schemas.vscodeChatSesssion = 'vscode-chat-editor';
     Schemas.webviewPanel = 'webview-panel';
     Schemas.vscodeWebview = 'vscode-webview';
@@ -38,6 +39,8 @@ var Schemas;
     Schemas.tmp = 'tmp';
     Schemas.vsls = 'vsls';
     Schemas.vscodeSourceControl = 'vscode-scm';
+    Schemas.codeSetting = 'code-setting';
+    Schemas.codeFeature = 'code-feature';
 })(Schemas || (Schemas = {})));
 function matchesScheme(target, scheme) {
     if (URI.isUri(target)) {