@codingame/monaco-vscode-api 2.2.1 → 3.0.0

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

@@ -21,7 +21,6 @@ import { TextEdit } from '../../../../editor/common/languages.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -34,9 +33,9 @@ import { IChatAgentService } from '../../chat/common/chatAgents.js';
 import { chatSubcommandLeader, chatAgentLeader } from '../../chat/common/chatParserTypes.js';
 import { IChatService } from '../../chat/common/chatService.js';
 import { IInlineChatSavingService } from './inlineChatSavingService.js';
-import { ReplyResponse, SessionPrompt, SessionExchange, EmptyResponse, ErrorResponse, ExpansionState } from './inlineChatSession.js';
+import { ReplyResponse, SessionPrompt, SessionExchange, EmptyResponse, ErrorResponse, ExpansionState, Session } from './inlineChatSession.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.js';
-import { LivePreviewStrategy, PreviewStrategy, LiveStrategy } from './inlineChatStrategies.js';
+import { LiveStrategy, LivePreviewStrategy, PreviewStrategy } from './inlineChatStrategies.js';
 import { InlineChatZoneWidget } from './inlineChatWidget.js';
 import { INLINE_CHAT_ID, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING } from '../common/inlineChat.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
@@ -44,12 +43,14 @@ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var InlineChatController_1;
 class InlineChatRunOptions {
     static isInteractiveEditorOptions(options) {
-        const { initialSelection, initialRange, message, autoSend, position } = options;
+        const { initialSelection, initialRange, message, autoSend, position, existingExchange, existingSession } = options;
         if (typeof message !== 'undefined' && typeof message !== 'string'
             || typeof autoSend !== 'undefined' && typeof autoSend !== 'boolean'
             || typeof initialRange !== 'undefined' && !Range.isIRange(initialRange)
             || typeof initialSelection !== 'undefined' && !Selection.isISelection(initialSelection)
-            || typeof position !== 'undefined' && !Position.isIPosition(position)) {
+            || typeof position !== 'undefined' && !Position.isIPosition(position)
+            || typeof existingSession !== 'undefined' && !(existingSession instanceof Session)
+            || typeof existingExchange !== 'undefined' && typeof existingExchange !== 'object') {
             return false;
         }
         return true;
@@ -62,7 +63,7 @@ let InlineChatController = class InlineChatController {
     }
     static { this._storageKey = 'inline-chat-history'; }
     static { this._promptHistory = []; }
-    constructor(_editor, _instaService, _inlineChatSessionService, _inlineChatSavingService, _editorWorkerService, _logService, _configurationService, _dialogService, contextKeyService, _accessibilityService, _chatAccessibilityService, _chatAgentService, _bulkEditService, _storageService, _commandService) {
+    constructor(_editor, _instaService, _inlineChatSessionService, _inlineChatSavingService, _editorWorkerService, _logService, _configurationService, _dialogService, contextKeyService, _chatAccessibilityService, _chatAgentService, _bulkEditService, _storageService, _commandService) {
         this._editor = _editor;
         this._instaService = _instaService;
         this._inlineChatSessionService = _inlineChatSessionService;
@@ -71,7 +72,6 @@ let InlineChatController = class InlineChatController {
         this._logService = _logService;
         this._configurationService = _configurationService;
         this._dialogService = _dialogService;
-        this._accessibilityService = _accessibilityService;
         this._chatAccessibilityService = _chatAccessibilityService;
         this._chatAgentService = _chatAgentService;
         this._bulkEditService = _bulkEditService;
@@ -109,6 +109,15 @@ let InlineChatController = class InlineChatController {
             this._log('session RESUMING after model change', e);
             await this.run({ existingSession });
         }));
+        this._store.add(this._inlineChatSessionService.onDidEndSession(e => {
+            if (e.session === this._session && e.endedByExternalCause) {
+                this._log('session ENDED by external cause');
+                this._session = undefined;
+                this._strategy?.cancel();
+                this._resetWidget();
+                this.cancelSession();
+            }
+        }));
         this._store.add(this._inlineChatSessionService.onDidMoveSession(async (e) => {
             if (e.editor === this._editor) {
                 this._log('session RESUMING after move', e);
@@ -151,12 +160,7 @@ let InlineChatController = class InlineChatController {
         return INLINE_CHAT_ID;
     }
     _getMode() {
-        const editMode = this._configurationService.inspect("inlineChat.mode" );
-        let editModeValue = editMode.value;
-        if (this._accessibilityService.isScreenReaderOptimized() && editModeValue === editMode.defaultValue) {
-            editModeValue = "preview" ;
-        }
-        return editModeValue;
+        return this._configurationService.getValue("inlineChat.mode" );
     }
     getWidgetPosition() {
         return this._zone.value.position;
@@ -248,16 +252,16 @@ let InlineChatController = class InlineChatController {
             return "CANCEL" ;
         }
         switch (session.editMode) {
-            case "live" :
-                this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._zone.value);
-                break;
             case "preview" :
                 this._strategy = this._instaService.createInstance(PreviewStrategy, session, this._editor, this._zone.value);
                 break;
             case "livePreview" :
-            default:
                 this._strategy = this._instaService.createInstance(LivePreviewStrategy, session, this._editor, this._zone.value);
                 break;
+            case "live" :
+            default:
+                this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._zone.value);
+                break;
         }
         this._session = session;
         return "INIT_UI" ;
@@ -336,6 +340,10 @@ let InlineChatController = class InlineChatController {
         assertType(this._session);
         assertType(this._strategy);
         this._updatePlaceholder();
+        if (options.existingExchange) {
+            options.message = options.existingExchange.prompt;
+            options.autoSend = true;
+        }
         if (options.message) {
             this.updateInput(options.message);
             alert(options.message);
@@ -400,7 +408,7 @@ let InlineChatController = class InlineChatController {
                 const cts = ( new CancellationTokenSource());
                 this._sessionStore.add(cts);
                 for (const agent of this._chatAgentService.getAgents()) {
-                    const commands = await agent.provideSlashCommands(cts.token);
+                    const commands = await agent.provideSlashCommands(undefined, [], cts.token);
                     if (commands.find((command) => withoutSubCommandLeader.startsWith(command.name))) {
                         massagedInput = `${chatAgentLeader}${agent.id} ${input}`;
                         break;
@@ -437,6 +445,7 @@ let InlineChatController = class InlineChatController {
             selection: this._editor.getSelection(),
             wholeRange: this._session.wholeRange.trackedInitialRange,
             live: this._session.editMode !== "preview" ,
+            previewDocument: this._session.textModelN.uri,
             withIntentDetection: options.withIntentDetection ?? true ,
         };
         delete options.withIntentDetection;
@@ -500,8 +509,16 @@ let InlineChatController = class InlineChatController {
         let a11yResponse;
         const a11yVerboseInlineChat = this._configurationService.getValue('accessibility.verbosity.inlineChat') === true;
         const requestId = this._chatAccessibilityService.acceptRequest();
-        const task = this._session.provider.provideResponse(this._session.session, request, progress, requestCts.token);
-        this._log('request started', this._session.provider.debugName, this._session.session, request);
+        let task;
+        if (options.existingExchange) {
+            task = options.existingExchange.response;
+            delete options.existingExchange;
+            this._log('using READY-response', this._session.provider.debugName, this._session.session);
+        }
+        else {
+            task = this._session.provider.provideResponse(this._session.session, request, progress, requestCts.token);
+            this._log('request started', this._session.provider.debugName, this._session.session, request);
+        }
         let response;
         let reply;
         try {
@@ -761,6 +778,7 @@ let InlineChatController = class InlineChatController {
             this._zone.value.show(widgetPosition);
         }
         else {
+            this._zone.value.setWidgetMargins(widgetPosition);
             this._zone.value.updatePositionAndHeight(widgetPosition);
         }
     }
@@ -770,7 +788,7 @@ let InlineChatController = class InlineChatController {
         this._ctxUserDidEdit.reset();
         this._ctxLastFeedbackKind.reset();
         this._ctxSupportIssueReporting.reset();
-        this._zone.value.hide();
+        this._zone.rawValue?.hide();
         if (this._editor.hasWidgetFocus()) {
             this._editor.focus();
         }
@@ -854,6 +872,10 @@ let InlineChatController = class InlineChatController {
     hasFocus() {
         return this._zone.value.widget.hasFocus();
     }
+    moveHunk(next) {
+        this.focus();
+        this._strategy?.move?.(next);
+    }
     populateHistory(up) {
         const len = InlineChatController_1._promptHistory.length;
         if (len === 0) {
@@ -968,12 +990,11 @@ InlineChatController = InlineChatController_1 = ( __decorate([
     ( __param(6, IConfigurationService)),
     ( __param(7, IDialogService)),
     ( __param(8, IContextKeyService)),
-    ( __param(9, IAccessibilityService)),
-    ( __param(10, IChatAccessibilityService)),
-    ( __param(11, IChatAgentService)),
-    ( __param(12, IBulkEditService)),
-    ( __param(13, IStorageService)),
-    ( __param(14, ICommandService))
+    ( __param(9, IChatAccessibilityService)),
+    ( __param(10, IChatAgentService)),
+    ( __param(11, IBulkEditService)),
+    ( __param(12, IStorageService)),
+    ( __param(13, ICommandService))
 ], InlineChatController));
 async function showMessageResponse(accessor, query, response) {
     const chatService = accessor.get(IChatService);

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

@@ -84,7 +84,7 @@ let InlineChatLivePreviewWidget = class InlineChatLivePreviewWidget extends Zone
                     return;
                 }
                 render.value = runAtThisOrScheduleAtNextAnimationFrame(getWindow(this._diffEditor.getContainerDomNode()), () => {
-                    const lineHeight = this.editor.getOption(66 );
+                    const lineHeight = this.editor.getOption(67 );
                     const heightInLines = e.contentHeight / lineHeight;
                     this._logService.debug(`[IE] relaying with ${heightInLines} lines height`);
                     this._relayout(heightInLines);
@@ -344,7 +344,7 @@ let InlineChatFileCreatePreviewWidget = class InlineChatFileCreatePreviewWidget
         store.add(ref);
         const model = ref.object.textEditorModel;
         this._previewEditor.setModel(model);
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         this._elements.title.style.height = `${InlineChatFileCreatePreviewWidget_1.TitleHeight}px`;
         const titleHightInLines = InlineChatFileCreatePreviewWidget_1.TitleHeight / lineHeight;
         const maxLines = Math.max(4, Math.floor((this.editor.getLayoutInfo().height / lineHeight) * .33));

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

@@ -114,12 +114,16 @@ class Session {
         this._teldata = {
             extension: provider.debugName,
             startTime: this._startTime.toISOString(),
-            edits: false,
+            endTime: this._startTime.toISOString(),
+            edits: 0,
             finishedByEdit: false,
             rounds: '',
             undos: '',
             editMode,
-            unstashed: 0
+            unstashed: 0,
+            acceptedHunks: 0,
+            discardedHunks: 0,
+            responseTypes: ''
         };
     }
     addInput(input) {
@@ -151,6 +155,7 @@ class Session {
         this._isUnstashed = false;
         const newLen = this._exchange.push(exchange);
         this._teldata.rounds += `${newLen}|`;
+        this._teldata.responseTypes += `${exchange.response instanceof ReplyResponse ? exchange.response.responseType : "empty" }|`;
     }
     get exchanges() {
         return this._exchange;
@@ -174,14 +179,22 @@ class Session {
         return this.textModelN.getValueInRange(( new Range(startLine, 1, endLine, Number.MAX_VALUE)));
     }
     recordExternalEditOccurred(didFinish) {
-        this._teldata.edits = true;
+        this._teldata.edits += 1;
         this._teldata.finishedByEdit = didFinish;
     }
     asTelemetryData() {
-        return {
-            ...this._teldata,
-            endTime: ( new Date()).toISOString(),
-        };
+        for (const item of this.hunkData.getInfo()) {
+            switch (item.getState()) {
+                case 1 :
+                    this._teldata.acceptedHunks += 1;
+                    break;
+                case 2 :
+                    this._teldata.discardedHunks += 1;
+                    break;
+            }
+        }
+        this._teldata.endTime = ( new Date()).toISOString();
+        return this._teldata;
     }
     asRecording() {
         const result = {
@@ -524,7 +537,9 @@ let HunkData = class HunkData {
     discardAll() {
         const edits = [];
         for (const item of this.getInfo()) {
-            edits.push(this._discardEdits(item));
+            if (item.getState() !== 2 ) {
+                edits.push(this._discardEdits(item));
+            }
         }
         const undoEdits = [];
         this._textModelN.pushEditOperations(null, edits.flat(), (_undoEdits) => {

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

@@ -25,6 +25,8 @@ import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_
 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.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 class EditModeStrategy {
     static { this._decoBlock = ModelDecorationOptions.register({
         description: 'inline-chat',
@@ -122,7 +124,9 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
         return this._makeChanges(edits, obs, undefined, undefined);
     }
     async makeProgressiveChanges(edits, obs, opts) {
-        return this._makeChanges(edits, obs, opts, undefined);
+        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;
@@ -130,7 +134,7 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
     }
     async renderChanges(response) {
         if (response.allLocalEdits.length > 0) {
-            await this._zone.widget.showEditsPreview(this._session.textModel0, this._session.textModelN);
+            this._zone.widget.showEditsPreview(this._session.hunkData, this._session.textModel0, this._session.textModelN);
         }
         else {
             this._zone.widget.hideEditsPreview();
@@ -198,7 +202,7 @@ let LivePreviewStrategy = class LivePreviewStrategy extends EditModeStrategy {
             this._previewZone.value.showCreation(this._session.wholeRange.value.getStartPosition().delta(-1), response.untitledTextModel);
         }
         else {
-            this._previewZone.value.hide();
+            this._previewZone.rawValue?.hide();
         }
         return this._updateDiffZones();
     }
@@ -293,9 +297,11 @@ LivePreviewStrategy = ( __decorate([
     ( __param(3, IInstantiationService))
 ], LivePreviewStrategy));
 let LiveStrategy = class LiveStrategy extends EditModeStrategy {
-    constructor(session, editor, zone, contextKeyService, _editorWorkerService, _instaService) {
+    constructor(session, editor, zone, contextKeyService, _editorWorkerService, _accessibilityService, _configService, _instaService) {
         super(session, editor, zone);
         this._editorWorkerService = _editorWorkerService;
+        this._accessibilityService = _accessibilityService;
+        this._configService = _configService;
         this._instaService = _instaService;
         this._decoInsertedText = ModelDecorationOptions.register({
             description: 'inline-modified-line',
@@ -309,6 +315,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         this._decoInsertedTextRange = ModelDecorationOptions.register({
             description: 'inline-chat-inserted-range-linehighlight',
             className: 'inline-chat-inserted-range',
+            stickiness: 1 ,
         });
         this.acceptHunk = () => super.acceptHunk();
         this.discardHunk = () => super.discardHunk();
@@ -381,7 +388,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             this._previewZone.value.showCreation(this._session.wholeRange.value.getStartPosition().delta(-1), response.untitledTextModel);
         }
         else {
-            this._previewZone.value.hide();
+            this._previewZone.rawValue?.hide();
         }
         this._progressiveEditingDecorations.clear();
         const renderHunks = () => {
@@ -456,11 +463,38 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                                 data.viewZoneId = undefined;
                             });
                         };
+                        const move = (next) => {
+                            assertType(widgetData);
+                            const candidates = [];
+                            for (const item of this._session.hunkData.getInfo()) {
+                                if (item.getState() === 0 ) {
+                                    candidates.push(item.getRangesN()[0].getStartPosition().delta(-1));
+                                }
+                            }
+                            if (candidates.length < 2) {
+                                return;
+                            }
+                            for (let i = 0; i < candidates.length; i++) {
+                                if (candidates[i].equals(widgetData.position)) {
+                                    let newPos;
+                                    if (next) {
+                                        newPos = candidates[(i + 1) % candidates.length];
+                                    }
+                                    else {
+                                        newPos = candidates[(i + candidates.length - 1) % candidates.length];
+                                    }
+                                    this._zone.updatePositionAndHeight(newPos);
+                                    renderHunks();
+                                    break;
+                                }
+                            }
+                        };
                         const zoneLineNumber = this._zone.position.lineNumber;
                         const myDistance = zoneLineNumber <= hunkRanges[0].startLineNumber
                             ? hunkRanges[0].startLineNumber - zoneLineNumber
                             : zoneLineNumber - hunkRanges[0].endLineNumber;
                         data = {
+                            hunk: hunkData,
                             decorationIds,
                             viewZoneId: '',
                             viewZone: viewZoneData,
@@ -470,6 +504,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                             discardHunk,
                             toggleDiff: !hunkData.isInsertion() ? toggleDiff : undefined,
                             remove,
+                            move,
                         };
                         this._hunkDisplayData.set(hunkData, data);
                     }
@@ -501,10 +536,15 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                 this._editor.revealPositionInCenterIfOutsideViewport(widgetData.position);
                 const remainingHunks = this._session.hunkData.pending;
                 this._updateSummaryMessage(remainingHunks);
+                const mode = this._configService.getValue("inlineChat.accessibleDiffView" );
+                if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
+                    this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
+                }
                 this._ctxCurrentChangeHasDiff.set(Boolean(widgetData.toggleDiff));
                 this.toggleDiff = widgetData.toggleDiff;
                 this.acceptHunk = async () => widgetData.acceptHunk();
                 this.discardHunk = async () => widgetData.discardHunk();
+                this.move = next => widgetData.move(next);
             }
             else if (this._hunkDisplayData.size > 0) {
                 let oneAccepted = false;
@@ -561,7 +601,9 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
 LiveStrategy = ( __decorate([
     ( __param(3, IContextKeyService)),
     ( __param(4, IEditorWorkerService)),
-    ( __param(5, IInstantiationService))
+    ( __param(5, IAccessibilityService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, IInstantiationService))
 ], LiveStrategy));
 async function undoModelUntil(model, targetAltVersion) {
     while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {