@codingame/monaco-vscode-katex-common 26.2.1 → 27.0.0

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

@@ -1,10 +1,8 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { h, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { h, createElement, $ } 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 } 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';
@@ -12,11 +10,16 @@ import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 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 { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { LanguageModelPartAudience } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
+import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatQueryTitlePart } from './chatConfirmationWidget.js';
 import { ChatToolOutputContentSubPart } from './chatToolOutputContentSubPart.js';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -47,7 +50,9 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         _instantiationService,
         hoverService,
         modelService,
-        languageService
+        languageService,
+        chatMarkdownAnchorService,
+        configurationService
     ) {
         super();
         this.context = context;
@@ -57,8 +62,8 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         this._instantiationService = _instantiationService;
         this.modelService = modelService;
         this.languageService = languageService;
-        this._onDidChangeHeight = this._register(( new Emitter()));
-        this.onDidChangeHeight = this._onDidChangeHeight.event;
+        this.chatMarkdownAnchorService = chatMarkdownAnchorService;
+        this.configurationService = configurationService;
         this._editorReferences = [];
         this._contentInitialized = false;
         const container = h(".chat-confirmation-widget-container");
@@ -69,33 +74,44 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         this._titlePart = this._register(
             _instantiationService.createInstance(ChatQueryTitlePart, titleEl.root, title, subtitle)
         );
-        this._register(this._titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+        renderFileWidgets(
+            titleEl.root,
+            this._instantiationService,
+            this.chatMarkdownAnchorService,
+            this._store
+        );
         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.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 hoverChevron = $("span.chat-collapsible-hover-chevron.codicon.codicon-chevron-right");
+        hoverChevron.setAttribute("aria-hidden", "true");
+        btn.element.appendChild(hoverChevron);
+        const showCheckmarks = observableConfigValue(
+            AccessibilityWorkbenchSettingId.ShowChatCheckmarks,
+            false,
+            this.configurationService
         );
-        if (progressTooltip) {
-            this._register(hoverService.setupDelayedHover(check.root, {
-                content: progressTooltip,
-                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");
+            const checkmarksEnabled = showCheckmarks.read(r);
             elements.root.classList.toggle("collapsed", !value);
+            if (isError) {
+                btn.icon = Codicon.error;
+            } else {
+                btn.icon = output ? Codicon.check : ThemeIcon.modify(Codicon.loading, "spin");
+            }
+            container.root.classList.toggle("show-checkmarks", checkmarksEnabled);
+            hoverChevron.classList.toggle("codicon-chevron-right", !value);
+            hoverChevron.classList.toggle("codicon-chevron-down", 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 => {
             if (!e.defaultPrevented) {
@@ -129,13 +145,13 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
             input,
             output
         } = this;
-        contents.inputTitle.textContent = ( localize(6011, "Input"));
+        contents.inputTitle.textContent = ( localize(6534, "Input"));
         this.addCodeBlock(input, contents.input);
         if (!output) {
             contents.output.remove();
             contents.outputTitle.remove();
         } else {
-            contents.outputTitle.textContent = ( localize(6012, "Output"));
+            contents.outputTitle.textContent = ( localize(6535, "Output"));
             const outputSubPart = this._register(
                 this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts)
             );
@@ -163,9 +179,6 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         };
         const editorReference = this._register(this.context.editorPool.get());
         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);
     }
@@ -177,6 +190,6 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         this._outputSubPart?.layout(width);
     }
 };
-ChatCollapsibleInputOutputContentPart = ( __decorate([( __param(8, IContextKeyService)), ( __param(9, IInstantiationService)), ( __param(10, IHoverService)), ( __param(11, IModelService)), ( __param(12, ILanguageService))], ChatCollapsibleInputOutputContentPart));
+ChatCollapsibleInputOutputContentPart = ( __decorate([( __param(8, IContextKeyService)), ( __param(9, IInstantiationService)), ( __param(10, IHoverService)), ( __param(11, IModelService)), ( __param(12, ILanguageService)), ( __param(13, IChatMarkdownAnchorService)), ( __param(14, IConfigurationService))], ChatCollapsibleInputOutputContentPart));
 
 export { ChatCollapsibleInputOutputContentPart };

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

@@ -292,7 +292,7 @@ class SaveResourcesAction extends Action2 {
     constructor() {
         super({
             id: SaveResourcesAction.ID,
-            title: ( localize2(6013, "Save As...")),
+            title: ( localize2(6536, "Save As...")),
             icon: Codicon.cloudDownload,
             menu: [{
                 id: MenuId.ChatToolOutputResourceToolbar,
@@ -322,14 +322,14 @@ class SaveResourcesAction extends Action2 {
                     await fileService.writeFile(target, contents.value);
                 }
             } catch (e) {
-                notificationService.error(( localize(6014, "Failed to save {0}: {1}", basename(part.uri), e)));
+                notificationService.error(( localize(6537, "Failed to save {0}: {1}", basename(part.uri), e)));
             }
         };
         const withProgress = async (thenReveal, todo) => {
             await progressService.withProgress({
                 location: ProgressLocation.Notification,
                 delay: 5_000,
-                title: ( localize(6015, "Saving resources..."))
+                title: ( localize(6538, "Saving resources..."))
             }, async report => {
                 for (const task of todo) {
                     await task();
@@ -342,7 +342,7 @@ class SaveResourcesAction extends Action2 {
             if (workspaceContextService.isInsideWorkspace(thenReveal)) {
                 commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, thenReveal);
             } else {
-                notificationService.info(( localize(6016, "Saved resources to {0}", labelService.getUriLabel(thenReveal))));
+                notificationService.info(( localize(6539, "Saved resources to {0}", labelService.getUriLabel(thenReveal))));
             }
         };
         if (context.parts.length === 1) {
@@ -354,7 +354,7 @@ class SaveResourcesAction extends Action2 {
             await withProgress(uri, [() => savePart(part, false, uri)]);
         } else {
             const uris = await fileDialog.showOpenDialog({
-                title: ( localize(6017, "Pick folder to save resources")),
+                title: ( localize(6540, "Pick folder to save resources")),
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,

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(6018, "File Tree"))
+                    getWidgetAriaLabel: () => ( localize(6541, "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(
-                    6019,
+                    6542,
                     "Deleted `{0}`",
                     this.labelService.getUriBasenameLabel(edit.oldResource)
                 )), Codicon.trash);
             } else if (!edit.oldResource && edit.newResource) {
-                renderEntry(( localize(6020, "Created []({0})", (edit.newResource.toString()))), Codicon.newFile);
+                renderEntry(( localize(6543, "Created []({0})", (edit.newResource.toString()))), Codicon.newFile);
             } else if (edit.oldResource && edit.newResource) {
                 renderEntry(( localize(
-                    6021,
+                    6544,
                     "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

@@ -1,5 +1,4 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IDiffEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
@@ -71,8 +70,6 @@ export declare class CodeBlockPart extends Disposable {
     protected readonly modelService: IModelService;
     private readonly configurationService;
     private readonly accessibilityService;
-    protected readonly _onDidChangeContentHeight: Emitter<void>;
-    readonly onDidChangeContentHeight: Event<void>;
     readonly editor: CodeEditorWidget;
     protected readonly toolbar: MenuWorkbenchToolBar;
     private readonly contextKeyService;
@@ -81,6 +78,7 @@ export declare class CodeBlockPart extends Disposable {
     private readonly vulnsListElement;
     private currentCodeBlockData;
     private currentScrollWidth;
+    private lastLayoutWidth;
     private isDisposed;
     private resourceContextKey;
     private get verticalPadding();
@@ -92,7 +90,7 @@ export declare class CodeBlockPart extends Disposable {
     private updatePaddingForLayout;
     private _configureForScreenReader;
     private getEditorOptionsFromConfig;
-    layout(width: number): void;
+    layout(width?: number | undefined): void;
     private getContentHeight;
     render(data: ICodeBlockData, width: number): Promise<void>;
     reset(): void;
@@ -111,6 +109,7 @@ export interface ICodeCompareBlockActionContext {
     readonly element: IChatResponseViewModel;
     readonly diffEditor: IDiffEditor;
     readonly edit: IChatTextEditGroup;
+    toggleDiffViewMode(): void;
 }
 export interface ICodeCompareBlockDiffData {
     modified: ITextModel;
@@ -134,8 +133,6 @@ export declare class CodeCompareBlockPart extends Disposable {
     private readonly accessibilityService;
     private readonly labelService;
     private readonly openerService;
-    protected readonly _onDidChangeContentHeight: Emitter<void>;
-    readonly onDidChangeContentHeight: Event<void>;
     private readonly contextKeyService;
     private readonly diffEditor;
     private readonly resourceLabel;
@@ -146,6 +143,7 @@ export declare class CodeCompareBlockPart extends Disposable {
     private readonly _lastDiffEditorViewModel;
     private currentScrollWidth;
     private currentHorizontalPadding;
+    private lastLayoutWidth;
     constructor(options: ChatEditorOptions, menuId: MenuId, delegate: IChatRendererDelegate, overflowWidgetsDomNode: HTMLElement | undefined, isSimpleWidget: boolean | undefined, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, modelService: IModelService, configurationService: IConfigurationService, accessibilityService: IAccessibilityService, labelService: ILabelService, openerService: IOpenerService);
     get uri(): URI | undefined;
     private createDiffEditor;
@@ -153,7 +151,7 @@ export declare class CodeCompareBlockPart extends Disposable {
     private updatePaddingForLayout;
     private _configureForScreenReader;
     private getEditorOptionsFromConfig;
-    layout(width: number): void;
+    layout(width?: number | undefined): void;
     render(data: ICodeCompareBlockData, width: number, token: CancellationToken): Promise<void>;
     reset(): void;
     private clearWidgets;

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

@@ -6,7 +6,7 @@ import { $ as $$1, append, hide, show, clearNode, getTotalHeight, Dimension, res
 import { renderFormattedText } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/formattedTextRenderer';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-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 { Disposable, MutableDisposable, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -61,6 +61,7 @@ import { emptyProgressRunner } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IEditorProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { SuggestController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/suggest/browser/suggestController';
 import { SnippetController2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/snippet/browser/snippetController2';
+import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 
 registerCss(codeBlockPart);
 const $ = $$1;
@@ -116,8 +117,6 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         this.modelService = modelService;
         this.configurationService = configurationService;
         this.accessibilityService = accessibilityService;
-        this._onDidChangeContentHeight = this._register(( new Emitter()));
-        this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
         this.currentScrollWidth = 0;
         this.isDisposed = false;
         this.element = $(".interactive-result-code-block");
@@ -149,13 +148,13 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
                 multipleDefinitions: "goto",
                 multipleImplementations: "goto"
             },
-            ariaLabel: ( localize(6022, "Code block")),
+            ariaLabel: ( localize(6545, "Code block")),
             overflowWidgetsDomNode,
             tabFocusMode: true,
             ...this.getEditorOptionsFromConfig()
         });
         const toolbarElement = append(this.element, $(".interactive-result-code-block-toolbar"));
-        const editorScopedService = this.editor.contextKeyService.createScoped(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, {
@@ -183,7 +182,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             element.vulnerabilitiesListExpanded = !element.vulnerabilitiesListExpanded;
             this.vulnsButton.label = this.getVulnerabilitiesLabel();
             this.element.classList.toggle("chat-vulnerabilities-collapsed", !element.vulnerabilitiesListExpanded);
-            this._onDidChangeContentHeight.fire();
+            this.layout();
         }));
         this._register(this.toolbar.onDidChangeDropdownVisibility(e => {
             toolbarElement.classList.toggle("force-visibility", e);
@@ -205,7 +204,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         }));
         this._register(this.editor.onDidContentSizeChange(e => {
             if (e.contentHeightChanged) {
-                this._onDidChangeContentHeight.fire();
+                this.layout();
             }
         }));
         this._register(this.editor.onDidBlurEditorWidget(() => {
@@ -294,7 +293,11 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             ...this.currentCodeBlockData?.renderOptions?.editorOptions
         };
     }
-    layout(width) {
+    layout(width = this.lastLayoutWidth) {
+        if (width === undefined) {
+            return;
+        }
+        this.lastLayoutWidth = width;
         const contentHeight = this.getContentHeight();
         let height = contentHeight;
         if (this.currentCodeBlockData?.renderOptions?.maxHeightInLines) {
@@ -336,11 +339,11 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         });
         if (!this.editor.getOption(EditorOption.ariaLabel)) {
             this.editor.updateOptions({
-                ariaLabel: ( localize(6023, "Code block {0}", data.codeBlockIndex + 1))
+                ariaLabel: ( localize(6546, "Code block {0}", data.codeBlockIndex + 1))
             });
         }
         this.layout(width);
-        this.toolbar.setAriaLabel(( localize(6024, "Code block {0}", data.codeBlockIndex + 1)));
+        this.toolbar.setAriaLabel(( localize(6547, "Code block {0}", data.codeBlockIndex + 1)));
         if (data.renderOptions?.hideToolbar) {
             hide(this.toolbar.getElement());
         } else {
@@ -363,7 +366,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         } else {
             this.element.classList.add("no-vulns");
         }
-        this._onDidChangeContentHeight.fire();
+        this.layout();
     }
     reset() {
         this.clearWidgets();
@@ -395,7 +398,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         if (!this.currentCodeBlockData || !this.currentCodeBlockData.vulns) {
             return "";
         }
-        const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ? ( localize(6025, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(6026, "{0} vulnerability", 1));
+        const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ? ( localize(6548, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(6549, "{0} vulnerability", 1));
         const icon = element => element.vulnerabilitiesListExpanded ? Codicon.chevronDown : Codicon.chevronRight;
         return `${referencesLabel} $(${icon(this.currentCodeBlockData.element).id})`;
     }
@@ -460,8 +463,6 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         this.accessibilityService = accessibilityService;
         this.labelService = labelService;
         this.openerService = openerService;
-        this._onDidChangeContentHeight = this._register(( new Emitter()));
-        this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
         this._lastDiffEditorViewModel = this._store.add(( new MutableDisposable()));
         this.currentScrollWidth = 0;
         this.currentHorizontalPadding = 0;
@@ -507,7 +508,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 multipleDefinitions: "goto",
                 multipleImplementations: "goto"
             },
-            ariaLabel: ( localize(6022, "Code block")),
+            ariaLabel: ( localize(6545, "Code block")),
             overflowWidgetsDomNode,
             ...this.getEditorOptionsFromConfig()
         });
@@ -540,11 +541,6 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         this._register(this.diffEditor.getModifiedEditor().onDidScrollChange(e => {
             this.currentScrollWidth = e.scrollWidth;
         }));
-        this._register(this.diffEditor.onDidContentSizeChange(e => {
-            if (e.contentHeightChanged) {
-                this._onDidChangeContentHeight.fire();
-            }
-        }));
         this._register(this.diffEditor.getModifiedEditor().onDidBlurEditorWidget(() => {
             this.element.classList.remove("focused");
             WordHighlighterContribution.get(this.diffEditor.getModifiedEditor())?.stopHighlighting();
@@ -591,8 +587,8 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             stickyScroll: {
                 enabled: false
             },
-            originalAriaLabel: ( localize(6027, "Original")),
-            modifiedAriaLabel: ( localize(6028, "Modified")),
+            originalAriaLabel: ( localize(6550, "Original")),
+            modifiedAriaLabel: ( localize(6551, "Modified")),
             diffAlgorithm: "advanced",
             readOnly: false,
             isInEmbeddedEditor: true,
@@ -631,11 +627,9 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
     }
     _configureForScreenReader() {
         const toolbarElt = this.toolbar.getElement();
+        toolbarElt.style.display = "block";
         if (this.accessibilityService.isScreenReaderOptimized()) {
-            toolbarElt.style.display = "block";
-            toolbarElt.ariaLabel = ( localize(6029, "Code block toolbar"));
-        } else {
-            toolbarElt.style.display = "";
+            toolbarElt.ariaLabel = ( localize(6552, "Code block toolbar"));
         }
     }
     getEditorOptionsFromConfig() {
@@ -649,7 +643,11 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             lineHeight: this.options.configuration.resultEditor.lineHeight
         };
     }
-    layout(width) {
+    layout(width = this.lastLayoutWidth) {
+        if (width === undefined) {
+            return;
+        }
+        this.lastLayoutWidth = width;
         const editorBorder = 2;
         const toolbar = getTotalHeight(this.editorHeader);
         const content = this.diffEditor.getModel() ? this.diffEditor.getContentHeight() : getTotalHeight(this.messageElement);
@@ -657,7 +655,6 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             width - editorBorder - this.currentHorizontalPadding * 2,
             toolbar + content
         );
-        this.element.style.height = `${dimension.height}px`;
         this.element.style.width = `${dimension.width}px`;
         this.diffEditor.layout(dimension.with(undefined, content - editorBorder));
         this.updatePaddingForLayout();
@@ -673,7 +670,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         await this.updateEditor(data, token);
         this.layout(width);
         this.diffEditor.updateOptions({
-            ariaLabel: ( localize(6030, "Code Edits")),
+            ariaLabel: ( localize(6553, "Code Edits")),
             readOnly: !!data.isReadOnly
         });
         this.resourceLabel.element.setFile(data.edit.uri, {
@@ -683,7 +680,6 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 badges: false
             }
         });
-        this._onDidChangeContentHeight.fire();
     }
     reset() {
         this.clearWidgets();
@@ -709,12 +705,12 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             });
             let template;
             if (data.edit.state.applied === 1) {
-                template = ( localize(6031, "Applied 1 change in [[``{0}``]]", uriLabel));
+                template = ( localize(6554, "Applied 1 change in [[``{0}``]]", uriLabel));
             } else if (data.edit.state.applied < 0) {
-                template = ( localize(6032, "Edits in [[``{0}``]] have been rejected", uriLabel));
+                template = ( localize(6555, "Edits in [[``{0}``]] have been rejected", uriLabel));
             } else {
                 template = ( localize(
-                    6033,
+                    6556,
                     "Applied {0} changes in [[``{1}``]]",
                     data.edit.state.applied,
                     uriLabel
@@ -752,12 +748,21 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         } else {
             this.diffEditor.setModel(null);
             this._lastDiffEditorViewModel.value = undefined;
-            this._onDidChangeContentHeight.fire();
         }
         this.toolbar.context = {
             edit: data.edit,
             element: data.element,
-            diffEditor: this.diffEditor
+            diffEditor: this.diffEditor,
+            toggleDiffViewMode: () => {
+                const isCurrentlyInline = !!this.diffEditor.getModifiedEditor().contextKeyService.getContextKeyValue(EditorContextKeys.diffEditorInlineMode.key);
+                const renderSideBySide = isCurrentlyInline;
+                this.diffEditor.updateOptions({
+                    renderSideBySide,
+                    compactMode: !renderSideBySide,
+                    useInlineViewWhenSpaceIsLimited: false
+                });
+                this.layout();
+            }
         };
     }
 };
@@ -832,8 +837,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(6034, "The original file has been modified.")),
-                detail: ( localize(6035, "Do you want to apply the changes anyway?"))
+                message: ( localize(6557, "The original file has been modified.")),
+                detail: ( localize(6558, "Do you want to apply the changes anyway?"))
             });
             if (!result.confirmed) {
                 return false;

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

@@ -4,14 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 .interactive-item-container.interactive-response .value .chat-markdown-part.rendered-markdown .code:has(.chat-codeblock-pill-container) {
-	margin-bottom: 8px;
+	margin-bottom: 16px;
 }
 
 .chat-markdown-part.rendered-markdown .code .chat-codeblock-pill-container {
 	display: flex;
 	align-items: center;
 	gap: 5px;
-	margin: 0 0 6px 4px;
 	font-size: var(--vscode-chat-font-size-body-s);
 	color: var(--vscode-descriptionForeground);
 
@@ -29,10 +28,20 @@
 			color: var(--vscode-icon-foreground) !important;
 
 			&::before {
-				font-size: var(--vscode-chat-font-size-body-s);
+				font-size: 12px;
 			}
 		}
 
+		.codicon.codicon-check {
+			display: none;
+		}
+
+		.show-checkmarks & .codicon.codicon-check {
+			display: inline-flex;
+			padding-left: 2px;
+			margin-left: 0.2em;
+		}
+
 		.status-label {
 			color: var(--vscode-descriptionForeground);
 			white-space: nowrap;