@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -2,12 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { WindowIntervalTimer } from '../../../../base/browser/dom.js';
 import { coalesceInPlace } from '../../../../base/common/arrays.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { Lazy } from '../../../../base/common/lazy.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { themeColorFromId } from '../../../../base/common/themables.js';
 import { StableEditorScrollState } from '../../../../editor/browser/stableEditorScroll.js';
 import { RenderOptions, LineSource, renderLines } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
-import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { OverviewRulerLane } from '../../../../editor/common/model.js';
@@ -16,31 +14,38 @@ import { IEditorWorkerService } from '../../../../editor/common/services/editorW
 import { InlineDecoration } from '../../../../editor/common/viewModel.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { countWords } from '../../chat/common/chatWordCounter.js';
-import { InlineChatFileCreatePreviewWidget } from './inlineChatFileCreationWidget.js';
-import { ReplyResponse } from './inlineChatSession.js';
-import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted } from '../common/inlineChat.js';
 import { assertType } from '../../../../base/common/types.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-class EditModeStrategy {
+import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
+import { isEqual } from '../../../../base/common/resources.js';
+var EditModeStrategy_1;
+const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatStrategies";
+let EditModeStrategy = class EditModeStrategy {
+    static { EditModeStrategy_1 = this; }
     static { this._decoBlock = ModelDecorationOptions.register({
         description: 'inline-chat',
         showIfCollapsed: false,
         isWholeLine: true,
         className: 'inline-chat-block-selection',
     }); }
-    constructor(_session, _editor, _zone) {
+    constructor(_session, _editor, _zone, _textFileService, _instaService) {
         this._session = _session;
         this._editor = _editor;
         this._zone = _zone;
-        this._store = ( new DisposableStore());
-        this._onDidAccept = this._store.add(( new Emitter()));
-        this._onDidDiscard = this._store.add(( new Emitter()));
+        this._textFileService = _textFileService;
+        this._instaService = _instaService;
+        this._store = ( (new DisposableStore()));
+        this._onDidAccept = this._store.add(( (new Emitter())));
+        this._onDidDiscard = this._store.add(( (new Emitter())));
         this._editCount = 0;
         this.onDidAccept = this._onDidAccept.event;
         this.onDidDiscard = this._onDidDiscard.event;
@@ -48,6 +53,36 @@ class EditModeStrategy {
     dispose() {
         this._store.dispose();
     }
+    async _doApplyChanges(ignoreLocal) {
+        const untitledModels = [];
+        const editor = this._instaService.createInstance(DefaultChatTextEditor);
+        for (const request of this._session.chatModel.getRequests()) {
+            if (!request.response?.response) {
+                continue;
+            }
+            for (const item of request.response.response.value) {
+                if (item.kind !== 'textEditGroup') {
+                    continue;
+                }
+                if (ignoreLocal && isEqual(item.uri, this._session.textModelN.uri)) {
+                    continue;
+                }
+                await editor.apply(request.response, item);
+                if (item.uri.scheme === Schemas.untitled) {
+                    const untitled = this._textFileService.untitled.get(item.uri);
+                    if (untitled) {
+                        untitledModels.push(untitled);
+                    }
+                }
+            }
+        }
+        for (const untitledModel of untitledModels) {
+            if (!untitledModel.isDisposed()) {
+                await untitledModel.resolve();
+                await untitledModel.save({ reason: 1  });
+            }
+        }
+    }
     cancel() {
         return this._session.hunkData.discardAll();
     }
@@ -66,7 +101,7 @@ class EditModeStrategy {
             for (const edit of edits) {
                 const wordCount = countWords(edit.text ?? '');
                 const speed = wordCount / durationInSec;
-                const asyncEdit = asProgressiveEdit(( new WindowIntervalTimer(this._zone.domNode)), edit, speed, opts.token);
+                const asyncEdit = asProgressiveEdit(( (new WindowIntervalTimer(this._zone.domNode))), edit, speed, opts.token);
                 await performAsyncTextEdit(this._session.textModelN, asyncEdit, progress, obs);
             }
         }
@@ -81,16 +116,20 @@ class EditModeStrategy {
     }
     getWholeRangeDecoration() {
         const ranges = [this._session.wholeRange.value];
-        const newDecorations = ( ranges.map(
-            range => range.isEmpty() ? undefined : ({ range, options: EditModeStrategy._decoBlock })
-        ));
+        const newDecorations = ( (ranges.map(
+            range => range.isEmpty() ? undefined : ({ range, options: EditModeStrategy_1._decoBlock })
+        )));
         coalesceInPlace(newDecorations);
         return newDecorations;
     }
-}
+};
+EditModeStrategy = EditModeStrategy_1 = ( (__decorate([
+    ( (__param(3, ITextFileService))),
+    ( (__param(4, IInstantiationService)))
+], EditModeStrategy)));
 let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
-    constructor(session, editor, zone, modelService, contextKeyService, instaService) {
-        super(session, editor, zone);
+    constructor(session, editor, zone, modelService, contextKeyService, textFileService, instaService) {
+        super(session, editor, zone, textFileService, instaService);
         this._ctxDocumentChanged = CTX_INLINE_CHAT_DOCUMENT_CHANGED.bindTo(contextKeyService);
         const baseModel = modelService.getModel(session.targetUri);
         Event.debounce(baseModel.onDidChangeContent.bind(baseModel), () => { }, 350)(_ => {
@@ -98,74 +137,40 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
                 this._ctxDocumentChanged.set(session.hasChangedText);
             }
         }, undefined, this._store);
-        this._previewZone = ( new Lazy(
-            () => instaService.createInstance(InlineChatFileCreatePreviewWidget, editor)
-        ));
     }
     dispose() {
         this._ctxDocumentChanged.reset();
-        this._previewZone.rawValue?.dispose();
         super.dispose();
     }
     async apply() {
-        const textModel = this._editor.getModel();
-        if (textModel?.equalsTextBuffer(this._session.textModel0.getTextBuffer())) {
-            this._session.hunkData.getInfo().forEach(item => item.acceptChanges());
-            const newText = this._session.textModel0.getValue();
-            const range = textModel.getFullModelRange();
-            textModel.pushStackElement();
-            textModel.pushEditOperations(null, [EditOperation.replace(range, newText)], () => null);
-            textModel.pushStackElement();
-        }
-        if (this._session.lastExchange?.response instanceof ReplyResponse) {
-            const { untitledTextModel } = this._session.lastExchange.response;
-            if (untitledTextModel && !untitledTextModel.isDisposed() && untitledTextModel.isDirty()) {
-                await untitledTextModel.save({ reason: 1  });
-            }
-        }
+        await super._doApplyChanges(false);
     }
     async makeChanges(edits, obs) {
-        return this._makeChanges(edits, obs, undefined, undefined);
     }
     async makeProgressiveChanges(edits, obs, opts) {
-        await this._makeChanges(edits, obs, opts, ( new Progress(() => {
-            this._zone.widget.showEditsPreview(this._session.hunkData, this._session.textModel0, this._session.textModelN);
-        })));
     }
     async undoChanges(altVersionId) {
         const { textModelN } = this._session;
         await undoModelUntil(textModelN, altVersionId);
     }
     async renderChanges(response) {
-        if (response.allLocalEdits.length > 0) {
-            this._zone.widget.showEditsPreview(this._session.hunkData, this._session.textModel0, this._session.textModelN);
-        }
-        else {
-            this._zone.widget.hideEditsPreview();
-        }
-        if (response.untitledTextModel && !response.untitledTextModel.isDisposed()) {
-            this._previewZone.value.showCreation(this._session.wholeRange.value.getStartPosition().delta(-1), response.untitledTextModel);
-        }
-        else {
-            this._previewZone.rawValue?.hide();
-        }
     }
     hasFocus() {
         return this._zone.widget.hasFocus();
     }
 };
-PreviewStrategy = ( __decorate([
-    ( __param(3, IModelService)),
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IInstantiationService))
-], PreviewStrategy));
+PreviewStrategy = ( (__decorate([
+    ( (__param(3, IModelService))),
+    ( (__param(4, IContextKeyService))),
+    ( (__param(5, ITextFileService))),
+    ( (__param(6, IInstantiationService)))
+], PreviewStrategy)));
 let LiveStrategy = class LiveStrategy extends EditModeStrategy {
-    constructor(session, editor, zone, contextKeyService, _editorWorkerService, _accessibilityService, _configService, _instaService) {
-        super(session, editor, zone);
+    constructor(session, editor, zone, contextKeyService, _editorWorkerService, _accessibilityService, _configService, textFileService, instaService) {
+        super(session, editor, zone, textFileService, instaService);
         this._editorWorkerService = _editorWorkerService;
         this._accessibilityService = _accessibilityService;
         this._configService = _configService;
-        this._instaService = _instaService;
         this._decoInsertedText = ModelDecorationOptions.register({
             description: 'inline-modified-line',
             className: 'inline-chat-inserted-range-linehighlight',
@@ -173,6 +178,10 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             overviewRuler: {
                 position: OverviewRulerLane.Full,
                 color: themeColorFromId(overviewRulerInlineChatDiffInserted),
+            },
+            minimap: {
+                position: 1 ,
+                color: themeColorFromId(minimapInlineChatDiffInserted),
             }
         });
         this._decoInsertedTextRange = ModelDecorationOptions.register({
@@ -182,17 +191,13 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         });
         this.acceptHunk = () => super.acceptHunk();
         this.discardHunk = () => super.discardHunk();
-        this._hunkDisplayData = ( new Map());
+        this._hunkDisplayData = ( (new Map()));
         this._ctxCurrentChangeHasDiff = CTX_INLINE_CHAT_CHANGE_HAS_DIFF.bindTo(contextKeyService);
         this._ctxCurrentChangeShowsDiff = CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF.bindTo(contextKeyService);
         this._progressiveEditingDecorations = this._editor.createDecorationsCollection();
-        this._previewZone = ( new Lazy(
-            () => _instaService.createInstance(InlineChatFileCreatePreviewWidget, editor)
-        ));
     }
     dispose() {
         this._resetDiff();
-        this._previewZone.rawValue?.dispose();
         super.dispose();
     }
     _resetDiff() {
@@ -200,7 +205,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         this._ctxCurrentChangeShowsDiff.reset();
         this._zone.widget.updateStatus('');
         this._progressiveEditingDecorations.clear();
-        for (const data of ( this._hunkDisplayData.values())) {
+        for (const data of ( (this._hunkDisplayData.values()))) {
             data.remove();
         }
     }
@@ -209,13 +214,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         if (this._editCount > 0) {
             this._editor.pushUndoStop();
         }
-        if (!(this._session.lastExchange?.response instanceof ReplyResponse)) {
-            return;
-        }
-        const { untitledTextModel } = this._session.lastExchange.response;
-        if (untitledTextModel && !untitledTextModel.isDisposed() && untitledTextModel.isDirty()) {
-            await untitledTextModel.save({ reason: 1  });
-        }
+        await super._doApplyChanges(true);
     }
     cancel() {
         this._resetDiff();
@@ -229,35 +228,29 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         return this._makeChanges(edits, obs, undefined, undefined);
     }
     async makeProgressiveChanges(edits, obs, opts) {
-        const progress = ( new Progress(edits => {
-            const newLines = ( new Set());
+        const progress = ( (new Progress(edits => {
+            const newLines = ( (new Set()));
             for (const edit of edits) {
                 LineRange.fromRange(edit.range).forEach(line => newLines.add(line));
             }
-            const existingRanges = ( this._progressiveEditingDecorations.getRanges().map(LineRange.fromRange));
+            const existingRanges = ( (this._progressiveEditingDecorations.getRanges().map(LineRange.fromRange)));
             for (const existingRange of existingRanges) {
                 existingRange.forEach(line => newLines.delete(line));
             }
             const newDecorations = [];
             for (const line of newLines) {
-                newDecorations.push({ range: ( new Range(line, 1, line, Number.MAX_VALUE)), options: this._decoInsertedText });
+                newDecorations.push({ range: ( (new Range(line, 1, line, Number.MAX_VALUE))), options: this._decoInsertedText });
             }
             this._progressiveEditingDecorations.append(newDecorations);
-        }));
+        })));
         return this._makeChanges(edits, obs, opts, progress);
     }
     async renderChanges(response) {
-        if (response.untitledTextModel && !response.untitledTextModel.isDisposed()) {
-            this._previewZone.value.showCreation(this._session.wholeRange.value.getStartPosition().delta(-1), response.untitledTextModel);
-        }
-        else {
-            this._previewZone.rawValue?.hide();
-        }
         this._progressiveEditingDecorations.clear();
         const renderHunks = () => {
             let widgetData;
             changeDecorationsAndViewZones(this._editor, (decorationsAccessor, viewZoneAccessor) => {
-                const keysNow = ( new Set(( this._hunkDisplayData.keys())));
+                const keysNow = ( (new Set( (this._hunkDisplayData.keys()))));
                 widgetData = undefined;
                 for (const hunkData of this._session.hunkData.getInfo()) {
                     keysNow.delete(hunkData);
@@ -282,15 +275,19 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                         const mightContainRTL = this._session.textModel0.mightContainRTL();
                         const renderOptions = RenderOptions.fromEditor(this._editor);
                         const originalRange = hunkData.getRanges0()[0];
-                        const source = ( new LineSource(
+                        const source = ( (new LineSource(
                             LineRange.fromRangeInclusive(originalRange).mapToLineArray(l => this._session.textModel0.tokenization.getLineTokens(l)),
                             [],
                             mightContainNonBasicASCII,
                             mightContainRTL
-                        ));
+                        )));
                         const domNode = document.createElement('div');
                         domNode.className = 'inline-chat-original-zone2';
-                        const result = renderLines(source, renderOptions, [( new InlineDecoration(( new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1)), '', 0 ))], domNode);
+                        const result = renderLines(source, renderOptions, [( (new InlineDecoration(
+                             (new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1)),
+                            '',
+                            0
+                        )))], domNode);
                         const viewZoneData = {
                             afterLineNumber: -1,
                             heightInLines: result.heightInLines,
@@ -432,47 +429,21 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         const needsReview = this._configService.getValue("inlineChat.acceptedOrDiscardBeforeSave" );
         let message;
         if (total === 0) {
-            message = ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'change.0',
-                "Nothing changed."
-            ));
+            message = ( localizeWithPath(_moduleId, 0, "Nothing changed."));
         }
         else if (remaining === 1) {
             message = needsReview
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'review.1',
-                "$(info) Accept or Discard 1 change."
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'change.1',
-                "1 change"
-            ));
+                ? ( localizeWithPath(_moduleId, 1, "$(info) Accept or Discard 1 change."))
+                : ( localizeWithPath(_moduleId, 2, "1 change"));
         }
         else {
             message = needsReview
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'review.N',
-                "$(info) Accept or Discard {0} changes.",
-                remaining
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'change.N',
-                "{0} changes",
-                total
-            ));
+                ? ( localizeWithPath(_moduleId, 3, "$(info) Accept or Discard {0} changes.", remaining))
+                : ( localizeWithPath(_moduleId, 4, "{0} changes", total));
         }
         let title;
         if (needsReview) {
-            title = ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'review',
-                "Review (accept or discard) all changes before continuing."
-            ));
+            title = ( localizeWithPath(_moduleId, 5, "Review (accept or discard) all changes before continuing."));
         }
         this._zone.widget.updateStatus(message, { title });
     }
@@ -483,13 +454,14 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         return [];
     }
 };
-LiveStrategy = ( __decorate([
-    ( __param(3, IContextKeyService)),
-    ( __param(4, IEditorWorkerService)),
-    ( __param(5, IAccessibilityService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IInstantiationService))
-], LiveStrategy));
+LiveStrategy = ( (__decorate([
+    ( (__param(3, IContextKeyService))),
+    ( (__param(4, IEditorWorkerService))),
+    ( (__param(5, IAccessibilityService))),
+    ( (__param(6, IConfigurationService))),
+    ( (__param(7, ITextFileService))),
+    ( (__param(8, IInstantiationService)))
+], LiveStrategy)));
 async function undoModelUntil(model, targetAltVersion) {
     while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {
         await model.undo();