@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

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

@@ -0,0 +1,284 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ObservableDisposable } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/base/common/observableDisposable';
+import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
+import { OffsetEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/offsetEdit';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
+import { ModelDecorationOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
+import { OffsetEdits } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModelOffsetEdit';
+import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorSelectionBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
+import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { pendingRewriteMinimap } from '../chatEditingModifiedFileEntry.js';
+import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+
+var ChatEditingNotebookCellEntry_1;
+let ChatEditingNotebookCellEntry = class ChatEditingNotebookCellEntry extends ObservableDisposable {
+    static { ChatEditingNotebookCellEntry_1 = this; }
+    static { this._lastEditDecorationOptions = ModelDecorationOptions.register({
+        isWholeLine: true,
+        description: 'chat-last-edit',
+        className: 'chat-editing-last-edit-line',
+        marginClassName: 'chat-editing-last-edit',
+        overviewRuler: {
+            position: OverviewRulerLane.Full,
+            color: themeColorFromId(editorSelectionBackground)
+        },
+    }); }
+    static { this._pendingEditDecorationOptions = ModelDecorationOptions.register({
+        isWholeLine: true,
+        description: 'chat-pending-edit',
+        className: 'chat-editing-pending-edit',
+        minimap: {
+            position: MinimapPosition.Inline,
+            color: themeColorFromId(pendingRewriteMinimap)
+        }
+    }); }
+    get isEditFromUs() {
+        return this._isEditFromUs;
+    }
+    get allEditsAreFromUs() {
+        return this._allEditsAreFromUs;
+    }
+    get diffInfo() {
+        return this._diffInfo;
+    }
+    constructor(notebookUri, cell, modifiedModel, originalModel, disposables, configService, _editorWorkerService, notebookEditorService) {
+        super();
+        this.notebookUri = notebookUri;
+        this.cell = cell;
+        this.modifiedModel = modifiedModel;
+        this.originalModel = originalModel;
+        this._editorWorkerService = _editorWorkerService;
+        this.notebookEditorService = notebookEditorService;
+        this._edit = OffsetEdit.empty;
+        this._isEditFromUs = false;
+        this._allEditsAreFromUs = true;
+        this._diffOperationIds = 0;
+        this._diffInfo = observableValue(this, nullDocumentDiff);
+        this._maxModifiedLineNumber = observableValue(this, 0);
+        this.maxModifiedLineNumber = this._maxModifiedLineNumber;
+        this._editDecorationClear = this._register(( new RunOnceScheduler(
+            () => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); },
+            500
+        )));
+        this._editDecorations = [];
+        this._stateObs = observableValue(this, WorkingSetEntryState.Modified);
+        this.state = this._stateObs;
+        this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
+        this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
+        this.initialContent = this.originalModel.getValue();
+        this._register(disposables);
+        this._register(this.modifiedModel.onDidChangeContent(e => {
+            this._mirrorEdits(e);
+        }));
+        this._register(toDisposable(() => {
+            this.clearCurrentEditLineDecoration();
+        }));
+        this._diffTrimWhitespace = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configService);
+        this._register(autorun(r => {
+            this._diffTrimWhitespace.read(r);
+            this._updateDiffInfoSeq();
+        }));
+    }
+    clearCurrentEditLineDecoration() {
+        if (this.modifiedModel.isDisposed()) {
+            return;
+        }
+        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
+    }
+    _mirrorEdits(event) {
+        const edit = OffsetEdits.fromContentChanges(event.changes);
+        if (this._isEditFromUs) {
+            const e_sum = this._edit;
+            const e_ai = edit;
+            this._edit = e_sum.compose(e_ai);
+        }
+        else {
+            const e_ai = this._edit;
+            const e_user = edit;
+            const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
+            if (e_user_r === undefined) {
+                this._edit = e_ai.compose(e_user);
+            }
+            else {
+                const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
+                this.originalModel.applyEdits(edits);
+                this._edit = e_ai.tryRebase(e_user_r);
+            }
+            this._allEditsAreFromUs = false;
+            this._updateDiffInfoSeq();
+            const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
+            const currentState = this._stateObs.get();
+            switch (currentState) {
+                case WorkingSetEntryState.Modified:
+                    if (didResetToOriginalContent) {
+                        this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+                        break;
+                    }
+            }
+        }
+    }
+    acceptAgentEdits(textEdits, isLastEdits, responseModel) {
+        const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
+        if (notebookEditor) {
+            const vm = notebookEditor.getCellByHandle(this.cell.handle);
+            vm?.updateEditState(CellEditState.Editing, 'chatEdit');
+        }
+        const ops = ( textEdits.map(TextEdit.asEditOperation));
+        const undoEdits = this._applyEdits(ops);
+        const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
+        const newDecorations = [
+            {
+                options: ChatEditingNotebookCellEntry_1._pendingEditDecorationOptions,
+                range: ( new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER))
+            }
+        ];
+        if (maxLineNumber > 0) {
+            newDecorations.push({
+                options: ChatEditingNotebookCellEntry_1._lastEditDecorationOptions,
+                range: ( new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER))
+            });
+        }
+        this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
+        transaction((tx) => {
+            if (!isLastEdits) {
+                this._stateObs.set(WorkingSetEntryState.Modified, tx);
+                this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+                this._maxModifiedLineNumber.set(maxLineNumber, tx);
+            }
+            else {
+                this._resetEditsState(tx);
+                this._updateDiffInfoSeq();
+                this._maxModifiedLineNumber.set(0, tx);
+                this._editDecorationClear.schedule();
+            }
+        });
+    }
+    scheduleEditDecorations() {
+        this._editDecorationClear.schedule();
+    }
+    _resetEditsState(tx) {
+        this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
+        this._maxModifiedLineNumber.set(0, tx);
+    }
+    async keep(change) {
+        return this._acceptHunk(change);
+    }
+    async _acceptHunk(change) {
+        this._isEditFromUs = true;
+        try {
+            if (!this._diffInfo.get().changes.includes(change)) {
+                return false;
+            }
+            const edits = [];
+            for (const edit of change.innerChanges ?? []) {
+                const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
+                edits.push(EditOperation.replace(edit.originalRange, newText));
+            }
+            this.originalModel.pushEditOperations(null, edits, _ => null);
+        }
+        finally {
+            this._isEditFromUs = false;
+        }
+        await this._updateDiffInfoSeq();
+        if (this._diffInfo.get().identical) {
+            this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
+        }
+        return true;
+    }
+    async undo(change) {
+        return this._rejectHunk(change);
+    }
+    async _rejectHunk(change) {
+        this._isEditFromUs = true;
+        try {
+            if (!this._diffInfo.get().changes.includes(change)) {
+                return false;
+            }
+            const edits = [];
+            for (const edit of change.innerChanges ?? []) {
+                const newText = this.originalModel.getValueInRange(edit.originalRange);
+                edits.push(EditOperation.replace(edit.modifiedRange, newText));
+            }
+            this.modifiedModel.pushEditOperations(null, edits, _ => null);
+        }
+        finally {
+            this._isEditFromUs = false;
+        }
+        await this._updateDiffInfoSeq();
+        if (this._diffInfo.get().identical) {
+            this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+        }
+        return true;
+    }
+    _applyEdits(edits) {
+        this._isEditFromUs = true;
+        try {
+            let result = [];
+            this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
+                result = undoEdits;
+                return null;
+            });
+            return result;
+        }
+        finally {
+            this._isEditFromUs = false;
+        }
+    }
+    async _updateDiffInfoSeq() {
+        const myDiffOperationId = ++this._diffOperationIds;
+        await Promise.resolve(this._diffOperation);
+        if (this._diffOperationIds === myDiffOperationId) {
+            const thisDiffOperation = this._updateDiffInfo();
+            this._diffOperation = thisDiffOperation;
+            await thisDiffOperation;
+        }
+    }
+    async _updateDiffInfo() {
+        if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
+            return;
+        }
+        const docVersionNow = this.modifiedModel.getVersionId();
+        const snapshotVersionNow = this.originalModel.getVersionId();
+        const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
+        const diff = await this._editorWorkerService.computeDiff(this.originalModel.uri, this.modifiedModel.uri, { ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 }, 'advanced');
+        if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
+            return;
+        }
+        if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
+            const diff2 = diff ?? nullDocumentDiff;
+            this._diffInfo.set(diff2, undefined);
+            this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
+        }
+    }
+};
+ChatEditingNotebookCellEntry = ChatEditingNotebookCellEntry_1 = ( __decorate([
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IEditorWorkerService)),
+    ( __param(7, INotebookEditorService))
+], ChatEditingNotebookCellEntry));
+
+export { ChatEditingNotebookCellEntry };

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

