@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { ResourceFileEdit, ResourceTextEdit, ResourceEdit } from '../../../../editor/browser/services/bulkEditService.js';
+import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
@@ -14,7 +15,6 @@ import { ResourceMap } from '../../../../base/common/map.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
-import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { coalesceInPlace } from '../../../../base/common/arrays.js';
 import { Iterable } from '../../../../base/common/iterator.js';
@@ -93,12 +93,12 @@ class Session {
     constructor(editMode,
     targetUri,
     textModel0,
-    textModelN, provider, session, wholeRange, hunkData, chatModel) {
+    textModelN, agent, session, wholeRange, hunkData, chatModel) {
         this.editMode = editMode;
         this.targetUri = targetUri;
         this.textModel0 = textModel0;
         this.textModelN = textModelN;
-        this.provider = provider;
+        this.agent = agent;
         this.session = session;
         this.wholeRange = wholeRange;
         this.hunkData = hunkData;
@@ -108,7 +108,7 @@ class Session {
         this._startTime = ( new Date());
         this.textModelNAltVersion = textModelN.getAlternativeVersionId();
         this._teldata = {
-            extension: ExtensionIdentifier.toKey(provider.extensionId),
+            extension: ExtensionIdentifier.toKey(agent.extensionId),
             startTime: this._startTime.toISOString(),
             endTime: this._startTime.toISOString(),
             edits: 0,
@@ -135,17 +135,14 @@ class Session {
         this._teldata.unstashed += 1;
         this._isUnstashed = true;
     }
-    get textModelNSnapshotAltVersion() {
-        return this._textModelNSnapshotAltVersion;
-    }
-    createSnapshot() {
-        this._textModelNSnapshotAltVersion = this.textModelN.getAlternativeVersionId();
-    }
     addExchange(exchange) {
         this._isUnstashed = false;
         const newLen = this._exchange.push(exchange);
         this._teldata.rounds += `${newLen}|`;
     }
+    get exchanges() {
+        return this._exchange;
+    }
     get lastExchange() {
         return this._exchange[this._exchange.length - 1];
     }
@@ -171,10 +168,10 @@ class Session {
     asTelemetryData() {
         for (const item of this.hunkData.getInfo()) {
             switch (item.getState()) {
-                case 1 :
+                case HunkState.Accepted:
                     this._teldata.acceptedHunks += 1;
                     break;
-                case 2 :
+                case HunkState.Rejected:
                     this._teldata.discardedHunks += 1;
                     break;
             }
@@ -198,8 +195,10 @@ class Session {
     }
 }
 class SessionPrompt {
-    constructor(value) {
-        this.value = value;
+    constructor(request, modelAltVersionId) {
+        this.request = request;
+        this.modelAltVersionId = modelAltVersionId;
+        this.value = request.message.text;
     }
 }
 class SessionExchange {
@@ -218,43 +217,34 @@ class ErrorResponse {
     }
 }
 let ReplyResponse = class ReplyResponse {
-    constructor(raw, mdContent, localUri, modelAltVersionId, progressEdits, requestId, chatResponse, _textFileService, _languageService) {
+    constructor(raw, localUri, modelAltVersionId, chatRequest, chatResponse, _textFileService, _languageService) {
         this.raw = raw;
-        this.mdContent = mdContent;
         this.modelAltVersionId = modelAltVersionId;
-        this.requestId = requestId;
+        this.chatRequest = chatRequest;
         this.chatResponse = chatResponse;
         this._textFileService = _textFileService;
         this._languageService = _languageService;
-        this.allLocalEdits = [];
         const editsMap = ( new ResourceMap());
-        editsMap.set(localUri, [...progressEdits]);
-        if (raw.type === "editorEdit" ) {
-            editsMap.get(localUri).push(raw.edits);
-        }
-        else if (raw.type === "bulkEdit" ) {
-            const edits = ResourceEdit.convert(raw.edits);
-            for (const edit of edits) {
-                if (edit instanceof ResourceFileEdit) {
-                    if (edit.newResource && !edit.oldResource) {
-                        editsMap.set(edit.newResource, []);
-                        if (edit.options.contents) {
-                            console.warn('CONTENT not supported');
-                        }
+        const edits = ResourceEdit.convert(raw.edits);
+        for (const edit of edits) {
+            if (edit instanceof ResourceFileEdit) {
+                if (edit.newResource && !edit.oldResource) {
+                    editsMap.set(edit.newResource, []);
+                    if (edit.options.contents) {
+                        console.warn('CONTENT not supported');
                     }
                 }
-                else if (edit instanceof ResourceTextEdit) {
-                    const array = editsMap.get(edit.resource);
-                    if (array) {
-                        array.push([edit.textEdit]);
-                    }
-                    else {
-                        editsMap.set(edit.resource, [[edit.textEdit]]);
-                    }
+            }
+            else if (edit instanceof ResourceTextEdit) {
+                const array = editsMap.get(edit.resource);
+                if (array) {
+                    array.push([edit.textEdit]);
+                }
+                else {
+                    editsMap.set(edit.resource, [[edit.textEdit]]);
                 }
             }
         }
-        let needsWorkspaceEdit = false;
         for (const [uri, edits] of editsMap) {
             const flatEdits = edits.flat();
             if (flatEdits.length === 0) {
@@ -262,7 +252,6 @@ let ReplyResponse = class ReplyResponse {
                 continue;
             }
             const isLocalUri = isEqual(uri, localUri);
-            needsWorkspaceEdit = needsWorkspaceEdit || (uri.scheme !== Schemas.untitled && !isLocalUri);
             if (uri.scheme === Schemas.untitled && !isLocalUri && !this.untitledTextModel) {
                 const langSelection = this._languageService.createByFilepathOrFirstLine(uri, undefined);
                 const untitledTextModel = this._textFileService.untitled.create({
@@ -273,21 +262,11 @@ let ReplyResponse = class ReplyResponse {
                 untitledTextModel.resolve();
             }
         }
-        this.allLocalEdits = editsMap.get(localUri) ?? [];
-        if (needsWorkspaceEdit) {
-            const workspaceEdits = [];
-            for (const [uri, edits] of editsMap) {
-                for (const edit of edits.flat()) {
-                    workspaceEdits.push({ resource: uri, textEdit: edit, versionId: undefined });
-                }
-            }
-            this.workspaceEdit = { edits: workspaceEdits };
-        }
     }
 };
 ReplyResponse = ( __decorate([
-    ( __param(7, ITextFileService)),
-    ( __param(8, ILanguageService))
+    ( __param(5, ITextFileService)),
+    ( __param(6, ILanguageService))
 ], ReplyResponse));
 let StashedSession = class StashedSession {
     constructor(editor, session, _undoCancelEdits, contextKeyService, _sessionService, _logService) {
@@ -330,11 +309,26 @@ StashedSession = ( __decorate([
     ( __param(4, IInlineChatSessionService)),
     ( __param(5, ILogService))
 ], StashedSession));
+function lineRangeAsRange(lineRange, model) {
+    return lineRange.isEmpty
+        ? ( new Range(
+        lineRange.startLineNumber,
+        1,
+        lineRange.startLineNumber,
+        model.getLineLength(lineRange.startLineNumber)
+    ))
+        : ( new Range(
+        lineRange.startLineNumber,
+        1,
+        lineRange.endLineNumberExclusive - 1,
+        model.getLineLength(lineRange.endLineNumberExclusive - 1)
+    ));
+}
 let HunkData = class HunkData {
     static { HunkData_1 = this; }
     static { this._HUNK_TRACKED_RANGE = ModelDecorationOptions.register({
         description: 'inline-chat-hunk-tracked-range',
-        stickiness: 0
+        stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
     }); }
     static { this._HUNK_THRESHOLD = 8; }
     constructor(_editorWorkerService, _textModel0, _textModelN) {
@@ -378,7 +372,7 @@ let HunkData = class HunkData {
         const hunkRanges = [];
         const ranges0 = [];
         for (const { textModelNDecorations, textModel0Decorations, state } of ( this._data.values())) {
-            if (state === 0 ) {
+            if (state === HunkState.Pending) {
                 for (let i = 1; i < textModelNDecorations.length; i++) {
                     const rangeN = this._textModelN.getDecorationRange(textModelNDecorations[i]);
                     const range0 = this._textModel0.getDecorationRange(textModel0Decorations[i]);
@@ -387,7 +381,7 @@ let HunkData = class HunkData {
                     }
                 }
             }
-            else if (state === 1 ) {
+            else if (state === HunkState.Accepted) {
                 for (let i = 1; i < textModel0Decorations.length; i++) {
                     const range = this._textModel0.getDecorationRange(textModel0Decorations[i]);
                     if (range) {
@@ -432,7 +426,7 @@ let HunkData = class HunkData {
         }
         this._textModel0.pushEditOperations(null, edits, () => null);
     }
-    async recompute() {
+    async recompute(editState) {
         const diff = await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
         if (!diff || diff.changes.length === 0) {
             return;
@@ -463,16 +457,17 @@ let HunkData = class HunkData {
                 for (const hunk of hunks) {
                     const textModelNDecorations = [];
                     const textModel0Decorations = [];
-                    textModelNDecorations.push(accessorN.addDecoration(LineRange.asRange(hunk.modified, this._textModelN), HunkData_1._HUNK_TRACKED_RANGE));
-                    textModel0Decorations.push(accessor0.addDecoration(LineRange.asRange(hunk.original, this._textModel0), HunkData_1._HUNK_TRACKED_RANGE));
+                    textModelNDecorations.push(accessorN.addDecoration(lineRangeAsRange(hunk.modified, this._textModelN), HunkData_1._HUNK_TRACKED_RANGE));
+                    textModel0Decorations.push(accessor0.addDecoration(lineRangeAsRange(hunk.original, this._textModel0), HunkData_1._HUNK_TRACKED_RANGE));
                     for (const change of hunk.changes) {
                         textModelNDecorations.push(accessorN.addDecoration(change.modifiedRange, HunkData_1._HUNK_TRACKED_RANGE));
                         textModel0Decorations.push(accessor0.addDecoration(change.originalRange, HunkData_1._HUNK_TRACKED_RANGE));
                     }
                     this._data.set(hunk, {
+                        editState,
                         textModelNDecorations,
                         textModel0Decorations,
-                        state: 0
+                        state: HunkState.Pending
                     });
                 }
             });
@@ -482,7 +477,7 @@ let HunkData = class HunkData {
         return this._data.size;
     }
     get pending() {
-        return Iterable.reduce(( this._data.values()), (r, { state }) => r + (state === 0  ? 1 : 0), 0);
+        return Iterable.reduce(( this._data.values()), (r, { state }) => r + (state === HunkState.Pending ? 1 : 0), 0);
     }
     _discardEdits(item) {
         const edits = [];
@@ -498,7 +493,7 @@ let HunkData = class HunkData {
     discardAll() {
         const edits = [];
         for (const item of this.getInfo()) {
-            if (item.getState() !== 2 ) {
+            if (item.getState() === HunkState.Pending) {
                 edits.push(this._discardEdits(item));
             }
         }
@@ -530,14 +525,14 @@ let HunkData = class HunkData {
                     return ranges;
                 },
                 discardChanges: () => {
-                    if (data.state === 0 ) {
+                    if (data.state === HunkState.Pending) {
                         const edits = this._discardEdits(item);
                         this._textModelN.pushEditOperations(null, edits, () => null);
-                        data.state = 2 ;
+                        data.state = HunkState.Rejected;
                     }
                 },
                 acceptChanges: () => {
-                    if (data.state === 0 ) {
+                    if (data.state === HunkState.Pending) {
                         const edits = [];
                         const rangesN = item.getRangesN();
                         const ranges0 = item.getRanges0();
@@ -547,7 +542,8 @@ let HunkData = class HunkData {
                             edits.push(EditOperation.replace(originalRange, modifiedValue));
                         }
                         this._textModel0.pushEditOperations(null, edits, () => null);
-                        data.state = 1 ;
+                        data.state = HunkState.Accepted;
+                        data.editState.applied += 1;
                     }
                 }
             };
@@ -566,4 +562,10 @@ class RawHunk {
         this.changes = changes;
     }
 }
-export { EmptyResponse, ErrorResponse, HunkData, ReplyResponse, Session, SessionExchange, SessionPrompt, SessionWholeRange, StashedSession };
+var HunkState;
+( (function(HunkState) {
+    HunkState[HunkState["Pending"] = 0] = "Pending";
+    HunkState[HunkState["Accepted"] = 1] = "Accepted";
+    HunkState[HunkState["Rejected"] = 2] = "Rejected";
+})(HunkState || (HunkState = {})));
+export { EmptyResponse, ErrorResponse, HunkData, HunkState, ReplyResponse, Session, SessionExchange, SessionPrompt, SessionWholeRange, StashedSession };