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

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.d.ts

@@ -40,6 +40,7 @@ export declare class ChatImplicitContexts extends Disposable {
     readonly onDidChangeValue: Event<void>;
     private _values;
     private readonly _valuesDisposables;
+    private _enabled;
     setValues(values: ImplicitContextWithSelection[]): void;
     get values(): ChatImplicitContext[];
     get hasEnabled(): boolean;

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.js

@@ -251,13 +251,16 @@ let ChatImplicitContextContribution = class ChatImplicitContextContribution exte
             const setting = this._implicitContextEnablement[widget.location];
             const isFirstInteraction = widget.viewModel?.getItems().length === 0;
             if ((setting === "always" || setting === "first" && isFirstInteraction) && !isPromptFile) {
-                widget.input.implicitContext.setValues([{
-                    value: newValue,
-                    isSelection
-                }, {
-                    value: providerContext,
-                    isSelection: false
-                }]);
+                const hasActiveEditor = !!this.editorService.activeEditor;
+                if (newValue !== undefined || !widget.input.implicitContext.hasValue || !hasActiveEditor) {
+                    widget.input.implicitContext.setValues([{
+                        value: newValue,
+                        isSelection
+                    }, {
+                        value: providerContext,
+                        isSelection: false
+                    }]);
+                }
             } else {
                 widget.input.implicitContext.setValues([]);
             }
@@ -278,6 +281,7 @@ class ChatImplicitContexts extends Disposable {
         this.onDidChangeValue = this._onDidChangeValue.event;
         this._values = this._register(( new DisposableMap()));
         this._valuesDisposables = this._register(( new DisposableStore()));
+        this._enabled = false;
     }
     setValues(values) {
         this._valuesDisposables.clear();
@@ -290,6 +294,7 @@ class ChatImplicitContexts extends Disposable {
         for (const value of definedValues) {
             const implicitContext = ( new ChatImplicitContext());
             implicitContext.setValue(value.value, value.isSelection);
+            implicitContext.enabled = this._enabled;
             const disposableStore = ( new DisposableStore());
             disposableStore.add(implicitContext.onDidChangeValue(() => {
                 this._onDidChangeValue.fire();
@@ -306,6 +311,7 @@ class ChatImplicitContexts extends Disposable {
         return ( Array.from(( this._values.keys())).some(v => v.enabled));
     }
     setEnabled(enabled) {
+        this._enabled = enabled;
         this.values.forEach(v => v.enabled = enabled);
     }
     get hasValue() {
@@ -362,19 +368,27 @@ class ChatImplicitContext extends Disposable {
     get name() {
         if (URI.isUri(this.value)) {
             return `file:${basename(this.value)}`;
-        } else if (isStringImplicitContextValue(this.value)) {
-            return this.value.name;
-        } else if (this.value) {
+        }
+        if (isLocation(this.value)) {
             return `file:${basename(this.value.uri)}`;
-        } else {
-            return "implicit";
         }
+        if (isStringImplicitContextValue(this.value)) {
+            if (this.value.name === undefined && this.value.resourceUri === undefined) {
+                throw ( new Error("ChatContextItem must have either a label or a resourceUri"));
+            }
+            return this.value.name ?? basename(this.value.resourceUri);
+        }
+        return "implicit";
     }
     get modelDescription() {
         if (URI.isUri(this.value)) {
             return `User's active file`;
         } else if (isStringImplicitContextValue(this.value)) {
-            return this.value.modelDescription ?? `User's active context from ${this.value.name}`;
+            if (this.value.name === undefined && this.value.resourceUri === undefined) {
+                throw ( new Error("ChatContextItem must have either a label or a resourceUri"));
+            }
+            const contextName = this.value.name ?? basename(this.value.resourceUri);
+            return this.value.modelDescription ?? `User's active context from ${contextName}`;
         } else if (this._isSelection) {
             return `User's active selection`;
         } else {
@@ -429,6 +443,7 @@ class ChatImplicitContext extends Disposable {
                 modelDescription: this.modelDescription,
                 icon: this.value.icon,
                 uri: this.value.uri,
+                resourceUri: this.value.resourceUri,
                 handle: this.value.handle,
                 commandId: this.value.commandId
             }];

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.js

@@ -5,12 +5,14 @@ import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/ba
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 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 { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -88,13 +90,14 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
     renderMainContext(context, isSelection) {
         const contextNode = $(".chat-attached-context-attachment.show-file-icons.implicit");
         this.domNode.appendChild(contextNode);
+        contextNode.tabIndex = 0;
         contextNode.classList.toggle("disabled", !context.enabled);
         const file = context.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5111, "cell")) : ( localize(5112, "file"));
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5427, "cell")) : ( localize(5428, "file"));
         const isSuggestedEnabled = this.configService.getValue("chat.implicitContext.suggestedContext");
         if (isSuggestedEnabled) {
             if (!isSelection) {
-                const buttonMsg = context.enabled ? ( localize(5113, "Disable current {0} context", attachmentTypeName)) : "";
+                const buttonMsg = context.enabled ? ( localize(5429, "Disable current {0} context", attachmentTypeName)) : "";
                 const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: buttonMsg
@@ -109,7 +112,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                     context.enabled = false;
                 }));
             } else {
-                const pinButtonMsg = ( localize(5114, "Pin selection"));
+                const pinButtonMsg = ( localize(5430, "Pin selection"));
                 const pinButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: pinButtonMsg
@@ -142,7 +145,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 })
             );
         } else {
-            const buttonMsg = context.enabled ? ( localize(5113, "Disable current {0} context", attachmentTypeName)) : ( localize(5115, "Enable current {0} context", attachmentTypeName));
+            const buttonMsg = context.enabled ? ( localize(5429, "Disable current {0} context", attachmentTypeName)) : ( localize(5431, "Enable current {0} context", attachmentTypeName));
             const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                 supportIcons: true,
                 title: buttonMsg
@@ -160,9 +163,16 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         let markdownTooltip;
         if (isStringImplicitContextValue(context.value)) {
             markdownTooltip = context.value.tooltip;
-            title = this.renderString(label, context.name, context.icon, markdownTooltip, ( localize(5116, "Current file context")));
+            title = this.renderString(
+                label,
+                context.name,
+                context.icon,
+                context.value.resourceUri,
+                markdownTooltip,
+                ( localize(5432, "Current file context"))
+            );
         } else {
-            title = this.renderResource(context.value, context.isSelection, context.enabled, label);
+            title = this.renderResource(context.value, context.isSelection, context.enabled, label, contextNode);
         }
         if (markdownTooltip || title) {
             this.renderDisposables.add(this.hoverService.setupDelayedHover(contextNode, {
@@ -197,34 +207,43 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             })
         );
     }
-    renderString(resourceLabel, name, icon, markdownTooltip, defaultTitle) {
+    renderString(resourceLabel, name, icon, resourceUri, markdownTooltip, defaultTitle) {
         const title = markdownTooltip ? undefined : defaultTitle;
-        resourceLabel.setLabel(name, undefined, {
-            iconPath: icon,
-            title
-        });
+        if (icon && (ThemeIcon.isFile(icon) || ThemeIcon.isFolder(icon)) && resourceUri) {
+            const fileKind = ThemeIcon.isFolder(icon) ? FileKind.FOLDER : FileKind.FILE;
+            const iconClasses = getIconClasses(this.modelService, this.languageService, resourceUri, fileKind);
+            resourceLabel.setLabel(name, undefined, {
+                extraClasses: iconClasses,
+                title
+            });
+        } else {
+            resourceLabel.setLabel(name, undefined, {
+                iconPath: icon,
+                title
+            });
+        }
         return title;
     }
-    renderResource(attachmentValue, isSelection, enabled, label) {
+    renderResource(attachmentValue, isSelection, enabled, label, contextNode) {
         const file = URI.isUri(attachmentValue) ? attachmentValue : attachmentValue.uri;
         const range = URI.isUri(attachmentValue) || !isSelection ? undefined : attachmentValue.range;
-        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5111, "cell")) : ( localize(5112, "file"));
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5427, "cell")) : ( localize(5428, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            5117,
+            5433,
             "Attached {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(5118, "Attached {0}, {1}", attachmentTypeName, friendlyName));
+        )) : ( localize(5434, "Attached {0}, {1}", attachmentTypeName, friendlyName));
         const uriLabel = this.labelService.getUriLabel(file, {
             relative: true
         });
-        const currentFile = ( localize(5119, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(5120, "Enable current {0} context", attachmentTypeName));
+        const currentFile = ( localize(5435, "Current {0} context", attachmentTypeName));
+        const inactive = ( localize(5436, "Enable current {0} context", attachmentTypeName));
         const currentFileHint = enabled || isSelection ? currentFile : inactive;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {
@@ -233,8 +252,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             range,
             title
         });
-        this.domNode.ariaLabel = ariaLabel;
-        this.domNode.tabIndex = 0;
+        contextNode.ariaLabel = ariaLabel;
         return title;
     }
     async convertToRegularAttachment(attachment) {
@@ -253,6 +271,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 icon: attachment.value.icon,
                 modelDescription: attachment.modelDescription,
                 uri: attachment.value.uri,
+                resourceUri: attachment.value.resourceUri,
                 tooltip: attachment.value.tooltip,
                 commandId: attachment.value.commandId,
                 handle: attachment.value.handle