@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.js

@@ -6,39 +6,59 @@ import { SnapshotContext } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { NotebookCellTextModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookSetting, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
-const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
-const ChatEditingNotebookSnapshotScheme = 'chat-editing-notebook-snapshot-model';
+const BufferMarker = "ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d";
+const ChatEditingNotebookSnapshotScheme = "chat-editing-notebook-snapshot-model";
 function getNotebookSnapshotFileURI(chatSessionResource, requestId, undoStop, path, viewType) {
     return ( URI.from({
         scheme: ChatEditingNotebookSnapshotScheme,
         path,
-        query: JSON.stringify({ session: chatSessionResource, requestId: requestId ?? '', undoStop: undoStop ?? '', viewType }),
+        query: JSON.stringify({
+            session: chatSessionResource,
+            requestId: requestId ?? "",
+            undoStop: undoStop ?? "",
+            viewType
+        })
     }));
 }
 function createSnapshot(notebook, transientOptions, outputSizeConfig) {
-    const outputSizeLimit = (typeof outputSizeConfig === 'number' ? outputSizeConfig : outputSizeConfig.getValue(NotebookSetting.outputBackupSizeLimit)) * 1024;
-    return serializeSnapshot(notebook.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions }), transientOptions);
+    const outputSizeLimit = (typeof outputSizeConfig === "number" ? outputSizeConfig : outputSizeConfig.getValue(NotebookSetting.outputBackupSizeLimit)) * 1024;
+    return serializeSnapshot(notebook.createSnapshot({
+        context: SnapshotContext.Backup,
+        outputSizeLimit,
+        transientOptions
+    }), transientOptions);
 }
 function restoreSnapshot(notebook, snapshot) {
     try {
-        const { transientOptions, data } = deserializeSnapshot(snapshot);
+        const {
+            transientOptions,
+            data
+        } = deserializeSnapshot(snapshot);
         notebook.restoreSnapshot(data, transientOptions);
         const edits = [];
         data.cells.forEach((cell, index) => {
             const internalId = cell.internalMetadata?.internalId;
             if (internalId) {
-                edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { internalId } });
+                edits.push({
+                    editType: CellEditType.PartialInternalMetadata,
+                    index,
+                    internalMetadata: {
+                        internalId
+                    }
+                });
             }
         });
         notebook.applyEdits(edits, true, undefined, () => undefined, undefined, false);
-    }
-    catch (ex) {
-        console.error('Error restoring Notebook snapshot', ex);
+    } catch (ex) {
+        console.error("Error restoring Notebook snapshot", ex);
     }
 }
 class SnapshotComparer {
     constructor(initialCotent) {
-        const { transientOptions, data } = deserializeSnapshot(initialCotent);
+        const {
+            transientOptions,
+            data
+        } = deserializeSnapshot(initialCotent);
         this.transientOptions = transientOptions;
         this.data = data;
     }
@@ -60,8 +80,7 @@ class SnapshotComparer {
                 if (!notebookCell.fastEqual(comparerCell, true)) {
                     return false;
                 }
-            }
-            else {
+            } else {
                 if (notebookCell.cellKind !== comparerCell.cellKind) {
                     return false;
                 }
@@ -99,9 +118,9 @@ function sanitizeCellDto2(cell, ignoreInternalMetadata, transientOptions) {
             outputs: ( output.outputs.map(item => {
                 return {
                     data: item.data,
-                    mime: item.mime,
+                    mime: item.mime
                 };
-            })),
+            }))
         };
     }));
     return {
@@ -118,7 +137,7 @@ function sanitizeCellDto2(cell, ignoreInternalMetadata, transientOptions) {
 function serializeSnapshot(data, transientOptions) {
     const dataDto = {
         cells: ( data.cells.map(cell => sanitizeCellDto2(cell))),
-        metadata: data.metadata,
+        metadata: data.metadata
     };
     return JSON.stringify([
         JSON.stringify(transientOptions),
@@ -142,7 +161,10 @@ function deserializeSnapshot(snapshot) {
         }
         return value;
     });
-    return { transientOptions, data };
+    return {
+        transientOptions,
+        data
+    };
 }
 
 export { ChatEditingNotebookSnapshotScheme, SnapshotComparer, createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNewNotebookContentEdits.js

@@ -26,7 +26,9 @@ let ChatEditingNewNotebookContentEdits = class ChatEditingNewNotebookContentEdit
         }
         const notebookEdits = [];
         try {
-            const { serializer } = await this._notebookService.withNotebookDataProvider(this.notebook.viewType);
+            const {
+                serializer
+            } = await this._notebookService.withNotebookDataProvider(this.notebook.viewType);
             const data = await serializer.dataToNotebook(VSBuffer.fromString(content));
             for (let i = 0; i < data.cells.length; i++) {
                 notebookEdits.push({
@@ -36,8 +38,7 @@ let ChatEditingNewNotebookContentEdits = class ChatEditingNewNotebookContentEdit
                     cells: [data.cells[i]]
                 });
             }
-        }
-        catch (ex) {
+        } catch (ex) {
             console.error(`Failed to generate notebook edits from text edits ${content}`, ex);
             return [];
         }
@@ -46,22 +47,17 @@ let ChatEditingNewNotebookContentEdits = class ChatEditingNewNotebookContentEdit
     generateContent() {
         try {
             return applyTextEdits(this.textEdits);
-        }
-        catch (ex) {
-            console.error('Failed to generate content from text edits', ex);
-            return '';
+        } catch (ex) {
+            console.error("Failed to generate content from text edits", ex);
+            return "";
         }
     }
 };
-ChatEditingNewNotebookContentEdits = ( __decorate([
-    ( __param(1, INotebookService))
-], ChatEditingNewNotebookContentEdits));
+ChatEditingNewNotebookContentEdits = ( __decorate([( __param(1, INotebookService))], ChatEditingNewNotebookContentEdits));
 function applyTextEdits(edits) {
-    let output = '';
+    let output = "";
     for (const edit of edits) {
-        output = output.slice(0, edit.range.startColumn)
-            + edit.text
-            + output.slice(edit.range.endColumn);
+        output = output.slice(0, edit.range.startColumn) + edit.text + output.slice(edit.range.endColumn);
     }
     return output;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.d.ts

@@ -1,7 +1,6 @@
 import { Disposable, DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { IDocumentDiff } from "../../../../../../editor/common/diff/documentDiffProvider.js";
 import { DetailedLineRangeMapping } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
@@ -34,7 +33,6 @@ export declare class ChatEditingNotebookCellEntry extends Disposable {
     private readonly initialContent;
     private readonly _textModelChangeService;
     constructor(notebookUri: URI, cell: NotebookCellTextModel, modifiedModel: ITextModel, originalModel: ITextModel, isExternalEditInProgress: (() => boolean) | undefined, disposables: DisposableStore, notebookEditorService: INotebookEditorService, instantiationService: IInstantiationService);
-    hasModificationAt(range: IRange): boolean;
     clearCurrentEditLineDecoration(): void;
     acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel | undefined): Promise<void>;
     revertMarkdownPreviewState(): void;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.js

@@ -24,7 +24,16 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
     get diffInfo() {
         return this._textModelChangeService.diffInfo;
     }
-    constructor(notebookUri, cell, modifiedModel, originalModel, isExternalEditInProgress, disposables, notebookEditorService, instantiationService) {
+    constructor(
+        notebookUri,
+        cell,
+        modifiedModel,
+        originalModel,
+        isExternalEditInProgress,
+        disposables,
+        notebookEditorService,
+        instantiationService
+    ) {
         super();
         this.notebookUri = notebookUri;
         this.cell = cell;
@@ -38,7 +47,13 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
         this.state = this._stateObs;
         this.initialContent = this.originalModel.getValue();
         this._register(disposables);
-        this._textModelChangeService = this._register(this.instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this.state, isExternalEditInProgress));
+        this._textModelChangeService = this._register(this.instantiationService.createInstance(
+            ChatEditingTextModelChangeService,
+            this.originalModel,
+            this.modifiedModel,
+            this.state,
+            isExternalEditInProgress
+        ));
         this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
             this.revertMarkdownPreviewState();
             this._stateObs.set(action, undefined);
@@ -50,9 +65,6 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
             }
         }));
     }
