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

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

@@ -24,8 +24,8 @@ import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/
 import { stringToSnapshot, isTextFileEditorModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingTextModelChangeService } from './chatEditingTextModelChangeService.js';
@@ -58,8 +58,38 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             return removed;
         }));
     }
-    constructor(resourceRef, _multiDiffEntryDelegate, telemetryInfo, kind, initialContent, markerService, modelService, textModelService, languageService, configService, fileConfigService, chatService, _textFileService, fileService, undoRedoService, instantiationService, aiEditTelemetryService, _editorWorkerService) {
-        super(resourceRef.object.textEditorModel.uri, telemetryInfo, kind, configService, fileConfigService, chatService, fileService, undoRedoService, instantiationService, aiEditTelemetryService);
+    constructor(
+        resourceRef,
+        _multiDiffEntryDelegate,
+        telemetryInfo,
+        kind,
+        initialContent,
+        markerService,
+        modelService,
+        textModelService,
+        languageService,
+        configService,
+        fileConfigService,
+        chatService,
+        _textFileService,
+        fileService,
+        undoRedoService,
+        instantiationService,
+        aiEditTelemetryService,
+        _editorWorkerService
+    ) {
+        super(
+            resourceRef.object.textEditorModel.uri,
+            telemetryInfo,
+            kind,
+            configService,
+            fileConfigService,
+            chatService,
+            fileService,
+            undoRedoService,
+            instantiationService,
+            aiEditTelemetryService
+        );
         this._multiDiffEntryDelegate = _multiDiffEntryDelegate;
         this._textFileService = _textFileService;
         this._editorWorkerService = _editorWorkerService;
@@ -67,15 +97,23 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         this.modifiedModel = resourceRef.object.textEditorModel;
         this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionResource, this.entryId, this.modifiedURI.path);
         this.initialContent = initialContent ?? this.modifiedModel.getValue();
-        const docSnapshot = this.originalModel = this._register(modelService.createModel(createTextBufferFactoryFromSnapshot(initialContent !== undefined ? stringToSnapshot(initialContent) : this.modifiedModel.createSnapshot()), languageService.createById(this.modifiedModel.getLanguageId()), this.originalURI, false));
-        this._textModelChangeService = this._register(instantiationService.createInstance(ChatEditingTextModelChangeService, this.originalModel, this.modifiedModel, this._stateObs, () => this._isExternalEditInProgress));
+        const docSnapshot = this.originalModel = this._register(modelService.createModel(createTextBufferFactoryFromSnapshot(
+            initialContent !== undefined ? stringToSnapshot(initialContent) : this.modifiedModel.createSnapshot()
+        ), languageService.createById(this.modifiedModel.getLanguageId()), this.originalURI, false));
+        this._textModelChangeService = this._register(instantiationService.createInstance(
+            ChatEditingTextModelChangeService,
+            this.originalModel,
+            this.modifiedModel,
+            this._stateObs,
+            () => this._isExternalEditInProgress
+        ));
         this._register(this._textModelChangeService.onDidAcceptOrRejectAllHunks(action => {
             this._stateObs.set(action, undefined);
-            this._notifySessionAction(action === ModifiedFileEntryState.Accepted ? 'accepted' : 'rejected');
+            this._notifySessionAction(action === ModifiedFileEntryState.Accepted ? "accepted" : "rejected");
         }));
         this._register(this._textModelChangeService.onDidAcceptOrRejectLines(action => {
             this._notifyAction({
-                kind: 'chatEditingHunkAction',
+                kind: "chatEditingHunkAction",
                 uri: this.modifiedURI,
                 outcome: action.state,
                 languageId: this.modifiedModel.getLanguageId(),
@@ -103,9 +141,8 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5166, "Chat Edits")));
-            }
-            else {
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5337, "Chat Edits")));
+            } else {
                 resourceFilter.clear();
             }
         }));
