@codingame/monaco-vscode-katex-common 25.1.2 → 26.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleContentPart.js

@@ -4,7 +4,6 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ButtonWithIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
@@ -22,15 +21,14 @@ let ChatCollapsibleContentPart = class ChatCollapsibleContentPart extends Dispos
     constructor(title, context, hoverMessage, hoverService) {
         super();
         this.title = title;
-        this.context = context;
         this.hoverMessage = hoverMessage;
         this.hoverService = hoverService;
         this._renderedTitleWithWidgets = this._register(( new MutableDisposable()));
-        this._onDidChangeHeight = this._register(( new Emitter()));
-        this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._isExpanded = observableValue(this, false);
         this._overrideIcon = observableValue(this, undefined);
-        this.hasFollowingContent = this.context.contentIndex + 1 < this.context.content.length;
+        this._contentInitialized = false;
+        this.element = context.element;
+        this.hasFollowingContent = context.contentIndex + 1 < context.content.length;
     }
     get domNode() {
         this._domNode ??= this.init();
@@ -38,7 +36,7 @@ let ChatCollapsibleContentPart = class ChatCollapsibleContentPart extends Dispos
     }
     init() {
         const referencesLabel = this.title;
-        const buttonElement = $('.chat-used-context-label', undefined);
+        const buttonElement = $(".chat-used-context-label", undefined);
         const collapseButton = this._register(( new ButtonWithIcon(buttonElement, {
             buttonBackground: undefined,
             buttonBorder: undefined,
@@ -50,33 +48,39 @@ let ChatCollapsibleContentPart = class ChatCollapsibleContentPart extends Dispos
             buttonSeparator: undefined
         })));
         this._collapseButton = collapseButton;
-        this._domNode = $('.chat-used-context', undefined, buttonElement);
+        this._domNode = $(".chat-used-context", undefined, buttonElement);
         collapseButton.label = referencesLabel;
         if (this.hoverMessage) {
             this._register(this.hoverService.setupDelayedHover(collapseButton.iconElement, {
                 content: this.hoverMessage,
-                style: HoverStyle.Pointer,
+                style: HoverStyle.Pointer
             }));
         }
         this._register(collapseButton.onDidClick(() => {
             const value = this._isExpanded.get();
             this._isExpanded.set(!value, undefined);
         }));
+        this._isExpanded.set(this.isExpanded(), undefined);
         this._register(autorun(r => {
             const expanded = this._isExpanded.read(r);
             collapseButton.icon = this._overrideIcon.read(r) ?? (expanded ? Codicon.chevronDown : Codicon.chevronRight);
-            this._domNode?.classList.toggle('chat-used-context-collapsed', !expanded);
-            this.updateAriaLabel(collapseButton.element, typeof referencesLabel === 'string' ? referencesLabel : referencesLabel.value, expanded);
-            if (this._domNode?.isConnected) {
-                queueMicrotask(() => {
-                    this._onDidChangeHeight.fire();
-                });
+            this._domNode?.classList.toggle("chat-used-context-collapsed", !expanded);
+            this.updateAriaLabel(
+                collapseButton.element,
+                typeof referencesLabel === "string" ? referencesLabel : referencesLabel.value,
+                expanded
+            );
+            if ((expanded || this.shouldInitEarly()) && !this._contentInitialized) {
+                this._contentInitialized = true;
+                this._contentElement = this.initContent();
+                this._domNode?.appendChild(this._contentElement);
             }
         }));
-        const content = this.initContent();
-        this._domNode.appendChild(content);
         return this._domNode;
     }
+    shouldInitEarly() {
+        return false;
+    }
     updateAriaLabel(element, label, expanded) {
         element.ariaLabel = label;
         element.ariaExpanded = String(expanded);
@@ -100,23 +104,31 @@ let ChatCollapsibleContentPart = class ChatCollapsibleContentPart extends Dispos
             this.updateAriaLabel(this._collapseButton.element, title, this.isExpanded());
         }
     }
