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

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

@@ -8,6 +8,8 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
@@ -20,12 +22,8 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 
 let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputContentPart extends Disposable {
     get codeblocks() {
-        const inputCodeblocks = ( this._editorReferences.map(ref => {
-            const cbi = this.input.codeBlockInfo;
-            return cbi;
-        }));
         const outputCodeblocks = this._outputSubPart?.codeblocks ?? [];
-        return [...inputCodeblocks, ...outputCodeblocks];
+        return outputCodeblocks;
     }
     set title(s) {
         this._titlePart.title = s;
@@ -36,53 +34,70 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
     get expanded() {
         return this._expanded.get();
     }
-    constructor(title, subtitle, progressTooltip, context, input, output, isError, initiallyExpanded, contextKeyService, _instantiationService, hoverService) {
+    constructor(
+        title,
+        subtitle,
+        progressTooltip,
+        context,
+        input,
+        output,
+        isError,
+        initiallyExpanded,
+        contextKeyService,
+        _instantiationService,
+        hoverService,
+        modelService,
+        languageService
+    ) {
         super();
         this.context = context;
         this.input = input;
         this.output = output;
         this.contextKeyService = contextKeyService;
         this._instantiationService = _instantiationService;
+        this.modelService = modelService;
+        this.languageService = languageService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
-        this._currentWidth = 0;
         this._editorReferences = [];
-        this._currentWidth = context.currentWidth();
-        const container = h('.chat-confirmation-widget-container');
-        const titleEl = h('.chat-confirmation-widget-title-inner');
-        const elements = h('.chat-confirmation-widget');
+        this._contentInitialized = false;
+        const container = h(".chat-confirmation-widget-container");
+        const titleEl = h(".chat-confirmation-widget-title-inner");
+        const elements = h(".chat-confirmation-widget");
         this.domNode = container.root;
         container.root.appendChild(elements.root);
-        const titlePart = this._titlePart = this._register(_instantiationService.createInstance(ChatQueryTitlePart, titleEl.root, title, subtitle));
-        this._register(titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-        const spacer = createElement('span');
-        spacer.style.flexGrow = '1';
+        this._titlePart = this._register(
+            _instantiationService.createInstance(ChatQueryTitlePart, titleEl.root, title, subtitle)
+        );
+        this._register(this._titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+        const spacer = createElement("span");
+        spacer.style.flexGrow = "1";
         const btn = this._register(( new ButtonWithIcon(elements.root, {})));
-        btn.element.classList.add('chat-confirmation-widget-title', 'monaco-text-button');
+        btn.element.classList.add("chat-confirmation-widget-title", "monaco-text-button");
         btn.labelElement.append(titleEl.root);
-        const check = h(isError
-            ? ThemeIcon.asCSSSelector(Codicon.error)
-            : output
-                ? ThemeIcon.asCSSSelector(Codicon.check)
-                : ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin')));
+        const check = h(
+            isError ? ThemeIcon.asCSSSelector(Codicon.error) : output ? ThemeIcon.asCSSSelector(Codicon.check) : ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, "spin"))
+        );
         if (progressTooltip) {
             this._register(hoverService.setupDelayedHover(check.root, {
                 content: progressTooltip,
-                style: HoverStyle.Pointer,
+                style: HoverStyle.Pointer
             }));
         }
         const expanded = this._expanded = observableValue(this, initiallyExpanded);
         this._register(autorun(r => {
             const value = expanded.read(r);
-            btn.icon = isError
-                ? Codicon.error
-                : output
-                    ? Codicon.check
-                    : ThemeIcon.modify(Codicon.loading, 'spin');
-            elements.root.classList.toggle('collapsed', !value);
+            btn.icon = isError ? Codicon.error : output ? Codicon.check : ThemeIcon.modify(Codicon.loading, "spin");
+            elements.root.classList.toggle("collapsed", !value);
+            if (value && !this._contentInitialized) {
+                this._contentInitialized = true;
+                const messageContainer = h(".chat-confirmation-widget-message");
+                messageContainer.root.appendChild(this.createMessageContents());
+                elements.root.appendChild(messageContainer.root);
+            }
             this._onDidChangeHeight.fire();
         }));
-        const toggle = (e) => {
+        const toggle = e => {
             if (!e.defaultPrevented) {
                 const value = expanded.get();
                 expanded.set(!value, undefined);
@@ -90,59 +105,67 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
             }
         };
         this._register(btn.onDidClick(toggle));
-        const message = h('.chat-confirmation-widget-message');
-        message.root.appendChild(this.createMessageContents());
-        elements.root.appendChild(message.root);
-        const topLevelResources = this.output?.parts
-            .filter(p => p.kind === 'data')
-            .filter(p => !p.audience || p.audience.includes(LanguageModelPartAudience.User));
+        const topLevelResources = this.output?.parts.filter(p => p.kind === "data").filter(p => !p.audience || p.audience.includes(LanguageModelPartAudience.User));
         if (topLevelResources?.length) {
-            const resourceSubPart = this._register(this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, topLevelResources));
+            const resourceSubPart = this._register(
+                this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, topLevelResources)
+            );
             const group = resourceSubPart.domNode;
-            group.classList.add('chat-collapsible-top-level-resource-group');
+            group.classList.add("chat-collapsible-top-level-resource-group");
             container.root.appendChild(group);
             this._register(autorun(r => {
-                group.style.display = expanded.read(r) ? 'none' : '';
+                group.style.display = expanded.read(r) ? "none" : "";
             }));
         }
     }
     createMessageContents() {
-        const contents = h('div', [
-            h('h3@inputTitle'),
-            h('div@input'),
-            h('h3@outputTitle'),
-            h('div@output'),
+        const contents = h("div", [
+            h("h3@inputTitle"),
+            h("div@input"),
+            h("h3@outputTitle"),
+            h("div@output")
         ]);
-        const { input, output } = this;
-        contents.inputTitle.textContent = ( localize(5689, "Input"));
+        const {
+            input,
+            output
+        } = this;
+        contents.inputTitle.textContent = ( localize(5935, "Input"));
         this.addCodeBlock(input, contents.input);
         if (!output) {
             contents.output.remove();
             contents.outputTitle.remove();
-        }
-        else {
-            contents.outputTitle.textContent = ( localize(5690, "Output"));
-            const outputSubPart = this._register(this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts));
+        } else {
+            contents.outputTitle.textContent = ( localize(5936, "Output"));
+            const outputSubPart = this._register(
+                this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts)
+            );
             this._outputSubPart = outputSubPart;
-            this._register(outputSubPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
             contents.output.appendChild(outputSubPart.domNode);
         }
         return contents.root;
     }
     addCodeBlock(part, container) {
+        const textModel = this._register(this.modelService.createModel(
+            part.data,
+            this.languageService.createById(part.languageId),
+            undefined,
+            true
+        ));
         const data = {
             languageId: part.languageId,
-            textModel: Promise.resolve(part.textModel),
-            codeBlockIndex: part.codeBlockInfo.codeBlockIndex,
+            textModel: Promise.resolve(textModel),
+            codeBlockIndex: part.codeBlockIndex,
             codeBlockPartIndex: 0,
             element: this.context.element,
             parentContextKeyService: this.contextKeyService,
             renderOptions: part.options,
-            chatSessionResource: this.context.element.sessionResource,
+            chatSessionResource: this.context.element.sessionResource
         };
         const editorReference = this._register(this.context.editorPool.get());
-        editorReference.object.render(data, this._currentWidth || 300);
-        this._register(editorReference.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire()));
+        editorReference.object.render(data, this.context.currentWidth.get() || 300);
+        this._register(
+            editorReference.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire())
+        );
         container.appendChild(editorReference.object.element);
         this._editorReferences.push(editorReference);
     }
@@ -150,15 +173,10 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         return false;
     }
     layout(width) {
-        this._currentWidth = width;
         this._editorReferences.forEach(r => r.object.layout(width));
         this._outputSubPart?.layout(width);
     }
 };
