@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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(6641, "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(6642, "Code block {0}", data.codeBlockIndex + 1))
             });
         }
         this.layout(width);
-        this.toolbar.setAriaLabel(( localize(6024, "Code block {0}", data.codeBlockIndex + 1)));
+        this.toolbar.setAriaLabel(( localize(6643, "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(6644, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(6645, "{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(6641, "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(6646, "Original")),
+            modifiedAriaLabel: ( localize(6647, "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(6648, "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(6649, "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(6650, "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(6651, "Edits in [[``{0}``]] have been rejected", uriLabel));
             } else {
                 template = ( localize(
-                    6033,
+                    6652,
                     "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(6653, "The original file has been modified.")),
+                detail: ( localize(6654, "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;

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

@@ -5,7 +5,7 @@
 
 .chat-confirmation-widget {
 	border: none;
-	border-radius: 4px;
+	border-radius: var(--vscode-cornerRadius-medium);
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
@@ -83,13 +83,6 @@
 }
 
 .chat-confirmation-widget .chat-confirmation-widget-title.monaco-button {
-	&:hover {
-		background: var(--vscode-toolbar-hoverBackground);
-	}
-
-	&:active {
-		background: var(--vscode-toolbar-activeBackground);
-	}
 
 	.monaco-button-mdlabel {
 		display: flex;
@@ -111,6 +104,7 @@
 
 .chat-confirmation-widget-title small {
 	font-size: 1em;
+	opacity: 0.7;
 
 	&::before {
 		content: ' \2013  ';
@@ -131,7 +125,7 @@
 
 .chat-confirmation-widget .chat-confirmation-widget-message-container {
 	border: 1px solid var(--vscode-chat-requestBorder);
-	border-radius: 4px;
+	border-radius: var(--vscode-cornerRadius-medium);
 	font-size: var(--vscode-chat-font-size-body-s);
 }
 
@@ -199,15 +193,32 @@
 	}
 }
 
+.mcp-app-downloads {
+	margin-top: 8px;
+
+	.chat-collapsible-io-resource-group {
+		animation: mcpDownloadFadeIn 300ms ease-in;
+	}
+}
+
+.mcp-app-downloads:empty {
+	display: none;
+}
+
+@keyframes mcpDownloadFadeIn {
+	from { opacity: 0; }
+	to { opacity: 1; }
+}
+
 .chat-confirmation-widget2 {
 	margin-bottom: 8px;
 	border: 1px solid var(--vscode-chat-requestBorder);
-	border-radius: 4px;
+	border-radius: var(--vscode-cornerRadius-medium);
 }
 
 .chat-confirmation-widget2 .chat-confirmation-widget-title {
 	border-bottom: 1px solid var(--vscode-chat-requestBorder);
-	padding: 5px 9px;
+	padding: 4px 8px;
 	display: flex;
 	justify-content: space-between;
 	column-gap: 10px;
@@ -218,6 +229,10 @@
 		p {
 			margin: 0 !important;
 		}
+
+		.codicon {
+			margin-right: 4px;
+		}
 	}
 
 	p,
@@ -261,7 +276,7 @@
 
 .chat-confirmation-message-terminal .chat-confirmation-message-terminal-disclaimer p:last-child {
 	margin-bottom: 0 !important;
-	padding: 5px 9px 0 9px;
+	padding: 4px 8px 0 8px;
 }
 
 .chat-confirmation-widget-container.hideButtons .chat-confirmation-widget-buttons,
@@ -271,7 +286,7 @@
 
 .chat-confirmation-widget2 .chat-confirmation-widget-buttons {
 	display: flex;
-	padding: 5px 9px;
+	padding: 4px 8px;
 
 	.chat-buttons {
 		display: flex;
@@ -283,6 +298,14 @@
 			width: inherit;
 		}
 	}
+
+	.monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
+		padding: 0px 4px 0 3px;
+	}
+
+	.monaco-button-dropdown > .monaco-button.monaco-dropdown-button.codicon[class*='codicon-'] {
+		font-size: 12px;
+	}
 }
 
 .chat-confirmation-widget2 .interactive-result-code-block.compare {
@@ -300,14 +323,14 @@
 		.chat-confirmation-widget-message {
 			margin: 2px 0 0 0;
 			border: 1px solid var(--vscode-chat-requestBorder);
-			border-radius: 4px;
+			border-radius: var(--vscode-cornerRadius-medium);
 			font-size: var(--vscode-chat-font-size-body-s);
 		}
 
 	}
 
 	.chat-confirmation-widget-container .chat-confirmation-widget .chat-confirmation-widget-title {
-		padding: 2px 6px 2px 2px;
+		padding: 2px 6px 2px 0px;
 
 		&.monaco-button {
 
@@ -317,12 +340,36 @@
 		}
 
 		.codicon {
-			font-size: var(--vscode-chat-font-size-body-s);
+			font-size: 12px;
 		}
 
-		&:hover {
-			background: var(--vscode-list-hoverBackground);
+		&:hover  {
+			p, .rendered-markdown {
+				color: var(--vscode-foreground);
+			}
+
+			.chat-collapsible-hover-chevron {
+				opacity: 1;
+			}
+		}
+	}
+
+	.chat-confirmation-widget:not(.collapsed) .chat-confirmation-widget-title {
+		p, .rendered-markdown {
+			color: var(--vscode-foreground);
 		}
 	}
 
+	.chat-confirmation-widget .chat-confirmation-widget-title > .codicon:first-child:not(.chat-collapsible-hover-chevron) {
+		display: none;
+	}
+
+	.show-checkmarks .chat-confirmation-widget .chat-confirmation-widget-title > .codicon:first-child:not(.chat-collapsible-hover-chevron) {
+		display: inline-block;
+	}
+
+	.show-checkmarks .chat-confirmation-widget .chat-confirmation-widget-title {
+		padding-left: 2px;
+	}
+
 }

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

@@ -7,12 +7,6 @@
 	color: var(--vscode-notificationsWarningIcon-foreground) !important;
 }
 
-.chat-thinking-box .chat-used-context.chat-hook-outcome-blocked,
-.chat-thinking-box .chat-used-context.chat-hook-outcome-warning {
-	padding: 4px 12px 4px 22px;
-	margin-bottom: 0;
-}
-
 .chat-thinking-box .chat-used-context.chat-hook-outcome-blocked > .chat-used-context-label .codicon,
 .chat-thinking-box .chat-used-context.chat-hook-outcome-warning > .chat-used-context-label .codicon {
 	display: none;
@@ -28,12 +22,14 @@
 .chat-hook-reason {
 	font-size: var(--vscode-chat-font-size-body-s);
 	padding: 4px 10px;
+	white-space: pre-wrap;
 }
 
 .chat-hook-message {
 	font-size: var(--vscode-chat-font-size-body-s);
 	padding: 4px 10px;
 	color: var(--vscode-descriptionForeground);
+	white-space: pre-wrap;
 }
 
 /* When both reason and message are shown, add a subtle separator */
@@ -42,3 +38,10 @@
 	margin-top: 2px;
 	padding-top: 6px;
 }
+
+.chat-used-context.chat-hook-outcome-warning,
+.chat-used-context.chat-hook-outcome-blocked {
+	.chat-used-context-label .monaco-button {
+		gap: 4px;
+	}
+}

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 .chat-inline-anchor-widget {
-	border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
+	border: 0.5px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
 	border-radius: 4px;
 	margin: 0 1px;
 	padding: 1px 3px;
@@ -12,11 +12,11 @@
 	width: fit-content;
 	font-weight: normal;
 	text-decoration: none;
+	font-size: var(--vscode-chat-font-size-body-s);
 }
 
 .chat-inline-anchor-widget .icon-label {
 	padding: 0 3px;
-	text-wrap: wrap;
 
 	.label-suffix {
 		color: var(--vscode-peekViewTitleDescription-foreground);