@codingame/monaco-vscode-katex-common 33.0.9 → 34.0.0

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

@@ -0,0 +1,134 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+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 { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+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 { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ChatEditPillElement } from './chatEditPillElement.js';
+
+let ChatExternalEditContentPart = class ChatExternalEditContentPart extends ChatEditPillElement {
+    get domNode() {
+        return this.element;
+    }
+    constructor(
+        edit,
+        _context,
+        labelService,
+        modelService,
+        languageService,
+        hoverService,
+        editorService
+    ) {
+        super(labelService, modelService, languageService, hoverService);
+        this.edit = edit;
+        this.editorService = editorService;
+        this._onDidChangeDiff = this._register(( new Emitter()));
+        this.onDidChangeDiff = this._onDidChangeDiff.event;
+        this.render(edit);
+        this._register(this.onDidClick(opts => this.openEdit(opts)));
+    }
+    render(edit) {
+        this.setUri(edit.uri);
+        const {
+            icon,
+            label
+        } = describeEdit(edit);
+        this.setStatus(icon, label);
+        this.setProgressFill(undefined);
+        this.setLabelDetail("");
+        if (edit.diff && (edit.diff.added > 0 || edit.diff.removed > 0)) {
+            this.setDiff(edit.diff);
+            const fileName = this.labelService.getUriBasenameLabel(edit.uri);
+            const insertionsFragment = edit.diff.added === 1 ? ( localize(7266, "1 insertion")) : ( localize(7267, "{0} insertions", edit.diff.added));
+            const deletionsFragment = edit.diff.removed === 1 ? ( localize(7268, "1 deletion")) : ( localize(7269, "{0} deletions", edit.diff.removed));
+            this.setAriaLabel(( localize(
+                7270,
+                "Edited {0}, {1}, {2}",
+                fileName,
+                insertionsFragment,
+                deletionsFragment
+            )));
+            const diff = edit.diff;
+            queueMicrotask(() => {
+                if (this._store.isDisposed) {
+                    return;
+                }
+                this._onDidChangeDiff.fire({
+                    added: diff.added,
+                    removed: diff.removed
+                });
+            });
+        } else {
+            this.setDiff(undefined);
+            this.setAriaLabel(`${label} ${this.labelService.getUriBasenameLabel(edit.uri)}`);
+        }
+    }
+    openEdit(
+        {
+            editorOptions: options,
+            openToSide
+        }
+    ) {
+        const group = openToSide ? SIDE_GROUP : undefined;
+        if (this.edit.beforeContentUri && this.edit.afterContentUri) {
+            this.editorService.openEditor({
+                original: {
+                    resource: this.edit.beforeContentUri
+                },
+                modified: {
+                    resource: this.edit.afterContentUri
+                },
+                options
+            }, group);
+        } else if (this.edit.editKind === "delete" && this.edit.beforeContentUri) {
+            this.editorService.openEditor({
+                resource: this.edit.beforeContentUri,
+                options
+            }, group);
+        } else if (this.edit.editKind !== "delete") {
+            this.editorService.openEditor({
+                resource: this.edit.uri,
+                options
+            }, group);
+        }
+    }
+    hasSameContent(other, _followingContent, _element) {
+        if (other.kind !== "externalEdit") {
+            return false;
+        }
+        return (isEqual(other.uri, this.edit.uri) && other.editKind === this.edit.editKind && (other.diff?.added ?? 0) === (this.edit.diff?.added ?? 0) && (other.diff?.removed ?? 0) === (this.edit.diff?.removed ?? 0));
+    }
+};
+ChatExternalEditContentPart = ( __decorate([( __param(2, ILabelService)), ( __param(3, IModelService)), ( __param(4, ILanguageService)), ( __param(5, IHoverService)), ( __param(6, IEditorService))], ChatExternalEditContentPart));
+function describeEdit(edit) {
+    switch (edit.editKind) {
+    case "create":
+        return {
+            icon: Codicon.check,
+            label: ( localize(7271, "Created"))
+        };
+    case "delete":
+        return {
+            icon: Codicon.check,
+            label: ( localize(7272, "Deleted"))
+        };
+    case "rename":
+        return {
+            icon: Codicon.check,
+            label: ( localize(7273, "Renamed"))
+        };
+    case "edit":
+        return {
+            icon: Codicon.check,
+            label: ( localize(7274, "Edited"))
+        };
+    }
+}
+
+export { ChatExternalEditContentPart };

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

@@ -20,7 +20,7 @@ let ChatHookContentPart = class ChatHookContentPart extends ChatCollapsibleConte
         const isStopped = !!hookPart.stopReason;
         const isWarning = !!hookPart.systemMessage;
         const toolName = hookPart.toolDisplayName;
-        const title = isStopped ? (toolName ? ( localize(7146, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7147, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(7148, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7149, "Warning from {0} hook", hookTypeLabel)));
+        const title = isStopped ? (toolName ? ( localize(7275, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7276, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(7277, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(7278, "Warning from {0} hook", hookTypeLabel)));
         super(title, context, undefined, hoverService, configurationService);
         this.hookPart = hookPart;
         this.icon = isStopped ? Codicon.error : isWarning ? Codicon.warning : Codicon.check;

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

@@ -246,10 +246,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             );
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute("aria-label", ( localize(7150, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(7279, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        7151,
+                        7280,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -319,7 +319,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(7152, "Add File to Chat")),
+            title: ( localize2(7281, "Add File to Chat")),
             menu: [{
                 id: MenuId.ChatInlineResourceAnchorContext,
                 group: "chat",
@@ -343,7 +343,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(7153, "Copy")),
+            title: ( localize2(7282, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -370,7 +370,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(7154, "Open to the Side")),
+            title: ( localize2(7283, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -436,8 +436,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(7155, "Go to Definition")),
-                mnemonicTitle: ( localize(7156, "Go to &&Definition"))
+                ...( localize2(7284, "Go to Definition")),
+                mnemonicTitle: ( localize(7285, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -494,8 +494,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(7157, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(7158, "Go to &&Type Definitions"))
+                ...( localize2(7286, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(7287, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -520,8 +520,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(7159, "Go to Implementations")),
-                mnemonicTitle: ( localize(7160, "Go to &&Implementations"))
+                ...( localize2(7288, "Go to Implementations")),
+                mnemonicTitle: ( localize(7289, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -546,8 +546,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(7161, "Go to References")),
-                mnemonicTitle: ( localize(7162, "Go to &&References"))
+                ...( localize2(7290, "Go to References")),
+                mnemonicTitle: ( localize(7291, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,

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

@@ -23,6 +23,7 @@ import { IChatOutputRendererService } from "@codingame/monaco-vscode-api/vscode/
 import { ICodeBlockRenderOptions } from "./codeBlockPart.js";
 import { EditorPool } from "./chatContentCodePools.js";
 import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
+import { ChatEditPillElement } from "./chatEditPillElement.js";
 export interface IChatMarkdownContentPartOptions {
     readonly codeBlockRenderOptions?: ICodeBlockRenderOptions;
     readonly allowInlineDiffs?: boolean;
@@ -91,39 +92,25 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     addDisposable(disposable: IDisposable): void;
 }
 export declare function codeblockHasClosingBackticks(str: string): boolean;
-export declare class CollapsedCodeBlock extends Disposable {
+export declare class CollapsedCodeBlock extends ChatEditPillElement {
     private readonly sessionResource;
     private readonly requestId;
     private readonly inUndoStop;
-    private readonly labelService;
     private readonly editorService;
-    private readonly modelService;
-    private readonly languageService;
     private readonly contextMenuService;
     private readonly contextKeyService;
     private readonly menuService;
-    private readonly hoverService;
     private readonly chatService;
     private readonly configurationService;
-    readonly element: HTMLElement;
-    private readonly pillElement;
-    private readonly statusIndicatorContainer;
-    private _uri;
-    get uri(): URI | undefined;
-    private readonly hover;
-    private tooltip;
     private currentDiff;
     get diff(): IEditSessionEntryDiff | undefined;
     private readonly _onDidChangeDiff;
     readonly onDidChangeDiff: Event<IEditSessionEntryDiff>;
     private readonly progressStore;
     constructor(sessionResource: URI, requestId: string, inUndoStop: string | undefined, labelService: ILabelService, editorService: IEditorService, modelService: IModelService, languageService: ILanguageService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, menuService: IMenuService, hoverService: IHoverService, chatService: IChatService, configurationService: IConfigurationService);
-    private registerListeners;
     private showDiff;
     /**
      * @param uri URI of the file on-disk being changed
-     * @param isStreaming Whether the edit has completed (at the time of this being rendered)
      */
     render(uri: URI): void;
-    private updateTooltip;
 }

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

@@ -1,12 +1,9 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $ as $$1, clearNode, getWindow, DisposableResizeObserver, isHTMLElement, append, addDisposableListener, EventType, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, clearNode, getWindow, DisposableResizeObserver, isHTMLElement, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { allowedMarkdownHtmlAttributes } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
-import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
-import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
-import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { wrapTablesWithScrollable } from './chatMarkdownTableScrolling.js';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
@@ -26,7 +23,6 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
-import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -36,8 +32,6 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 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';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { registerOpenEditorListeners } from '../../../../../../platform/editor/browser/editor.js';
-import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
@@ -56,6 +50,7 @@ import { parseUnifiedDiff, MarkdownDiffBlockPart } from './chatDiffBlockPart.js'
 import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
 import { CodeBlockPart } from './codeBlockPart.js';
 import * as chatCodeBlockPill from './media/chatCodeBlockPill.css';
+import { ChatEditPillElement } from './chatEditPillElement.js';
 import { ChatExtensionsContentPart } from './chatExtensionsContentPart.js';
 import { ChatProgressSubPart } from './chatProgressContentPart.js';
 import { IncrementalDOMMorpher } from './chatIncrementalRendering/chatIncrementalRendering.js';
@@ -592,7 +587,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
         this._disposeCts = this._register(( new CancellationTokenSource()));
         this._renderedOutputPart = this._register(( new MutableDisposable()));
         this.reuseKey = ChatOutputCodeBlockPart_1.reuseKey(context.element.id, codeBlockIndex, identifier);
-        const title = ( localize(7163, "Rendered code block {0}", codeBlockIndex + 1));
+        const title = ( localize(7292, "Rendered code block {0}", codeBlockIndex + 1));
         this.element = $(".interactive-result-code-block.chat-output-code-block.tool-output-part");
         this.element.tabIndex = -1;
         this.element.ariaLabel = title;
@@ -609,7 +604,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
             parent.style.height = `${partState.height}px`;
         }
         const progressMessage = $("span");
-        progressMessage.textContent = ( localize(7164, "Rendering code block..."));
+        progressMessage.textContent = ( localize(7293, "Rendering code block..."));
         const progressPart = this._register(this.instantiationService.createInstance(
             ChatProgressSubPart,
             progressMessage,
@@ -685,7 +680,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
         iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
         errorHeaderNode.append(iconElement);
         const errorTitleNode = $(".output-error-title");
-        errorTitleNode.textContent = ( localize(7165, "Error rendering the code block"));
+        errorTitleNode.textContent = ( localize(7294, "Error rendering the code block"));
         errorHeaderNode.append(errorTitleNode);
         const errorMessageNode = $(".output-error-details");
         errorMessageNode.textContent = error?.message || String(error);
@@ -694,10 +689,7 @@ let ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = class ChatOutputCodeBl
     }
 };
 ChatOutputCodeBlockPart = ChatOutputCodeBlockPart_1 = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IChatOutputRendererService)), ( __param(8, IChatOutputPartStateCache))], ChatOutputCodeBlockPart));
-let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
-    get uri() {
-        return this._uri;
-    }
+let CollapsedCodeBlock = class CollapsedCodeBlock extends ChatEditPillElement {
     get diff() {
         return this.currentDiff;
     }
@@ -716,60 +708,40 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
         chatService,
         configurationService
     ) {
-        super();
+        super(labelService, modelService, languageService, hoverService);
         this.sessionResource = sessionResource;
         this.requestId = requestId;
         this.inUndoStop = inUndoStop;
-        this.labelService = labelService;
         this.editorService = editorService;
-        this.modelService = modelService;
-        this.languageService = languageService;
         this.contextMenuService = contextMenuService;
         this.contextKeyService = contextKeyService;
         this.menuService = menuService;
-        this.hoverService = hoverService;
         this.chatService = chatService;
         this.configurationService = configurationService;
-        this.hover = this._register(( new MutableDisposable()));
         this._onDidChangeDiff = this._register(( new Emitter()));
         this.onDidChangeDiff = this._onDidChangeDiff.event;
         this.progressStore = this._store.add(( new DisposableStore()));
-        this.element = $("div.chat-codeblock-pill-container");
-        this.statusIndicatorContainer = $("div.status-indicator-container");
-        this.pillElement = $(".chat-codeblock-pill-widget");
-        this.pillElement.tabIndex = 0;
-        this.pillElement.classList.add("show-file-icons");
-        this.pillElement.role = "button";
-        this.element.appendChild(this.statusIndicatorContainer);
-        this.element.appendChild(this.pillElement);
-        this.registerListeners();
-    }
-    registerListeners() {
-        this._register(registerOpenEditorListeners(this.pillElement, e => this.showDiff(e)));
-        this._register(
-            addDisposableListener(this.pillElement, EventType.CONTEXT_MENU, e => {
-                const event = ( new StandardMouseEvent(getWindow(e), e));
-                EventHelper.stop(e, true);
-                this.contextMenuService.showContextMenu({
-                    contextKeyService: this.contextKeyService,
-                    getAnchor: () => event,
-                    getActions: () => {
-                        if (!this.uri) {
-                            return [];
-                        }
-                        const menu = this.menuService.getMenuActions(MenuId.ChatEditingCodeBlockContext, this.contextKeyService, {
-                            arg: {
-                                sessionResource: this.sessionResource,
-                                requestId: this.requestId,
-                                uri: this.uri,
-                                stopId: this.inUndoStop
-                            }
-                        });
-                        return getFlatContextMenuActions(menu);
+        this._register(this.onDidClick(e => this.showDiff(e)));
+        this._register(this.onDidContextMenu(event => {
+            this.contextMenuService.showContextMenu({
+                contextKeyService: this.contextKeyService,
+                getAnchor: () => event,
+                getActions: () => {
+                    if (!this.uri) {
+                        return [];
                     }
-                });
-            })
-        );
+                    const menu = this.menuService.getMenuActions(MenuId.ChatEditingCodeBlockContext, this.contextKeyService, {
+                        arg: {
+                            sessionResource: this.sessionResource,
+                            requestId: this.requestId,
+                            uri: this.uri,
+                            stopId: this.inUndoStop
+                        }
+                    });
+                    return getFlatContextMenuActions(menu);
+                }
+            });
+        }));
     }
     showDiff(
         {
@@ -796,21 +768,11 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
     }
     render(uri) {
         this.progressStore.clear();
-        this._uri = uri;
+        this.setUri(uri);
+        this.setStatus(undefined, "");
+        this.setLabelDetail("");
+        this.setProgressFill(undefined);
         const session = this.chatService.getSession(this.sessionResource);
-        const iconText = this.labelService.getUriBasenameLabel(uri);
-        const statusIconEl = $$1("span.status-icon");
-        const statusLabelEl = $$1("span.status-label", {}, "");
-        this.statusIndicatorContainer.replaceChildren(statusIconEl, statusLabelEl);
-        const iconEl = $$1("span.icon");
-        const iconLabelEl = $$1("span.icon-label", {}, iconText);
-        const labelDetail = $$1("span.label-detail", {}, "");
-        const progressFill = $$1("span.progress-fill");
-        this.pillElement.replaceChildren(progressFill, iconEl, iconLabelEl, labelDetail);
-        const tooltipLabel = this.labelService.getUriLabel(uri, {
-            relative: true
-        });
-        this.updateTooltip(tooltipLabel);
         const editSession = session?.editingSession;
         if (!editSession) {
             return;
@@ -824,39 +786,25 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
             const currentlyModified = entry?.isCurrentlyBeingModifiedBy.read(r);
             return !!currentlyModified && currentlyModified.responseModel.requestId === this.requestId && currentlyModified.undoStopId === this.inUndoStop;
         });
-        let statusIconClasses = [];
-        let pillIconClasses = [];
+        const iconText = this.labelService.getUriBasenameLabel(uri);
         this.progressStore.add(autorun(r => {
-            statusIconEl.classList.remove(...statusIconClasses);
-            iconEl.classList.remove(...pillIconClasses);
             if (isStreaming.read(r)) {
                 const codicon = ThemeIcon.modify(Codicon.loading, "spin");
-                statusIconClasses = ThemeIcon.asClassNameArray(codicon);
-                statusIconEl.classList.add(...statusIconClasses);
+                this.setStatus(codicon, ( localize(7295, "Applying edits")));
                 const entry = editSession.readEntry(uri, r);
                 const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
-                statusLabelEl.textContent = ( localize(7166, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
-                    progressFill.style.width = `${rwRatio}%`;
-                    this.pillElement.classList.add("progress-filling");
-                    labelDetail.textContent = "";
+                    this.setProgressFill(rwRatio);
+                    this.setLabelDetail("");
                 } else {
-                    progressFill.style.width = "0%";
-                    this.pillElement.classList.remove("progress-filling");
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(7167, "Generating edits...")) : ( localize(7168, "({0}%)...", rwRatio));
+                    this.setProgressFill(undefined);
+                    this.setLabelDetail(rwRatio === 0 || !rwRatio ? ( localize(7296, "Generating edits...")) : ( localize(7297, "({0}%)...", rwRatio)));
                 }
             } else {
-                const statusCodeicon = Codicon.check;
-                statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
-                statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(7169, "Edited"));
-                const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
-                pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
-                iconEl.classList.add(...pillIconClasses);
-                this.pillElement.classList.remove("progress-filling");
-                progressFill.style.width = "0%";
-                labelDetail.textContent = "";
+                this.setStatus(Codicon.check, ( localize(7298, "Edited")));
+                this.setProgressFill(undefined);
+                this.setLabelDetail("");
             }
         }));
         this.progressStore.add(autorunSelfDisposable(r => {
@@ -864,44 +812,28 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
             if (changes === undefined) {
                 return;
             }
-            const labelAdded = this.pillElement.querySelector(".label-added") ?? this.pillElement.appendChild($$1("span.label-added"));
-            const labelRemoved = this.pillElement.querySelector(".label-removed") ?? this.pillElement.appendChild($$1("span.label-removed"));
             if (changes && !changes?.identical && !changes?.quitEarly) {
                 this.currentDiff = changes;
                 this._onDidChangeDiff.fire(changes);
-                labelAdded.textContent = `+${changes.added}`;
-                labelRemoved.textContent = `-${changes.removed}`;
-                const insertionsFragment = changes.added === 1 ? ( localize(7170, "1 insertion")) : ( localize(7171, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(7172, "1 deletion")) : ( localize(7173, "{0} deletions", changes.removed));
-                const summary = ( localize(
-                    7174,
+                this.setDiff({
+                    added: changes.added,
+                    removed: changes.removed
+                });
+                const insertionsFragment = changes.added === 1 ? ( localize(7299, "1 insertion")) : ( localize(7300, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(7301, "1 deletion")) : ( localize(7302, "{0} deletions", changes.removed));
+                this.setAriaLabel(( localize(
+                    7303,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,
                     deletionsFragment
-                ));
-                this.element.ariaLabel = summary;
+                )));
                 if (changes.isFinal) {
                     r.dispose();
                 }
             }
         }));
     }
-    updateTooltip(tooltip) {
-        this.tooltip = tooltip;
-        if (!this.hover.value) {
-            this.hover.value = this.hoverService.setupDelayedHover(this.pillElement, () => ({
-                content: this.tooltip,
-                style: HoverStyle.Pointer,
-                position: {
-                    hoverPosition: HoverPosition.BELOW
-                },
-                persistence: {
-                    hideOnKeyDown: true
-                }
-            }));
-        }
-    }
 };
 CollapsedCodeBlock = ( __decorate([( __param(3, ILabelService)), ( __param(4, IEditorService)), ( __param(5, IModelService)), ( __param(6, ILanguageService)), ( __param(7, IContextMenuService)), ( __param(8, IContextKeyService)), ( __param(9, IMenuService)), ( __param(10, IHoverService)), ( __param(11, IChatService)), ( __param(12, IConfigurationService))], CollapsedCodeBlock));
 function fixCodeText(text, languageId) {

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

@@ -92,25 +92,25 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             text: "`" + escapeMarkdownSyntaxTokens(s.label) + "`",
             id: McpCommandIds.ServerOptions,
             arguments: [s.id],
-            tooltip: ( localize(7175, "Show options for {0}", s.label))
+            tooltip: ( localize(7304, "Show options for {0}", s.label))
         }, false))).join(", ");
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            text: ( localize(7176, "Skip?")),
+            text: ( localize(7305, "Skip?")),
             id: McpCommandIds.SkipCurrentAutostart,
-            tooltip: ( localize(7177, "Skip starting this MCP server"))
+            tooltip: ( localize(7306, "Skip starting this MCP server"))
         });
         let content;
         if (state.starting.length === 0) {
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendText(( localize(7178, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
+            })).appendText(( localize(7307, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
         } else {
             const serverLinks = this.createServerCommandLinks(state.starting);
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendMarkdown(( localize(7179, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
+            })).appendMarkdown(( localize(7308, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
         }
         if (this.workingProgressPart) {
             this.workingProgressPart.updateMessage(content);
@@ -149,12 +149,12 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
         const count = serversRequiringInteraction.length;
         const links = this.createServerCommandLinks(serversRequiringInteraction);
         const content = count === 1 ? ( localize(
-            7180,
+            7309,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            7181,
+            7310,
             "The MCP servers {0} may have new tools and require interaction to start. [Start them now?]({1})",
             links,
             "#start"
@@ -196,7 +196,7 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             const serversToStart = state.serversRequiringInteraction;
             for (let i = 0; i < serversToStart.length; i++) {
                 const serverInfo = serversToStart[i];
-                startLink.textContent = ( localize(7182, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(7311, "Starting {0}...", serverInfo.label));
                 const server = this.mcpService.servers.get().find(s => s.definition.id === serverInfo.id);
                 if (server) {
                     await startServerAndWaitForLiveTools(server, {