@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.1

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

@@ -56,7 +56,7 @@ class TodoListRenderer {
         statusIcon.style.color = this.getStatusIconColor(todo.status);
         iconLabel.setLabel(todo.title);
         const statusText = this.getStatusText(todo.status);
-        const ariaLabel = ( localize(6990, "{0}, {1}", todo.title, statusText));
+        const ariaLabel = ( localize(7272, "{0}, {1}", todo.title, statusText));
         todoElement.setAttribute("aria-label", ariaLabel);
     }
     disposeTemplate(templateData) {
@@ -65,12 +65,12 @@ class TodoListRenderer {
     getStatusText(status) {
         switch (status) {
         case "completed":
-            return localize(6991, "completed");
+            return localize(7273, "completed");
         case "in-progress":
-            return localize(6992, "in progress");
+            return localize(7274, "in progress");
         case "not-started":
         default:
-            return localize(6993, "not started");
+            return localize(7275, "not started");
         }
     }
     getStatusIconClass(status) {
@@ -142,7 +142,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         this.expandIcon.setAttribute("aria-hidden", "true");
         this.titleElement = $(".todo-list-title");
         this.titleElement.id = "todo-list-title";
-        this.titleElement.textContent = ( localize(6994, "Todos"));
+        this.titleElement.textContent = ( localize(7276, "Todos"));
         this.clearButtonContainer = $(".todo-clear-button-container");
         this.createClearButton();
         titleSection.appendChild(this.expandIcon);
@@ -164,7 +164,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
     createClearButton() {
         this.clearButton = ( new Button(this.clearButtonContainer, {
             supportIcons: true,
-            ariaLabel: ( localize(6995, "Clear all todos"))
+            ariaLabel: ( localize(7277, "Clear all todos"))
         }));
         this.clearButton.element.tabIndex = 0;
         this.clearButton.icon = Codicon.clearAll;
@@ -249,9 +249,9 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                     accessibilityProvider: {
                         getAriaLabel: todo => {
                             const statusText = this.getStatusText(todo.status);
-                            return localize(6990, "{0}, {1}", todo.title, statusText);
+                            return localize(7272, "{0}, {1}", todo.title, statusText);
                         },
-                        getWidgetAriaLabel: () => ( localize(6996, "Chat Todo List"))
+                        getWidgetAriaLabel: () => ( localize(7278, "Chat Todo List"))
                     }
                 }
             ));
@@ -307,9 +307,9 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const shouldDisable = isRequestInProgress && hasInProgressTask;
         this.clearButton.enabled = !shouldDisable;
         if (shouldDisable) {
-            this.clearButton.setTitle(( localize(6997, "Cannot clear todos while a task is in progress")));
+            this.clearButton.setTitle(( localize(7279, "Cannot clear todos while a task is in progress")));
         } else {
-            this.clearButton.setTitle(( localize(6995, "Clear all todos")));
+            this.clearButton.setTitle(( localize(7277, "Clear all todos")));
         }
     }
     updateTitleElement(titleElement, todoList) {
@@ -321,12 +321,12 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const notStartedTodos = todoList.filter(todo => todo.status === "not-started");
         const firstNotStartedTodo = notStartedTodos.length > 0 ? notStartedTodos[0] : undefined;
         const currentTaskNumber = inProgressTodos.length > 0 ? completedCount + 1 : Math.max(1, completedCount);
-        const expandButtonLabel = this._isExpanded ? ( localize(6998, "Collapse Todos")) : ( localize(6999, "Expand Todos"));
+        const expandButtonLabel = this._isExpanded ? ( localize(7280, "Collapse Todos")) : ( localize(7281, "Expand Todos"));
         this.expandoButton.element.setAttribute("aria-label", expandButtonLabel);
         this.expandoButton.element.setAttribute("aria-expanded", this._isExpanded ? "true" : "false");
         if (this._isExpanded) {
             const titleText = $("span");
-            titleText.textContent = totalCount > 0 ? ( localize(7000, "Todos ({0}/{1})", currentTaskNumber, totalCount)) : ( localize(6994, "Todos"));
+            titleText.textContent = totalCount > 0 ? ( localize(7282, "Todos ({0}/{1})", currentTaskNumber, totalCount)) : ( localize(7276, "Todos"));
             titleElement.appendChild(titleText);
         } else {
             const todoToShow = firstInProgressTodo || firstNotStartedTodo;
@@ -343,7 +343,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                 icon.style.verticalAlign = "middle";
                 titleElement.appendChild(icon);
                 const todoText = $("span");
-                todoText.textContent = ( localize(7001, "{0} ({1}/{2})", todoToShow.title, currentTaskNumber, totalCount));
+                todoText.textContent = ( localize(7283, "{0} ({1}/{2})", todoToShow.title, currentTaskNumber, totalCount));
                 todoText.style.verticalAlign = "middle";
                 todoText.style.overflow = "hidden";
                 todoText.style.textOverflow = "ellipsis";
@@ -353,7 +353,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
             }
             else if (completedCount > 0 && completedCount === totalCount) {
                 const doneText = $("span");
-                doneText.textContent = ( localize(7000, "Todos ({0}/{1})", totalCount, totalCount));
+                doneText.textContent = ( localize(7282, "Todos ({0}/{1})", totalCount, totalCount));
                 doneText.style.verticalAlign = "middle";
                 titleElement.appendChild(doneText);
             }
@@ -362,12 +362,12 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
     getStatusText(status) {
         switch (status) {
         case "completed":
-            return localize(6991, "completed");
+            return localize(7273, "completed");
         case "in-progress":
-            return localize(6992, "in progress");
+            return localize(7274, "in progress");
         case "not-started":
         default:
-            return localize(6993, "not started");
+            return localize(7275, "not started");
         }
     }
 };

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