-    setTitleWithWidgets(content, instantiationService, chatMarkdownAnchorService, chatContentMarkdownRenderer) {
+    setTitleWithWidgets(
+        content,
+        instantiationService,
+        chatMarkdownAnchorService,
+        chatContentMarkdownRenderer
+    ) {
         if (this._store.isDisposed || !this._collapseButton) {
             return;
         }
         const result = chatContentMarkdownRenderer.render(content);
-        result.element.classList.add('collapsible-title-content');
-        renderFileWidgets(result.element, instantiationService, chatMarkdownAnchorService, this._store);
+        result.element.classList.add("collapsible-title-content");
+        renderFileWidgets(
+            result.element,
+            instantiationService,
+            chatMarkdownAnchorService,
+            this._store
+        );
         const labelElement = this._collapseButton.labelElement;
-        labelElement.textContent = '';
+        labelElement.textContent = "";
         labelElement.appendChild(result.element);
-        const textContent = result.element.textContent || '';
+        const textContent = result.element.textContent || "";
         this.updateAriaLabel(this._collapseButton.element, textContent, this.isExpanded());
         this._renderedTitleWithWidgets.value = result;
     }
 };
-ChatCollapsibleContentPart = ( __decorate([
-    ( __param(3, IHoverService))
-], ChatCollapsibleContentPart));
+ChatCollapsibleContentPart = ( __decorate([( __param(3, IHoverService))], ChatCollapsibleContentPart));
 
 export { ChatCollapsibleContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.d.ts

@@ -0,0 +1,18 @@
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
+import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+/**
+ * A collapsible content part that displays markdown content.
+ * The title is shown in the collapsed state, and the full content is shown when expanded.
+ */
+export declare class ChatCollapsibleMarkdownContentPart extends ChatCollapsibleContentPart {
+    private readonly markdownContent;
+    private readonly chatContentMarkdownRenderer;
+    private contentElement;
+    constructor(title: string, markdownContent: string, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, hoverService: IHoverService);
+    protected initContent(): HTMLElement;
+    hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.js

@@ -0,0 +1,32 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
+
+let ChatCollapsibleMarkdownContentPart = class ChatCollapsibleMarkdownContentPart extends ChatCollapsibleContentPart {
+    constructor(title, markdownContent, context, chatContentMarkdownRenderer, hoverService) {
+        super(title, context, undefined, hoverService);
+        this.markdownContent = markdownContent;
+        this.chatContentMarkdownRenderer = chatContentMarkdownRenderer;
+        this.icon = Codicon.check;
+    }
+    initContent() {
+        const wrapper = $(".chat-collapsible-markdown-content.chat-used-context-list");
+        if (this.markdownContent) {
+            this.contentElement = $(".chat-collapsible-markdown-body");
+            const rendered = this._register(this.chatContentMarkdownRenderer.render(( new MarkdownString(this.markdownContent))));
+            this.contentElement.appendChild(rendered.element);
+            wrapper.appendChild(this.contentElement);
+        }
+        return wrapper;
+    }
+    hasSameContent(other, _followingContent, _element) {
+        return false;
+    }
+};
+ChatCollapsibleMarkdownContentPart = ( __decorate([( __param(4, IHoverService))], ChatCollapsibleMarkdownContentPart));
+
+export { ChatCollapsibleMarkdownContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollections.d.ts

@@ -1,5 +1,5 @@
-import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-export declare class ResourcePool<T extends IDisposable> extends Disposable {
+import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+export declare class ResourcePool<T extends IDisposable> implements IDisposable {
     private readonly _itemFactory;
     private readonly pool;
     private _inUse;
@@ -7,6 +7,11 @@ export declare class ResourcePool<T extends IDisposable> extends Disposable {
     constructor(_itemFactory: () => T);
     get(): T;
     release(item: T): void;
+    /**
+     * Clear and dispose the items in the pool that are not in use.
+     */
+    clear(): void;
+    dispose(): void;
 }
 export interface IDisposableReference<T> extends IDisposable {
     object: T;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollections.js

@@ -1,12 +1,10 @@
 
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
-class ResourcePool extends Disposable {
+class ResourcePool {
     get inUse() {
         return this._inUse;
     }
     constructor(_itemFactory) {
-        super();
         this._itemFactory = _itemFactory;
         this.pool = [];
         this._inUse = ( new Set());
@@ -17,7 +15,7 @@ class ResourcePool extends Disposable {
             this._inUse.add(item);
             return item;
         }
-        const item = this._register(this._itemFactory());
+        const item = this._itemFactory();
         this._inUse.add(item);
         return item;
     }
@@ -25,6 +23,19 @@ class ResourcePool extends Disposable {
         this._inUse.delete(item);
         this.pool.push(item);
     }
+    clear() {
+        for (const item of this.pool) {
+            item.dispose();
+        }
+        this.pool.length = 0;
+    }
+    dispose() {
+        this.clear();
+        for (const item of this._inUse) {
+            item.dispose();
+        }
+        this._inUse.clear();
+    }
 }
 
 export { ResourcePool };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.d.ts

@@ -7,5 +7,6 @@ export declare class ChatCommandButtonContentPart extends Disposable implements
     private readonly commandService;
     readonly domNode: HTMLElement;
     constructor(commandButton: IChatCommandButton, context: IChatContentPartRenderContext, commandService: ICommandService);
+    private renderButton;
     hasSameContent(other: IChatProgressRenderableResponseContent): boolean;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.js

@@ -13,25 +13,33 @@ let ChatCommandButtonContentPart = class ChatCommandButtonContentPart extends Di
     constructor(commandButton, context, commandService) {
         super();
         this.commandService = commandService;
-        this.domNode = $('.chat-command-button');
+        this.domNode = $(".chat-command-button");
         const enabled = !isResponseVM(context.element) || !context.element.isStale;
-        const tooltip = enabled ?
-            commandButton.command.tooltip :
-            ( localize(5614, "Button not available in restored chat"));
-        const button = this._register(( new Button(
-            this.domNode,
-            { ...defaultButtonStyles, supportIcons: true, title: tooltip }
-        )));
-        button.label = commandButton.command.title;
+        this.renderButton(this.domNode, commandButton.command, enabled);
+        if (commandButton.additionalCommands) {
+            for (const command of commandButton.additionalCommands) {
+                this.renderButton(this.domNode, command, enabled, true);
+            }
+        }
+    }
+    renderButton(container, command, enabled, secondary) {
+        const tooltip = enabled ? command.tooltip : ( localize(5833, "Button not available in restored chat"));
+        const button = this._register(( new Button(container, {
+            ...defaultButtonStyles,
+            supportIcons: true,
+            title: tooltip,
+            secondary
+        })));
+        button.label = command.title;
         button.enabled = enabled;
-        this._register(button.onDidClick(() => this.commandService.executeCommand(commandButton.command.id, ...(commandButton.command.arguments ?? []))));
+        this._register(button.onDidClick(
+            () => this.commandService.executeCommand(command.id, ...(command.arguments ?? []))
+        ));
     }
     hasSameContent(other) {
-        return other.kind === 'command';
+        return other.kind === "command";
     }
 };
-ChatCommandButtonContentPart = ( __decorate([
-    ( __param(2, ICommandService))
-], ChatCommandButtonContentPart));
+ChatCommandButtonContentPart = ( __decorate([( __param(2, ICommandService))], ChatCommandButtonContentPart));
 
 export { ChatCommandButtonContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationContentPart.d.ts

@@ -9,8 +9,6 @@ export declare class ChatConfirmationContentPart extends Disposable implements I
     private readonly instantiationService;
     private readonly chatService;
     readonly domNode: HTMLElement;
-    private readonly _onDidChangeHeight;
-    readonly onDidChangeHeight: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     constructor(confirmation: IChatConfirmation, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, chatService: IChatService, chatWidgetService: IChatWidgetService);
     hasSameContent(other: IChatProgressRenderableResponseContent): boolean;
     addDisposable(disposable: IDisposable): void;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationContentPart.js

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -10,32 +9,45 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { SimpleChatConfirmationWidget } from './chatConfirmationWidget.js';
 
 let ChatConfirmationContentPart = class ChatConfirmationContentPart extends Disposable {
-    constructor(confirmation, context, instantiationService, chatService, chatWidgetService) {
+    constructor(
+        confirmation,
+        context,
+        instantiationService,
+        chatService,
+        chatWidgetService
+    ) {
         super();
         this.instantiationService = instantiationService;
         this.chatService = chatService;
-        this._onDidChangeHeight = this._register(( new Emitter()));
-        this.onDidChangeHeight = this._onDidChangeHeight.event;
         const element = context.element;
-        const buttons = confirmation.buttons
-            ? ( confirmation.buttons.map(button => ({
-                label: button,
-                data: confirmation.data,
-                isSecondary: button !== confirmation.buttons?.[0],
-            })))
-            : [
-                { label: ( localize(5615, "Accept")), data: confirmation.data },
-                { label: ( localize(5616, "Dismiss")), data: confirmation.data, isSecondary: true },
-            ];
-        const confirmationWidget = this._register(this.instantiationService.createInstance(SimpleChatConfirmationWidget, context, { title: confirmation.title, buttons, message: confirmation.message }));
+        const buttons = confirmation.buttons ? ( confirmation.buttons.map(button => ({
+            label: button,
+            data: confirmation.data,
+            isSecondary: button !== confirmation.buttons?.[0]
+        }))) : [{
+            label: ( localize(5834, "Accept")),
+            data: confirmation.data
+        }, {
+            label: ( localize(5835, "Dismiss")),
+            data: confirmation.data,
+            isSecondary: true
+        }];
+        const confirmationWidget = this._register(
+            this.instantiationService.createInstance(SimpleChatConfirmationWidget, context, {
+                title: confirmation.title,
+                buttons,
+                message: confirmation.message
+            })
+        );
         confirmationWidget.setShowButtons(!confirmation.isUsed);
-        this._register(confirmationWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-        this._register(confirmationWidget.onDidClick(async (e) => {
+        this._register(confirmationWidget.onDidClick(async e => {
             if (isResponseVM(element)) {
                 const prompt = `${e.label}: "${confirmation.title}"`;
-                const options = e.isSecondary ?
-                    { rejectedConfirmationData: [e.data] } :
-                    { acceptedConfirmationData: [e.data] };
+                const options = e.isSecondary ? {
+                    rejectedConfirmationData: [e.data]
+                } : {
+                    acceptedConfirmationData: [e.data]
+                };
                 options.agentId = element.agent?.id;
                 options.slashCommand = element.slashCommand?.name;
                 options.confirmation = e.label;
@@ -47,23 +59,18 @@ let ChatConfirmationContentPart = class ChatConfirmationContentPart extends Disp
                 if (await this.chatService.sendRequest(element.sessionResource, prompt, options)) {
                     confirmation.isUsed = true;
                     confirmationWidget.setShowButtons(false);
-                    this._onDidChangeHeight.fire();
                 }
             }
         }));
         this.domNode = confirmationWidget.domNode;
     }
     hasSameContent(other) {
-        return other.kind === 'confirmation';
+        return other.kind === "confirmation";
     }
     addDisposable(disposable) {
         this._register(disposable);
     }
 };
-ChatConfirmationContentPart = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IChatService)),
-    ( __param(4, IChatWidgetService))
-], ChatConfirmationContentPart));
+ChatConfirmationContentPart = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IChatService)), ( __param(4, IChatWidgetService))], ChatConfirmationContentPart));
 
 export { ChatConfirmationContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.d.ts

@@ -1,5 +1,5 @@
 import { Separator } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
-import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import type { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
@@ -47,8 +47,6 @@ declare abstract class BaseSimpleChatConfirmationWidget<T> extends Disposable {
     protected readonly _markdownRendererService: IMarkdownRendererService;
     private _onDidClick;
     get onDidClick(): Event<IChatConfirmationButton<T>>;
-    protected _onDidChangeHeight: Emitter<void>;
-    get onDidChangeHeight(): Event<void>;
     private _domNode;
     get domNode(): HTMLElement;
     setShowButtons(showButton: boolean): void;
@@ -82,8 +80,6 @@ declare abstract class BaseChatConfirmationWidget<T> extends Disposable {
     private readonly chatMarkdownAnchorService;
     private _onDidClick;
     get onDidClick(): Event<IChatConfirmationButton<T>>;
-    protected _onDidChangeHeight: Emitter<void>;
-    get onDidChangeHeight(): Event<void>;
     private _domNode;
     get domNode(): HTMLElement;
     private _buttonsDomNode;