@@ -114,12 +151,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         return this._textModelChangeService.getDiffInfo();
     }
     equalsSnapshot(snapshot) {
-        return !!snapshot &&
-            ( this.modifiedURI.toString()) === ( snapshot.resource.toString()) &&
-            this.modifiedModel.getLanguageId() === snapshot.languageId &&
-            this.originalModel.getValue() === snapshot.original &&
-            this.modifiedModel.getValue() === snapshot.current &&
-            this.state.get() === snapshot.state;
+        return !!snapshot && ( this.modifiedURI.toString()) === ( snapshot.resource.toString()) && this.modifiedModel.getLanguageId() === snapshot.languageId && this.originalModel.getValue() === snapshot.original && this.modifiedModel.getValue() === snapshot.current && this.state.get() === snapshot.state;
     }
     createSnapshot(chatSessionResource, requestId, undoStop) {
         return {
@@ -135,9 +167,6 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     getCurrentContents() {
         return this.modifiedModel.getValue();
     }
-    hasModificationAt(location) {
-        return ( location.uri.toString()) === ( this.modifiedModel.uri.toString()) && this._textModelChangeService.hasHunkAt(location.range);
-    }
     async restoreFromSnapshot(snapshot, restoreToDisk = true) {
         this._stateObs.set(snapshot.state, undefined);
         await this._textModelChangeService.resetDocumentValues(snapshot.original, restoreToDisk ? snapshot.current : undefined);
@@ -154,18 +183,17 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5167, "Chat Edit: '{0}'", request.message.text)) : ( localize(5168, "Chat Edit"));
-        return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
+        const label = request?.message.text ? ( localize(5338, "Chat Edit: '{0}'", request.message.text)) : ( localize(5339, "Chat Edit"));
+        return ( new SingleModelEditStackElement(label, "chat.edit", this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {
         const result = await this._textModelChangeService.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
-        transaction((tx) => {
+        transaction(tx => {
             this._waitsForLastEdits.set(!isLastEdits, tx);
             this._stateObs.set(ModifiedFileEntryState.Modified, tx);
             if (!isLastEdits) {
                 this._rewriteRatioObs.set(result.rewriteRatio, tx);
-            }
-            else {
+            } else {
                 this._resetEditsState(tx);
                 this._rewriteRatioObs.set(1, tx);
             }
@@ -173,7 +201,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         if (isLastEdits && this._shouldAutoSave()) {
             await this._textFileService.save(this.modifiedModel.uri, {
                 reason: SaveReason.AUTO,
-                skipSaveParticipants: true,
+                skipSaveParticipants: true
             });
         }
     }
@@ -188,24 +216,25 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
                     force: true,
                     ignoreErrorHandler: true
                 });
-            }
-            catch {
-            }
+            } catch {}
         }
     }
     async _doReject() {
         if (this.createdInRequestId === this._telemetryInfo.requestId) {
             if (isTextFileEditorModel(this._docFileEditorModel)) {
-                await this._docFileEditorModel.revert({ soft: true });
-                await this._fileService.del(this.modifiedURI).catch(err => {
+                await this._docFileEditorModel.revert({
+                    soft: true
                 });
+                await this._fileService.del(this.modifiedURI).catch(err => {});
             }
             this._onDidDelete.fire();
-        }
-        else {
+        } else {
             this._textModelChangeService.undo();
             if (this._textModelChangeService.allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel) && this._shouldAutoSave()) {
-                await this._docFileEditorModel.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
+                await this._docFileEditorModel.save({
+                    reason: SaveReason.EXPLICIT,
+                    skipSaveParticipants: true
+                });
             }
             this._multiDiffEntryDelegate.collapse(undefined);
         }
@@ -220,7 +249,9 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         return this.modifiedURI.scheme !== Schemas.untitled;
     }
     async computeEditsFromSnapshots(beforeSnapshot, afterSnapshot) {
-        const stringEdit = await this._editorWorkerService.computeStringEditFromDiff(beforeSnapshot, afterSnapshot, { maxComputationTimeMs: 5000 }, 'advanced');
+        const stringEdit = await this._editorWorkerService.computeStringEditFromDiff(beforeSnapshot, afterSnapshot, {
+            maxComputationTimeMs: 5000
+        }, "advanced");
         const editorTextEdit = TextEdit.fromStringEdit(stringEdit, ( new StringText(beforeSnapshot)));
         return editorTextEdit.replacements.slice();
     }
@@ -241,24 +272,12 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
         }
         const fileModel = this._textFileService.files.get(this.modifiedModel.uri);
         if (fileModel && !fileModel.isDisposed()) {
-            await fileModel.revert({ soft: false });
+            await fileModel.revert({
+                soft: false
+            });
         }
     }
 };