@@ -143,13 +143,13 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
             input,
             output
         } = this;
-        contents.inputTitle.textContent = ( localize(7002, "Input"));
+        contents.inputTitle.textContent = ( localize(7284, "Input"));
         this.addCodeBlock(input, contents.input);
         if (!output) {
             contents.output.remove();
             contents.outputTitle.remove();
         } else {
-            contents.outputTitle.textContent = ( localize(7003, "Output"));
+            contents.outputTitle.textContent = ( localize(7285, "Output"));
             const outputSubPart = this._register(
                 this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts)
             );

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

@@ -83,7 +83,7 @@ let TreePool = class TreePool extends Disposable {
                 },
                 accessibilityProvider: {
                     getAriaLabel: element => element.label,
-                    getWidgetAriaLabel: () => ( localize(7004, "File Tree"))
+                    getWidgetAriaLabel: () => ( localize(7286, "File Tree"))
                 },
                 alwaysConsumeMouseWheel: false
             }

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

@@ -45,15 +45,15 @@ let ChatWorkspaceEditContentPart = class ChatWorkspaceEditContentPart extends Di
         for (const edit of workspaceEdit.edits) {
             if (edit.oldResource && !edit.newResource) {
                 renderEntry(( localize(
-                    7005,
+                    7287,
                     "Deleted `{0}`",
                     this.labelService.getUriBasenameLabel(edit.oldResource)
                 )), Codicon.trash);
             } else if (!edit.oldResource && edit.newResource) {
-                renderEntry(( localize(7006, "Created []({0})", (edit.newResource.toString()))), Codicon.newFile);
+                renderEntry(( localize(7288, "Created []({0})", (edit.newResource.toString()))), Codicon.newFile);
             } else if (edit.oldResource && edit.newResource) {
                 renderEntry(( localize(
-                    7007,
+                    7289,
                     "Renamed {0} to []({1})",
                     this.labelService.getUriBasenameLabel(edit.oldResource),
                     (edit.newResource.toString())

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

@@ -11,7 +11,6 @@ import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { MenuWorkbenchToolBar } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar";
 import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
@@ -72,7 +71,10 @@ export declare class CodeBlockPart extends Disposable {
      */
     static poolKey(elementId: string, codeBlockIndex: number): string;
     readonly editor: CodeEditorWidget;
-    protected readonly toolbar: MenuWorkbenchToolBar;
+    private toolbar;
+    private _toolbarFactory;
+    private _pendingToolbarAriaLabel;
+    private _pendingToolbarContext;
     private readonly contextKeyService;
     readonly element: HTMLElement;
     private readonly vulnsButton;
@@ -82,6 +84,7 @@ export declare class CodeBlockPart extends Disposable {
     private currentScrollWidth;
     private lastLayoutWidth;
     private _isHovered;
+    private _isDropdownVisible;
     private _toolbarElement;
     private isDisposed;
     private resourceContextKey;
@@ -92,6 +95,7 @@ export declare class CodeBlockPart extends Disposable {
     private createEditor;
     focus(): void;
     private updatePaddingForLayout;
+    private _ensureToolbar;
     private _configureForScreenReader;
     private getEditorOptionsFromConfig;
     layout(width?: number | undefined): void;

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

@@ -69,6 +69,7 @@ import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor
 registerCss(codeBlockPart);
 const $ = $$1;
 const defaultCodeblockPadding = 10;
+const defaultChatScrollbarSize = 7;
 let CodeBlockPart = class CodeBlockPart extends Disposable {
     static poolKey(elementId, codeBlockIndex) {
         return `${elementId}/${codeBlockIndex}`;
@@ -103,6 +104,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         this.textModelService = textModelService;
         this.currentScrollWidth = 0;
         this._isHovered = false;
+        this._isDropdownVisible = false;
         this.isDisposed = false;
         this.element = $(".interactive-result-code-block");
         this.resourceContextKey = instantiationService.createInstance(StaticResourceContextKey);
@@ -133,21 +135,20 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
                 multipleDefinitions: "goto",
                 multipleImplementations: "goto"
             },
-            ariaLabel: ( localize(7008, "Code block")),
+            ariaLabel: ( localize(7290, "Code block")),
             overflowWidgetsDomNode,
             tabFocusMode: true,
             ...this.getEditorOptionsFromConfig()
         });
         const toolbarElement = append(this.element, $(".interactive-result-code-block-toolbar"));
+        this._toolbarElement = toolbarElement;
         const editorScopedService = this._register(this.editor.contextKeyService.createScoped(toolbarElement));
         const editorScopedInstantiationService = this._register(scopedInstantiationService.createChild(( new ServiceCollection([IContextKeyService, editorScopedService]))));
-        this.toolbar = this._register(
-            editorScopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarElement, menuId, {
-                menuOptions: {
-                    shouldForwardArgs: true
-                }
-            })
-        );
+        this._toolbarFactory = () => editorScopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarElement, menuId, {
+            menuOptions: {
+                shouldForwardArgs: true
+            }
+        });
         const vulnsContainer = append(this.element, $(".interactive-result-vulns"));
         const vulnsHeaderElement = append(vulnsContainer, $(".interactive-result-vulns-header", undefined));
         this.vulnsButton = this._register(( new Button(vulnsHeaderElement, {
@@ -169,23 +170,18 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             this.element.classList.toggle("chat-vulnerabilities-collapsed", !element.vulnerabilitiesListExpanded);
             this.layout();
         }));
-        let isDropdownVisible = false;
-        this._register(this.toolbar.onDidChangeDropdownVisibility(e => {
-            isDropdownVisible = e;
-            toolbarElement.classList.toggle("force-visibility", e || this._isHovered);
-        }));
         this._isHovered = false;
         this._register(addDisposableListener(this.element, "mouseenter", () => {
             this._isHovered = true;
             toolbarElement.classList.add("force-visibility");
+            this._ensureToolbar();
         }));
         this._register(addDisposableListener(this.element, "mouseleave", () => {
             this._isHovered = false;
-            if (!isDropdownVisible) {
+            if (!this._isDropdownVisible) {
                 toolbarElement.classList.remove("force-visibility");
             }
         }));
-        this._toolbarElement = toolbarElement;
         this._configureForScreenReader();
         this._register(
             this.accessibilityService.onDidChangeScreenReaderOptimized(() => this._configureForScreenReader())
@@ -213,6 +209,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         }));
         this._register(this.editor.onDidFocusEditorWidget(() => {
             this.element.classList.add("focused");
+            this._ensureToolbar();
             WordHighlighterContribution.get(this.editor)?.restoreViewState(true);
         }));
         this._register(
@@ -281,15 +278,60 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             }
         });
     }
+    _ensureToolbar() {
+        if (this.isDisposed) {
+            return undefined;
+        }
+        if (this.currentCodeBlockData?.renderOptions?.hideToolbar) {
+            return undefined;
+        }
+        if (!this.toolbar) {
+            const factory = this._toolbarFactory;
+            if (!factory) {
+                return undefined;
+            }
+            this._toolbarFactory = undefined;
+            const toolbar = this._register(factory());
+            this.toolbar = toolbar;
+            this._register(toolbar.onDidChangeDropdownVisibility(e => {
+                this._isDropdownVisible = e;
+                this._toolbarElement.classList.toggle("force-visibility", e || this._isHovered);
+            }));
+            if (this._pendingToolbarAriaLabel !== undefined) {
+                toolbar.setAriaLabel(this._pendingToolbarAriaLabel);
+                this._pendingToolbarAriaLabel = undefined;
+            }
+            if (this._pendingToolbarContext !== undefined) {
+                toolbar.context = this._pendingToolbarContext;
+                this._pendingToolbarContext = undefined;
+            }
+        }
+        return this.toolbar;
+    }
     _configureForScreenReader() {
-        const toolbarElt = this.toolbar.getElement();
+        const hideToolbar = !!this.currentCodeBlockData?.renderOptions?.hideToolbar;
         if (this.accessibilityService.isScreenReaderOptimized()) {
-            toolbarElt.style.display = "block";
+            if (hideToolbar) {
+                hide(this._toolbarElement);
+            } else {
+                this._toolbarElement.style.display = "block";
+                if (this.currentCodeBlockData) {
+                    this._ensureToolbar();
+                }
+            }
+        } else if (hideToolbar) {
+            hide(this._toolbarElement);
         } else {
-            toolbarElt.style.display = "";
+            this._toolbarElement.style.display = "";
         }
     }
     getEditorOptionsFromConfig() {
+        const renderOptions = this.currentCodeBlockData?.renderOptions;
+        const scrollbar = renderOptions?.maxHeightInLines ? {
+            vertical: "auto",
+            verticalScrollbarSize: defaultChatScrollbarSize,
+            ...renderOptions?.editorOptions?.scrollbar
+        } : undefined;
         return {
             wordWrap: this.editorOptions.configuration.resultEditor.wordWrap,
             fontLigatures: this.editorOptions.configuration.resultEditor.fontLigatures,
@@ -298,7 +340,10 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             fontSize: this.editorOptions.configuration.resultEditor.fontSize,
             fontWeight: this.editorOptions.configuration.resultEditor.fontWeight,
             lineHeight: this.editorOptions.configuration.resultEditor.lineHeight,
-            ...this.currentCodeBlockData?.renderOptions?.editorOptions
+            ...renderOptions?.editorOptions,
+            ...(scrollbar ? {
+                scrollbar
+            } : {})
         };
     }
     layout(width = this.lastLayoutWidth) {
@@ -342,15 +387,23 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         });
         if (!this.editor.getOption(EditorOption.ariaLabel)) {
             this.editor.updateOptions({
-                ariaLabel: ( localize(7009, "Code block {0}", data.codeBlockIndex + 1))
+                ariaLabel: ( localize(7291, "Code block {0}", data.codeBlockIndex + 1))
             });
         }
         this.layout(width);
-        this.toolbar.setAriaLabel(( localize(7010, "Code block {0}", data.codeBlockIndex + 1)));
+        const toolbarAriaLabel = ( localize(7292, "Code block {0}", data.codeBlockIndex + 1));
+        if (this.toolbar) {
+            this.toolbar.setAriaLabel(toolbarAriaLabel);
+        } else {
+            this._pendingToolbarAriaLabel = toolbarAriaLabel;
+        }
         if (data.renderOptions?.hideToolbar) {
-            hide(this.toolbar.getElement());
+            hide(this._toolbarElement);
         } else {
-            show(this.toolbar.getElement());
+            show(this._toolbarElement);
+            if (this.accessibilityService.isScreenReaderOptimized()) {
+                this._ensureToolbar();
+            }
         }
         if (data.vulns?.length && isResponseVM(data.element)) {
             clearNode(this.vulnsListElement);
@@ -401,7 +454,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         if (!this.currentCodeBlockData || !this.currentCodeBlockData.vulns) {
             return "";
         }
-        const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ? ( localize(7011, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(7012, "{0} vulnerability", 1));
+        const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ? ( localize(7293, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(7294, "{0} vulnerability", 1));
         const icon = element => element.vulnerabilitiesListExpanded ? Codicon.chevronDown : Codicon.chevronRight;
         return `${referencesLabel} $(${icon(this.currentCodeBlockData.element).id})`;
     }
@@ -410,7 +463,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         if (!textModel) {
             return;
         }
-        this.toolbar.context = {
+        const context = {
             code: textModel.getTextBuffer().getValueInRange(textModel.getFullModelRange(), EndOfLinePreference.TextDefined),
             codeBlockIndex: data.codeBlockIndex,
             element: data.element,
@@ -418,6 +471,11 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             codemapperUri: data.codemapperUri,
             chatSessionResource: data.chatSessionResource
         };
+        if (this.toolbar) {
+            this.toolbar.context = context;
+        } else {
+            this._pendingToolbarContext = context;
+        }
         this.resourceContextKey.set(textModel.uri);
     }
     setText(newText) {
@@ -531,7 +589,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 multipleDefinitions: "goto",
                 multipleImplementations: "goto"
             },
-            ariaLabel: ( localize(7008, "Code block")),
+            ariaLabel: ( localize(7290, "Code block")),
             overflowWidgetsDomNode,
             ...this.getEditorOptionsFromConfig()
         });
@@ -610,8 +668,8 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             stickyScroll: {
                 enabled: false
             },
-            originalAriaLabel: ( localize(7013, "Original")),
-            modifiedAriaLabel: ( localize(7014, "Modified")),
+            originalAriaLabel: ( localize(7295, "Original")),
+            modifiedAriaLabel: ( localize(7296, "Modified")),
             diffAlgorithm: "advanced",
             readOnly: false,
             isInEmbeddedEditor: true,
@@ -652,7 +710,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         const toolbarElt = this.toolbar.getElement();
         toolbarElt.style.display = "block";
         if (this.accessibilityService.isScreenReaderOptimized()) {
-            toolbarElt.ariaLabel = ( localize(7015, "Code block toolbar"));
+            toolbarElt.ariaLabel = ( localize(7297, "Code block toolbar"));
         }
     }
     getEditorOptionsFromConfig() {
@@ -693,7 +751,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         await this.updateEditor(data, token);
         this.layout(width);
         this.diffEditor.updateOptions({
-            ariaLabel: ( localize(7016, "Code Edits")),
+            ariaLabel: ( localize(7298, "Code Edits")),
             readOnly: !!data.isReadOnly
         });
         this.resourceLabel.element.setFile(data.edit.uri, {
@@ -728,12 +786,12 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             });
             let template;
             if (data.edit.state.applied === 1) {
-                template = ( localize(7017, "Applied 1 change in [[``{0}``]]", uriLabel));
+                template = ( localize(7299, "Applied 1 change in [[``{0}``]]", uriLabel));
             } else if (data.edit.state.applied < 0) {
-                template = ( localize(7018, "Edits in [[``{0}``]] have been rejected", uriLabel));
+                template = ( localize(7300, "Edits in [[``{0}``]] have been rejected", uriLabel));
             } else {
                 template = ( localize(
-                    7019,
+                    7301,
                     "Applied {0} changes in [[``{1}``]]",
                     data.edit.state.applied,
                     uriLabel
@@ -863,8 +921,8 @@ let DefaultChatTextEditor = class DefaultChatTextEditor {
     async _checkSha1(model, item) {
         if (item.state?.sha1 && this._sha1.computeSHA1(model) && this._sha1.computeSHA1(model) !== item.state.sha1) {
             const result = await this.dialogService.confirm({
-                message: ( localize(7020, "The original file has been modified.")),
-                detail: ( localize(7021, "Do you want to apply the changes anyway?"))
+                message: ( localize(7302, "The original file has been modified.")),
+                detail: ( localize(7303, "Do you want to apply the changes anyway?"))
             });
             if (!result.confirmed) {
                 return false;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css

@@ -22,6 +22,11 @@
 	font-size: var(--vscode-chat-font-size-body-s);
 }
 
+.chat-confirmation-widget-message {
+	-webkit-user-select: text;
+	user-select: text;
+}
+
 .chat-confirmation-widget-container .chat-confirmation-widget .chat-confirmation-widget-title {
 	width: 100%;
 	border-radius: 3px;