-    hasModificationAt(range) {
-        return this._textModelChangeService.hasHunkAt(range);
-    }
     clearCurrentEditLineDecoration() {
         if (this.modifiedModel.isDisposed()) {
             return;
@@ -60,13 +72,14 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
         this._textModelChangeService.clearCurrentEditLineDecoration();
     }
     async acceptAgentEdits(textEdits, isLastEdits, responseModel) {
-        const { maxLineNumber } = await this._textModelChangeService.acceptAgentEdits(this.modifiedModel.uri, textEdits, isLastEdits, responseModel);
-        transaction((tx) => {
+        const {
+            maxLineNumber
+        } = await this._textModelChangeService.acceptAgentEdits(this.modifiedModel.uri, textEdits, isLastEdits, responseModel);
+        transaction(tx => {
             if (!isLastEdits) {
                 this._stateObs.set(ModifiedFileEntryState.Modified, tx);
                 this._maxModifiedLineNumber.set(maxLineNumber, tx);
-            }
-            else {
+            } else {
                 this._maxModifiedLineNumber.set(0, tx);
             }
         });
@@ -78,9 +91,8 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
         const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
         if (notebookEditor) {
             const vm = notebookEditor.getCellByHandle(this.cell.handle);
-            if (vm?.getEditState() === CellEditState.Editing &&
-                (vm.editStateSource === 'chatEdit' || vm.editStateSource === 'chatEditNavigation')) {
-                vm?.updateEditState(CellEditState.Preview, 'chatEdit');
+            if (vm?.getEditState() === CellEditState.Editing && (vm.editStateSource === "chatEdit" || vm.editStateSource === "chatEditNavigation")) {
+                vm?.updateEditState(CellEditState.Preview, "chatEdit");
             }
         }
     }
@@ -91,9 +103,6 @@ let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends Di
         return this._textModelChangeService.diffInfo.get().undo(change);
     }
 };
-ChatEditingNotebookCellEntry = ( __decorate([
-    ( __param(6, INotebookEditorService)),
-    ( __param(7, IInstantiationService))
-], ChatEditingNotebookCellEntry));
+ChatEditingNotebookCellEntry = ( __decorate([( __param(6, INotebookEditorService)), ( __param(7, IInstantiationService))], ChatEditingNotebookCellEntry));
 
 export { ChatEditingNotebookCellEntry };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.d.ts

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
+import { INotebookTextDiffEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser";
 import { NotebookTextModel } from "@codingame/monaco-vscode-notebook-service-override/vscode/vs/workbench/contrib/notebook/common/model/notebookTextModel";
 import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { ChatEditingModifiedNotebookEntry } from "../chatEditingModifiedNotebookEntry.js";