-ChatEditingModifiedDocumentEntry = ( __decorate([
-    ( __param(5, IMarkerService)),
-    ( __param(6, IModelService)),
-    ( __param(7, ITextModelService)),
-    ( __param(8, ILanguageService)),
-    ( __param(9, IConfigurationService)),
-    ( __param(10, IFilesConfigurationService)),
-    ( __param(11, IChatService)),
-    ( __param(12, ITextFileService)),
-    ( __param(13, IFileService)),
-    ( __param(14, IUndoRedoService)),
-    ( __param(15, IInstantiationService)),
-    ( __param(16, IAiEditTelemetryService)),
-    ( __param(17, IEditorWorkerService))
-], ChatEditingModifiedDocumentEntry));
+ChatEditingModifiedDocumentEntry = ( __decorate([( __param(5, IMarkerService)), ( __param(6, IModelService)), ( __param(7, ITextModelService)), ( __param(8, ILanguageService)), ( __param(9, IConfigurationService)), ( __param(10, IFilesConfigurationService)), ( __param(11, IChatService)), ( __param(12, ITextFileService)), ( __param(13, IFileService)), ( __param(14, IUndoRedoService)), ( __param(15, IInstantiationService)), ( __param(16, IAiEditTelemetryService)), ( __param(17, IEditorWorkerService))], ChatEditingModifiedDocumentEntry));
 
 export { ChatEditingModifiedDocumentEntry };

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

