@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -4,7 +4,6 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -18,21 +17,13 @@ import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutpu
 import { getOutputViewModelFromId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
-import { OmittedState, toPromptFileVariableEntry, PromptFileVariableKind, IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
-import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { OmittedState, IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { resizeImage, imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 
 let ChatAttachmentResolveService = class ChatAttachmentResolveService {
-    constructor(
-        fileService,
-        editorService,
-        textModelService,
-        extensionService,
-        dialogService
-    ) {
+    constructor(fileService, editorService, extensionService, dialogService) {
         this.fileService = fileService;
         this.editorService = editorService;
-        this.textModelService = textModelService;
         this.extensionService = extensionService;
         this.dialogService = dialogService;
     }
@@ -54,7 +45,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         }
         const imageContext = await this.resolveImageEditorAttachContext(editor.resource);
         if (imageContext) {
-            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, "chatReferenceBinaryData"))) ? imageContext : undefined;
+            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext))) ? imageContext : undefined;
         }
         return await this.resolveResourceAttachContext(editor.resource, stat.isDirectory);
     }
@@ -75,25 +66,9 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
     async resolveResourceAttachContext(resource, isDirectory) {
         let omittedState = OmittedState.NotOmitted;
         if (!isDirectory) {
-            let languageId;
-            try {
-                const createdModel = await this.textModelService.createModelReference(resource);
-                languageId = createdModel.object.getLanguageId();
-                createdModel.dispose();
-            } catch {
-                omittedState = OmittedState.Full;
-            }
             if (/\.(svg)$/i.test(resource.path)) {
                 omittedState = OmittedState.Full;
             }
-            if (languageId) {
-                const promptsType = getPromptsTypeForLanguageId(languageId);
-                if (promptsType === PromptsType.prompt) {
-                    return toPromptFileVariableEntry(resource, PromptFileVariableKind.PromptFile);
-                } else if (promptsType === PromptsType.instructions) {
-                    return toPromptFileVariableEntry(resource, PromptFileVariableKind.Instruction);
-                }
-            }
         }
         return {
             kind: isDirectory ? "directory" : "file",
@@ -131,7 +106,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
             }
             const readFile = await this.fileService.readFile(resource);
             if (stat.size > 30 * 1024 * 1024) {
-                this.dialogService.error(( localize(5388, "Image is too large")), ( localize(5389, "The image {0} is too large to be attached.", fileName)));
+                this.dialogService.error(( localize(5474, "Image is too large")), ( localize(5475, "The image {0} is too large to be attached.", fileName)));
                 throw ( new Error("Image is too large"));
             }
             dataBuffer = readFile.value;
@@ -257,7 +232,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         })));
     }
 };
-ChatAttachmentResolveService = ( __decorate([( __param(0, IFileService)), ( __param(1, IEditorService)), ( __param(2, ITextModelService)), ( __param(3, IExtensionService)), ( __param(4, IDialogService))], ChatAttachmentResolveService));
+ChatAttachmentResolveService = ( __decorate([( __param(0, IFileService)), ( __param(1, IEditorService)), ( __param(2, IExtensionService)), ( __param(3, IDialogService))], ChatAttachmentResolveService));
 function symbolId(resource, range) {
     let rangePart = "";
     if (range) {

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

@@ -86,29 +86,29 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const mainContent = createElement("div");
         mainContent.className = "element-selection-main-content";
         const message = createElement("span");
-        const startSelectionMessage = ( localize(5437, "Add element to chat"));
+        const startSelectionMessage = ( localize(5528, "Add element to chat"));
         message.textContent = startSelectionMessage;
         mainContent.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: "singleSelection",
-            label: ( localize(5438, "Select an Element")),
+            label: ( localize(5529, "Select an Element")),
             enabled: true,
             run: async () => {
                 await startElementSelection();
             }
         }), toAction({
             id: "continuousSelection",
-            label: ( localize(5439, "Continuous Selection")),
+            label: ( localize(5530, "Continuous Selection")),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(5440, "Selecting element..."));
+                message.textContent = ( localize(5531, "Selecting element..."));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(5441, "Done"));
+                cancelButton.label = ( localize(5532, "Done"));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -118,7 +118,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(5442, "Element added to chat"));
+                message.textContent = ( localize(5533, "Element added to chat"));
                 finishedSelecting();
             }
         }));
@@ -127,33 +127,33 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(5443, "Click to select an element.")),
+            title: ( localize(5534, "Click to select an element.")),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(5444, "Start"));
+        startButton.primaryButton.label = ( localize(5535, "Start"));
         startButton.element.classList.add("element-selection-start");
         const cancelButton = this._showStore.add(( new Button(mainContent, {
             ...defaultButtonStyles,
             supportIcons: true,
-            title: ( localize(5445, "Click to cancel selection."))
+            title: ( localize(5536, "Click to cancel selection."))
         })));
         cancelButton.element.className = "element-selection-cancel hidden";
-        const cancelButtonLabel = ( localize(5446, "Cancel"));
+        const cancelButtonLabel = ( localize(5537, "Cancel"));
         cancelButton.label = cancelButtonLabel;
         const configure = this._showStore.add(( new Button(mainContent, {
             supportIcons: true,
-            title: ( localize(5447, "Configure Attachments Sent"))
+            title: ( localize(5538, "Configure Attachments Sent"))
         })));
         configure.icon = Codicon.gear;
         const collapseOverlay = this._showStore.add(( new Button(mainContent, {
             supportIcons: true,
-            title: ( localize(5448, "Collapse Overlay"))
+            title: ( localize(5539, "Collapse Overlay"))
         })));
         collapseOverlay.icon = Codicon.chevronRight;
         const nextSelection = this._showStore.add(( new Button(mainContent, {
             supportIcons: true,
-            title: ( localize(5449, "Select Again"))
+            title: ( localize(5540, "Select Again"))
         })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add("hidden");
@@ -161,7 +161,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         expandContainer.className = "element-expand-container hidden";
         const expandOverlay = this._showStore.add(( new Button(expandContainer, {
             supportIcons: true,
-            title: ( localize(5450, "Expand Overlay"))
+            title: ( localize(5541, "Expand Overlay"))
         })));
         expandOverlay.icon = Codicon.layout;
         this._domNode.appendChild(mainContent);
@@ -184,11 +184,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(5440, "Selecting element..."));
+            message.textContent = ( localize(5531, "Selecting element..."));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(5442, "Element added to chat"));
+            message.textContent = ( localize(5533, "Element added to chat"));
             finishedSelecting();
         };
         this._showStore.add(
@@ -198,7 +198,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         );
         this._showStore.add(addDisposableListener(cancelButton.element, "click", () => {
             cts.cancel();
-            message.textContent = ( localize(5451, "Selection canceled"));
+            message.textContent = ( localize(5542, "Selection canceled"));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, "click", () => {
@@ -338,7 +338,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         let cts = ( new CancellationTokenSource());
         const show = async (locator, browserType) => {
             widget.setActiveLocator(locator, browserType);
-            connectingWebviewElement.textContent = ( localize(5452, "Connecting to webview..."));
+            connectingWebviewElement.textContent = ( localize(5543, "Connecting to webview..."));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
@@ -347,7 +347,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
             try {
                 await this._browserElementsService.startDebugSession(cts.token, locator);
             } catch (error) {
-                connectingWebviewElement.textContent = ( localize(5453, "Please reopen the preview."));
+                connectingWebviewElement.textContent = ( localize(5544, "Please reopen the preview."));
                 return;
             }
             if (cts.token.isCancellationRequested) {