-ChatCollapsibleInputOutputContentPart = ( __decorate([
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IInstantiationService)),
-    ( __param(10, IHoverService))
-], ChatCollapsibleInputOutputContentPart));
+ChatCollapsibleInputOutputContentPart = ( __decorate([( __param(8, IContextKeyService)), ( __param(9, IInstantiationService)), ( __param(10, IHoverService)), ( __param(11, IModelService)), ( __param(12, ILanguageService))], ChatCollapsibleInputOutputContentPart));
 
 export { ChatCollapsibleInputOutputContentPart };

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

@@ -1,4 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -19,16 +21,20 @@ export declare class ChatToolOutputContentSubPart extends Disposable {
     private readonly _contextMenuService;
     private readonly _fileService;
     private readonly _markdownRendererService;
-    private readonly _onDidChangeHeight;
-    readonly onDidChangeHeight: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    private _currentWidth;
+    private readonly modelService;
+    private readonly languageService;
     private readonly _editorReferences;
     readonly domNode: HTMLElement;
     readonly codeblocks: IChatCodeBlockInfo[];
-    constructor(context: IChatContentPartRenderContext, parts: ChatCollapsibleIOPart[], _instantiationService: IInstantiationService, contextKeyService: IContextKeyService, _contextMenuService: IContextMenuService, _fileService: IFileService, _markdownRendererService: IMarkdownRendererService);
+    constructor(context: IChatContentPartRenderContext, parts: ChatCollapsibleIOPart[], _instantiationService: IInstantiationService, contextKeyService: IContextKeyService, _contextMenuService: IContextMenuService, _fileService: IFileService, _markdownRendererService: IMarkdownRendererService, modelService: IModelService, languageService: ILanguageService);
     private toMdString;
     private createOutputContents;
     private addResourceGroup;
+    /**
+     * Delay in milliseconds before decoding base64 image data.
+     * This avoids expensive decode operations during scrolling.
+     */
+    private static readonly IMAGE_DECODE_DELAY_MS;
     private fillInResourceGroup;
     private addCodeBlock;
     layout(width: number): void;