@@ -0,0 +1,38 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/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/chatEditingService";
+import { ChatEditingModifiedNotebookEntry } from "../chatEditingModifiedNotebookEntry.js";
+import { ICellDiffInfo } from "./notebookCellChanges.js";
+export declare class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
+    private readonly instantiationService;
+    private integration;
+    private notebookEditor;
+    constructor(_entry: ChatEditingModifiedNotebookEntry, editor: IEditorPane, notebookModel: NotebookTextModel, originalModel: NotebookTextModel, cellChanges: IObservable<ICellDiffInfo[]>, instantiationService: IInstantiationService);
+    get currentIndex(): IObservable<number>;
+    reveal(firstOrLast: boolean): void;
+    next(wrap: boolean): boolean;
+    previous(wrap: boolean): boolean;
+    enableAccessibleDiffView(): void;
+    acceptNearestChange(change: IModifiedFileEntryChangeHunk): void;
+    rejectNearestChange(change: IModifiedFileEntryChangeHunk): void;
+    toggleDiff(change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    dispose(): void;
+}
+export declare class ChatEditingNotebookDiffEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
+    private readonly notebookDiffEditor;
+    private readonly cellChanges;
+    private readonly _currentIndex;
+    readonly currentIndex: IObservable<number>;
+    constructor(notebookDiffEditor: INotebookTextDiffEditor, cellChanges: IObservable<ICellDiffInfo[]>);
+    reveal(firstOrLast: boolean): void;
+    next(_wrap: boolean): boolean;
+    previous(_wrap: boolean): boolean;
+    enableAccessibleDiffView(): void;
+    acceptNearestChange(change: IModifiedFileEntryChangeHunk): void;
+    rejectNearestChange(change: IModifiedFileEntryChangeHunk): void;
+    toggleDiff(_change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+}