@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -19,7 +19,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 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, InlineChatLivePreviewWidget } from './inlineChatLivePreviewWidget.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 { assertType } from '../../../../base/common/types.js';
@@ -89,7 +89,7 @@ class EditModeStrategy {
     }
 }
 let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
-    constructor(session, editor, zone, modelService, contextKeyService) {
+    constructor(session, editor, zone, modelService, contextKeyService, instaService) {
         super(session, editor, zone);
         this._ctxDocumentChanged = CTX_INLINE_CHAT_DOCUMENT_CHANGED.bindTo(contextKeyService);
         const baseModel = modelService.getModel(session.targetUri);
@@ -98,9 +98,13 @@ 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() {
@@ -139,11 +143,11 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
         else {
             this._zone.widget.hideEditsPreview();
         }
-        if (response.untitledTextModel) {
-            this._zone.widget.showCreatePreview(response.untitledTextModel);
+        if (response.untitledTextModel && !response.untitledTextModel.isDisposed()) {
+            this._previewZone.value.showCreation(this._session.wholeRange.value.getStartPosition().delta(-1), response.untitledTextModel);
         }
         else {
-            this._zone.widget.hideCreatePreview();
+            this._previewZone.rawValue?.hide();
         }
     }
     hasFocus() {
@@ -152,150 +156,9 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
 };
 PreviewStrategy = ( __decorate([
     ( __param(3, IModelService)),
-    ( __param(4, IContextKeyService))
+    ( __param(4, IContextKeyService)),
+    ( __param(5, IInstantiationService))
 ], PreviewStrategy));
-let LivePreviewStrategy = class LivePreviewStrategy extends EditModeStrategy {
-    constructor(session, editor, zone, _instaService) {
-        super(session, editor, zone);
-        this._instaService = _instaService;
-        this._diffZonePool = [];
-        this._previewZone = ( new Lazy(
-            () => _instaService.createInstance(InlineChatFileCreatePreviewWidget, editor)
-        ));
-    }
-    dispose() {
-        for (const zone of this._diffZonePool) {
-            zone.hide();
-            zone.dispose();
-        }
-        this._previewZone.rawValue?.hide();
-        this._previewZone.rawValue?.dispose();
-        super.dispose();
-    }
-    async apply() {
-        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  });
-        }
-    }
-    async undoChanges(altVersionId) {
-        const { textModelN } = this._session;
-        await undoModelUntil(textModelN, altVersionId);
-        this._updateDiffZones();
-    }
-    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._updateDiffZones();
-        })));
-    }
-    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();
-        }
-        return this._updateDiffZones();
-    }
-    _updateSummaryMessage(hunkCount) {
-        let message;
-        if (hunkCount === 0) {
-            message = ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'change.0',
-                "Nothing changed"
-            ));
-        }
-        else if (hunkCount === 1) {
-            message = ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'change.1',
-                "1 change"
-            ));
-        }
-        else {
-            message = ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
-                'lines.NM',
-                "{0} changes",
-                hunkCount
-            ));
-        }
-        this._zone.widget.updateStatus(message);
-    }
-    _updateDiffZones() {
-        const { hunkData } = this._session;
-        const hunks = hunkData.getInfo().filter(hunk => hunk.getState() === 0 );
-        if (hunks.length === 0) {
-            for (const zone of this._diffZonePool) {
-                zone.hide();
-            }
-            if (hunkData.getInfo().find(hunk => hunk.getState() === 1 )) {
-                this._onDidAccept.fire();
-            }
-            else {
-                this._onDidDiscard.fire();
-            }
-            return;
-        }
-        this._updateSummaryMessage(hunks.length);
-        const handleDiff = () => this._updateDiffZones();
-        let nearest;
-        while (hunks.length > this._diffZonePool.length) {
-            this._diffZonePool.push(this._instaService.createInstance(InlineChatLivePreviewWidget, this._editor, this._session, {}, this._diffZonePool.length === 0 ? handleDiff : undefined));
-        }
-        for (let i = 0; i < hunks.length; i++) {
-            const hunk = hunks[i];
-            this._diffZonePool[i].showForChanges(hunk);
-            const modifiedRange = hunk.getRangesN()[0];
-            const zoneLineNumber = this._zone.position.lineNumber;
-            const distance = zoneLineNumber <= modifiedRange.startLineNumber
-                ? modifiedRange.startLineNumber - zoneLineNumber
-                : zoneLineNumber - modifiedRange.endLineNumber;
-            if (!nearest || nearest.distance > distance) {
-                nearest = {
-                    position: modifiedRange.getStartPosition().delta(-1),
-                    distance,
-                    accept: () => {
-                        hunk.acceptChanges();
-                        handleDiff();
-                    },
-                    discard: () => {
-                        hunk.discardChanges();
-                        handleDiff();
-                    }
-                };
-            }
-        }
-        for (let i = hunks.length; i < this._diffZonePool.length; i++) {
-            this._diffZonePool[i].hide();
-        }
-        this.acceptHunk = async () => nearest?.accept();
-        this.discardHunk = async () => nearest?.discard();
-        if (nearest) {
-            this._zone.updatePositionAndHeight(nearest.position);
-            this._editor.revealPositionInCenterIfOutsideViewport(nearest.position);
-        }
-        return nearest?.position;
-    }
-    hasFocus() {
-        return this._zone.widget.hasFocus()
-            || Boolean(this._previewZone.rawValue?.hasFocus())
-            || ( this._diffZonePool.some(zone => zone.isVisible && zone.hasFocus()));
-    }
-};
-LivePreviewStrategy = ( __decorate([
-    ( __param(3, IInstantiationService))
-], LivePreviewStrategy));
 let LiveStrategy = class LiveStrategy extends EditModeStrategy {
     constructor(session, editor, zone, contextKeyService, _editorWorkerService, _accessibilityService, _configService, _instaService) {
         super(session, editor, zone);
@@ -447,7 +310,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                                     data.viewZoneId = undefined;
                                 }
                             });