@@ -3,7 +3,7 @@ import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { Location, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -13,10 +13,10 @@ import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { ChatUserAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 declare class AutoAcceptControl {
     readonly total: number;
     readonly remaining: number;
@@ -73,7 +73,6 @@ export declare abstract class AbstractChatEditingModifiedFileEntry extends Dispo
     protected readonly _userEditScheduler: RunOnceScheduler;
     constructor(modifiedURI: URI, _telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, configService: IConfigurationService, _fileConfigService: IFilesConfigurationService, _chatService: IChatService, _fileService: IFileService, _undoRedoService: IUndoRedoService, _instantiationService: IInstantiationService, _aiEditTelemetryService: IAiEditTelemetryService);
     dispose(): void;
-    abstract hasModificationAt(location: Location): boolean;
     acquire(): this;
     enableReviewModeUntilSettled(): void;
     updateTelemetryInfo(telemetryInfo: IModifiedEntryTelemetryInfo): void;

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

@@ -26,8 +26,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -42,18 +42,35 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5169, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(5340, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
-    static { AbstractChatEditingModifiedFileEntry_1 = this; }
-    static { this.scheme = 'modified-file-entry'; }
-    static { this.lastEntryId = 0; }
+    static {
+        AbstractChatEditingModifiedFileEntry_1 = this;
+    }
+    static {
+        this.scheme = "modified-file-entry";
+    }
+    static {
+        this.lastEntryId = 0;
+    }
     get telemetryInfo() {
         return this._telemetryInfo;
     }
     get lastModifyingRequestId() {
         return this._telemetryInfo.requestId;
     }
-    constructor(modifiedURI, _telemetryInfo, kind, configService, _fileConfigService, _chatService, _fileService, _undoRedoService, _instantiationService, _aiEditTelemetryService) {
+    constructor(
+        modifiedURI,
+        _telemetryInfo,
+        kind,
+        configService,
+        _fileConfigService,
+        _chatService,
+        _fileService,
+        _undoRedoService,
+        _instantiationService,
+        _aiEditTelemetryService
+    ) {
         super();
         this.modifiedURI = modifiedURI;
         this._telemetryInfo = _telemetryInfo;
@@ -73,7 +90,9 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
         this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
         this._isExternalEditInProgress = false;
-        this._lastModifyingResponseObs = observableValueOpts({ equalsFn: (a, b) => a?.requestId === b?.requestId }, undefined);
+        this._lastModifyingResponseObs = observableValueOpts({
+            equalsFn: (a, b) => a?.requestId === b?.requestId
+        }, undefined);
         this.lastModifyingResponse = this._lastModifyingResponseObs;
         this._lastModifyingResponseInProgressObs = ( this._lastModifyingResponseObs.map((value, r) => {
             return value?.isInProgress.read(r) ?? false;
@@ -84,7 +103,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._autoAcceptCtrl = observableValue(this, undefined);
         this.autoAcceptController = this._autoAcceptCtrl;
         this._refCounter = 1;
-        this._userEditScheduler = this._register(( new RunOnceScheduler(() => this._notifySessionAction('userModified'), 1000)));
+        this._userEditScheduler = this._register(( new RunOnceScheduler(() => this._notifySessionAction("userModified"), 1000)));
         this._editorIntegrations = this._register(( new DisposableMap()));
         if (kind === ChatEditKind.Created) {
             this.createdInRequestId = this._telemetryInfo.requestId;
@@ -97,7 +116,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
                 }
             }));
         }
-        const autoAcceptRaw = observableConfigValue('chat.editing.autoAcceptDelay', 0, configService);
+        const autoAcceptRaw = observableConfigValue("chat.editing.autoAcceptDelay", 0, configService);
         this._autoAcceptTimeout = derived(r => {
             const value = autoAcceptRaw.read(r);
             return clamp(value, 0, 100);
@@ -107,13 +126,14 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             const tempValue = this._reviewModeTempObs.read(r);
             return tempValue ?? configuredValue === 0;
         });
-        this._store.add(toDisposable(() => this._lastModifyingResponseObs.set(undefined, undefined)));
+        this._store.add(
+            toDisposable(() => this._lastModifyingResponseObs.set(undefined, undefined))
+        );
         const autoSaveOff = this._store.add(( new MutableDisposable()));
         this._store.add(autorun(r => {
             if (this._waitsForLastEdits.read(r)) {
                 autoSaveOff.value = _fileConfigService.disableAutoSave(this.modifiedURI);
-            }
-            else {
+            } else {
                 autoSaveOff.clear();
             }
         }));
@@ -131,8 +151,7 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
                     const remain = Math.round(future - Date.now());
                     if (remain <= 0) {
                         this.accept();
-                    }
-                    else {
+                    } else {
                         const handle = setTimeout(update, 100);
                         this._autoAcceptCtrl.set(( new AutoAcceptControl(acceptTimeout, remain, () => {
                             clearTimeout(handle);
@@ -181,10 +200,10 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
             return;
         }
         await this._doAccept();
-        return (tx) => {
+        return tx => {
             this._stateObs.set(ModifiedFileEntryState.Accepted, tx);
             this._autoAcceptCtrl.set(undefined, tx);
-            this._notifySessionAction('accepted');
+            this._notifySessionAction("accepted");
         };
     }
     async reject() {
@@ -197,29 +216,34 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         if (this._stateObs.get() !== ModifiedFileEntryState.Modified) {
             return undefined;
         }
-        this._notifySessionAction('rejected');
+        this._notifySessionAction("rejected");
         await this._doReject();
-        return (tx) => {
+        return tx => {
             this._stateObs.set(ModifiedFileEntryState.Rejected, tx);
             this._autoAcceptCtrl.set(undefined, tx);
         };
     }
     _notifySessionAction(outcome) {
-        this._notifyAction({ kind: 'chatEditingSessionAction', uri: this.modifiedURI, hasRemainingEdits: false, outcome });
+        this._notifyAction({
+            kind: "chatEditingSessionAction",
+            uri: this.modifiedURI,
+            hasRemainingEdits: false,
+            outcome
+        });
     }
     _notifyAction(action) {
-        if (action.kind === 'chatEditingHunkAction') {
+        if (action.kind === "chatEditingHunkAction") {
             this._aiEditTelemetryService.handleCodeAccepted({
                 suggestionId: undefined,
-                acceptanceMethod: 'accept',
-                presentation: 'highlightedEdit',
+                acceptanceMethod: "accept",
+                presentation: "highlightedEdit",
                 modelId: this._telemetryInfo.modelId,
                 modeId: this._telemetryInfo.modeId,
                 applyCodeBlockSuggestionId: this._telemetryInfo.applyCodeBlockSuggestionId,
                 editDeltaInfo: ( new EditDeltaInfo(action.linesAdded, action.linesRemoved, -1, -1)),
                 feature: this._telemetryInfo.feature,
                 languageId: action.languageId,
-                source: undefined,
+                source: undefined
             });
         }
         this._chatService.notifyUserAction({
@@ -243,7 +267,10 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
     }
     acceptStreamingEditsStart(responseModel, undoStopId, tx) {
         this._resetEditsState(tx);
-        this._isCurrentlyBeingModifiedByObs.set({ responseModel, undoStopId }, tx);
+        this._isCurrentlyBeingModifiedByObs.set({
+            responseModel,
+            undoStopId
+        }, tx);
         this._lastModifyingResponseObs.set(responseModel, tx);
         this._autoAcceptCtrl.get()?.cancel();
         const undoRedoElement = this._createUndoRedoElement(responseModel);
@@ -269,14 +296,6 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._isExternalEditInProgress = false;
     }
 };
-AbstractChatEditingModifiedFileEntry = AbstractChatEditingModifiedFileEntry_1 = ( __decorate([
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IFilesConfigurationService)),
-    ( __param(5, IChatService)),
-    ( __param(6, IFileService)),
-    ( __param(7, IUndoRedoService)),
-    ( __param(8, IInstantiationService)),
-    ( __param(9, IAiEditTelemetryService))
-], AbstractChatEditingModifiedFileEntry));
+AbstractChatEditingModifiedFileEntry = AbstractChatEditingModifiedFileEntry_1 = ( __decorate([( __param(3, IConfigurationService)), ( __param(4, IFilesConfigurationService)), ( __param(5, IChatService)), ( __param(6, IFileService)), ( __param(7, IUndoRedoService)), ( __param(8, IInstantiationService)), ( __param(9, IAiEditTelemetryService))], AbstractChatEditingModifiedFileEntry));
 
 export { AbstractChatEditingModifiedFileEntry, pendingRewriteMinimap };

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

@@ -1,7 +1,7 @@
 import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ITransaction, IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { Location, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
@@ -12,19 +12,19 @@ import { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
-import { CellDiffInfo } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
+import { CellDiffInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
 import { NotebookCellTextModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChangedEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
 import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";
 import { ICellDiffInfo } from "./notebook/notebookCellChanges.js";
-import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
     private readonly modifiedResourceRef;
     private readonly _multiDiffEntryDelegate;
@@ -76,7 +76,6 @@ export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditin
     constructor(modifiedResourceRef: IReference<IResolvedNotebookEditorModel>, originalResourceRef: IReference<IResolvedNotebookEditorModel>, _multiDiffEntryDelegate: {
         collapse: (transaction: ITransaction | undefined) => void;
     }, transientOptions: TransientOptions | undefined, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string, configurationService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, instantiationService: IInstantiationService, textModelService: ITextModelService, modelService: IModelService, undoRedoService: IUndoRedoService, notebookEditorWorkerService: INotebookEditorWorkerService, loggingService: INotebookLoggingService, notebookResolver: INotebookEditorModelResolverService, aiEditTelemetryService: IAiEditTelemetryService);
-    hasModificationAt(location: Location): boolean;
     initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]): void;
     getIndexOfCellHandle(handle: number): number;
     private computeRequestId;