-                            this._ctxCurrentChangeShowsDiff.set(typeof data?.viewZoneId === 'number');
+                            this._ctxCurrentChangeShowsDiff.set(typeof data?.viewZoneId === 'string');
                             scrollState.restore(this._editor);
                         };
                         const remove = () => {
@@ -535,7 +398,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                 this._zone.updatePositionAndHeight(widgetData.position);
                 this._editor.revealPositionInCenterIfOutsideViewport(widgetData.position);
                 const remainingHunks = this._session.hunkData.pending;
-                this._updateSummaryMessage(remainingHunks);
+                this._updateSummaryMessage(remainingHunks, this._session.hunkData.size);
                 const mode = this._configService.getValue("inlineChat.accessibleDiffView" );
                 if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
                     this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
@@ -565,31 +428,53 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         };
         return renderHunks()?.position;
     }
-    _updateSummaryMessage(hunkCount) {
+    _updateSummaryMessage(remaining, total) {
+        const needsReview = this._configService.getValue("inlineChat.acceptedOrDiscardBeforeSave" );
         let message;
-        if (hunkCount === 0) {
+        if (total === 0) {
             message = ( localizeWithPath(
                 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
                 'change.0',
-                "Nothing changed"
+                "Nothing changed."
             ));
         }
-        else if (hunkCount === 1) {
-            message = ( localizeWithPath(
+        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"
             ));
         }
         else {
-            message = ( localizeWithPath(
+            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',
-                'lines.NM',
+                'change.N',
                 "{0} changes",
-                hunkCount
+                total
+            ));
+        }
+        let title;
+        if (needsReview) {
+            title = ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies',
+                'review',
+                "Review (accept or discard) all changes before continuing."
             ));
         }
-        this._zone.widget.updateStatus(message);
+        this._zone.widget.updateStatus(message, { title });
     }
     hasFocus() {
         return this._zone.widget.hasFocus();
@@ -617,4 +502,4 @@ function changeDecorationsAndViewZones(editor, callback) {
         });
     });
 }
-export { EditModeStrategy, LivePreviewStrategy, LiveStrategy, PreviewStrategy };
+export { EditModeStrategy, LiveStrategy, PreviewStrategy };