monaco-editor-core 0.56.0-dev-20251124 → 0.56.0-dev-20251217

package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { mapFindFirst } from '../../../../../base/common/arraysFind.js';
-import { itemsEquals } from '../../../../../base/common/equals.js';
+import { arrayEqualsC } from '../../../../../base/common/equals.js';
 import { BugIndicatingError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
@@ -40,7 +40,6 @@ import { AnimatedValue, easeOutCubic, ObservableAnimatedValue } from './animatio
 import { computeGhostText } from './computeGhostText.js';
 import { GhostText, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
-import { InlineEdit } from './inlineEdit.js';
 import { InlineCompletionEditorType } from './provideInlineCompletions.js';
 import { singleTextEditAugments, singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 import { EditSources } from '../../../../common/textModelEditSource.js';
@@ -50,12 +49,13 @@ import { TypingInterval } from './typingSpeed.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
 let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     get isAcceptingPartially() { return this._isAcceptingPartially; }
     get editor() {
         return this._editor;
     }
-    constructor(textModel, _selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _enabled, _editor, _instantiationService, _commandService, _languageConfigurationService, _accessibilityService, _languageFeaturesService, _codeEditorService, _inlineCompletionsService) {
+    constructor(textModel, _selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _enabled, _editor, _instantiationService, _commandService, _languageConfigurationService, _accessibilityService, _languageFeaturesService, _codeEditorService, _inlineCompletionsService, defaultAccountService) {
         super();
         this.textModel = textModel;
         this._selectedSuggestItem = _selectedSuggestItem;
@@ -80,6 +80,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._selectedInlineCompletionId = observableValue(this, undefined);
         this.primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? new Position(1, 1));
         this.allPositions = derived(this, reader => this._positions.read(reader));
+        this.sku = observableValue(this, undefined);
         this._isAcceptingPartially = false;
         this._appearedInsideViewport = derived(this, reader => {
             const state = this.state.read(reader);
@@ -208,6 +209,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 typingInterval: typingInterval.averageInterval,
                 typingIntervalCharacterCount: typingInterval.characterCount,
                 availableProviders: [],
+                sku: this.sku.read(undefined),
             };
             let context = {
                 triggerKind: changeSummary.inlineCompletionTriggerKind,
@@ -266,7 +268,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 inlineEdit,
             };
         });
-        this._filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: itemsEquals() }, reader => {
+        this._filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: arrayEqualsC() }, reader => {
             const c = this._inlineCompletionItems.read(reader);
             return c?.inlineCompletions ?? [];
         });
@@ -287,7 +289,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const idx = this.selectedInlineCompletionIndex.read(reader);
             return filteredCompletions[idx];
         });
-        this.activeCommands = derivedOpts({ owner: this, equalsFn: itemsEquals() }, r => this.selectedInlineCompletion.read(r)?.source.inlineSuggestions.commands ?? []);
+        this.activeCommands = derivedOpts({ owner: this, equalsFn: arrayEqualsC() }, r => this.selectedInlineCompletion.read(r)?.source.inlineSuggestions.commands ?? []);
         this.inlineCompletionsCount = derived(this, reader => {
             if (this.lastTriggerKind.read(reader) === InlineCompletionTriggerKind.Explicit) {
                 return this._filteredInlineCompletionItems.read(reader).length;
@@ -326,7 +328,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                         && a.suggestItem === b.suggestItem;
                 }
                 else if (a.kind === 'inlineEdit' && b.kind === 'inlineEdit') {
-                    return a.inlineEdit.equals(b.inlineEdit);
+                    return a.inlineSuggestion === b.inlineSuggestion;
                 }
                 return false;
             }
@@ -341,17 +343,13 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 if (this._hasVisiblePeekWidgets.read(reader)) {
                     return undefined;
                 }
-                let edit = inlineEditResult.getSingleTextEdit();
-                edit = singleTextRemoveCommonPrefix(edit, model);
                 const cursorAtInlineEdit = this.primaryPosition.map(cursorPos => LineRange.fromRangeInclusive(inlineEditResult.targetRange).addMargin(1, 1).contains(cursorPos.lineNumber));
-                const commands = inlineEditResult.source.inlineSuggestions.commands;
-                const inlineEdit = new InlineEdit(edit, commands ?? [], inlineEditResult);
-                const edits = inlineEditResult.updatedEdit;
-                const e = edits ? TextEdit.fromStringEdit(edits, new TextModelText(this.textModel)).replacements : [edit];
+                const stringEdit = inlineEditResult.action?.kind === 'edit' ? inlineEditResult.action.stringEdit : undefined;
+                const replacements = stringEdit ? TextEdit.fromStringEdit(stringEdit, new TextModelText(this.textModel)).replacements : [];
                 const nextEditUri = (item.inlineEdit?.command?.id === 'vscode.open' || item.inlineEdit?.command?.id === '_workbench.open') &&
                     // eslint-disable-next-line local/code-no-any-casts
                     item.inlineEdit?.command.arguments?.length ? URI.from(item.inlineEdit?.command.arguments[0]) : undefined;
-                return { kind: 'inlineEdit', inlineEdit, inlineSuggestion: inlineEditResult, edits: e, cursorAtInlineEdit, nextEditUri };
+                return { kind: 'inlineEdit', inlineSuggestion: inlineEditResult, edits: replacements, cursorAtInlineEdit, nextEditUri };
             }
             const suggestItem = this._selectedSuggestItem.read(reader);
             if (!this._shouldShowOnSuggestConflict.read(reader) && suggestItem) {
@@ -440,7 +438,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!state || state.kind !== 'inlineEdit') {
                 return false;
             }
-            if (state.inlineSuggestion.hint) {
+            if (state.inlineSuggestion.hint || state.inlineSuggestion.action?.kind === 'jumpTo') {
                 return false;
             }
             const isCurrentModelVersion = state.inlineSuggestion.updatedEditModelVersion === this._textModelVersionId.read(reader);
@@ -479,6 +477,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!s) {
                 return false;
             }
+            if (s.inlineSuggestion.action?.kind === 'jumpTo') {
+                return true;
+            }
             if (this.showCollapsed.read(reader)) {
                 return true;
             }
@@ -492,6 +493,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!s) {
                 return false;
             }
+            if (s.inlineSuggestion.action?.kind === 'jumpTo') {
+                return false;
+            }
             if (this.showCollapsed.read(reader)) {
                 return false;
             }
@@ -529,6 +533,8 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._suppressInSnippetMode = inlineSuggest.map(s => s.suppressInSnippetMode);
         const snippetController = SnippetController2.get(this._editor);
         this._isInSnippetMode = snippetController?.isInSnippetObservable ?? constObservable(false);
+        defaultAccountService.getDefaultAccount().then(createDisposableCb(account => this.sku.set(skuFromAccount(account), undefined), this._store));
+        this._register(defaultAccountService.onDidChangeDefaultAccount(account => this.sku.set(skuFromAccount(account), undefined)));
         this._typing = this._register(new TypingInterval(this.textModel));
         this._register(this._inlineCompletionsService.onDidChangeIsSnoozing((isSnoozing) => {
             if (isSnoozing) {
@@ -561,6 +567,12 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._jumpedToId.set(undefined, undefined);
             }
         }));
+        this._register(autorun(reader => {
+            const inlineSuggestion = this.state.map(s => s?.inlineSuggestion).read(reader);
+            if (inlineSuggestion) {
+                inlineSuggestion.addPerformanceMarker('activeSuggestion');
+            }
+        }));
         const inlineEditSemanticId = this.inlineEditState.map(s => s?.inlineSuggestion.semanticId);
         this._register(autorun(reader => {
             const id = inlineEditSemanticId.read(reader);
@@ -728,18 +740,20 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 providerId: completion.source.provider.providerId,
                 languageId,
                 type,
+                correlationId: completion.getSourceCompletion().correlationId,
             });
         }
         else {
             return EditSources.inlineCompletionAccept({
                 nes: completion.isInlineEdit,
                 requestUuid: completion.requestUuid,
+                correlationId: completion.getSourceCompletion().correlationId,
                 providerId: completion.source.provider.providerId,
                 languageId
             });
         }
     }
-    async accept(editor = this._editor) {
+    async accept(editor = this._editor, alternativeAction = false) {
         if (editor.getModel() !== this.textModel) {
             throw new BugIndicatingError();
         }
@@ -762,40 +776,51 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         // Make sure the completion list will not be disposed before the text change is sent.
         completion.addRef();
         try {
+            let followUpTrigger = false;
             editor.pushUndoStop();
             if (isNextEditUri) {
                 // Do nothing
             }
-            else if (completion.snippetInfo) {
-                const mainEdit = TextReplacement.delete(completion.editRange);
-                const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
-                const edit = TextEdit.fromParallelReplacementsUnsorted([mainEdit, ...additionalEdits]);
-                editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
-                editor.setPosition(completion.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
-                SnippetController2.get(editor)?.insert(completion.snippetInfo.snippet, { undoStopBefore: false });
-            }
-            else {
-                const edits = state.edits;
-                // The cursor should move to the end of the edit, not the end of the range provided by the extension
-                // Inline Edit diffs (human readable) the suggestion from the extension so it already removes common suffix/prefix
-                // Inline Completions does diff the suggestion so it may contain common suffix
-                let minimalEdits = edits;
-                if (state.kind === 'ghostText') {
-                    minimalEdits = removeTextReplacementCommonSuffixPrefix(edits, this.textModel);
+            else if (completion.action?.kind === 'edit') {
+                const action = completion.action;
+                if (alternativeAction && action.alternativeAction) {
+                    followUpTrigger = true;
+                    const altCommand = action.alternativeAction.command;
+                    await this._commandService
+                        .executeCommand(altCommand.id, ...(altCommand.arguments || []))
+                        .then(undefined, onUnexpectedExternalError);
                 }
-                const selections = getEndPositionsAfterApplying(minimalEdits).map(p => Selection.fromPositions(p));
-                const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
-                const edit = TextEdit.fromParallelReplacementsUnsorted([...edits, ...additionalEdits]);
-                editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
-                if (completion.hint === undefined) {
-                    // do not move the cursor when the completion is displayed in a different location
-                    editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
+                else if (action.snippetInfo) {
+                    const mainEdit = TextReplacement.delete(action.textReplacement.range);
+                    const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
+                    const edit = TextEdit.fromParallelReplacementsUnsorted([mainEdit, ...additionalEdits]);
+                    editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
+                    editor.setPosition(action.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
+                    SnippetController2.get(editor)?.insert(action.snippetInfo.snippet, { undoStopBefore: false });
                 }
-                if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
-                    const editRanges = edit.getNewRanges();
-                    const dec = this._store.add(new FadeoutDecoration(editor, editRanges, () => {
-                        this._store.delete(dec);
-                    }));
+                else {
+                    const edits = state.edits;
+                    // The cursor should move to the end of the edit, not the end of the range provided by the extension
+                    // Inline Edit diffs (human readable) the suggestion from the extension so it already removes common suffix/prefix
+                    // Inline Completions does diff the suggestion so it may contain common suffix
+                    let minimalEdits = edits;
+                    if (state.kind === 'ghostText') {
+                        minimalEdits = removeTextReplacementCommonSuffixPrefix(edits, this.textModel);
+                    }
+                    const selections = getEndPositionsAfterApplying(minimalEdits).map(p => Selection.fromPositions(p));
+                    const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
+                    const edit = TextEdit.fromParallelReplacementsUnsorted([...edits, ...additionalEdits]);
+                    editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
+                    if (completion.hint === undefined) {
+                        // do not move the cursor when the completion is displayed in a different location
+                        editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
+                    }
+                    if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
+                        const editRanges = edit.getNewRanges();
+                        const dec = this._store.add(new FadeoutDecoration(editor, editRanges, () => {
+                            this._store.delete(dec);
+                        }));
+                    }
                 }
             }
             this._onDidAccept.fire();
@@ -806,7 +831,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     .executeCommand(completion.command.id, ...(completion.command.arguments || []))
                     .then(undefined, onUnexpectedExternalError);
             }
-            completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted });
+            // TODO: how can we make alternative actions to retrigger?
+            if (followUpTrigger) {
+                this.trigger(undefined);
+            }
+            completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted, alternativeAction });
         }
         finally {
             completion.removeRef();
@@ -936,27 +965,38 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         if (!s) {
             return;
         }
-        transaction(tx => {
-            this._jumpedToId.set(s.inlineSuggestion.semanticId, tx);
-            this.dontRefetchSignal.trigger(tx);
-            const targetRange = s.inlineSuggestion.targetRange;
-            const targetPosition = targetRange.getStartPosition();
-            this._editor.setPosition(targetPosition, 'inlineCompletions.jump');
-            // TODO: consider using view information to reveal it
-            const isSingleLineChange = targetRange.isSingleLine() && (s.inlineSuggestion.hint || !s.inlineSuggestion.insertText.includes('\n'));
-            if (isSingleLineChange) {
-                this._editor.revealPosition(targetPosition, 0 /* ScrollType.Smooth */);
-            }
-            else {
-                const revealRange = new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1);
-                this._editor.revealRange(revealRange, 0 /* ScrollType.Smooth */);
-            }
-            s.inlineSuggestion.identity.setJumpTo(tx);
-            this._editor.focus();
-        });
+        const suggestion = s.inlineSuggestion;
+        suggestion.addRef();
+        try {
+            transaction(tx => {
+                if (suggestion.action?.kind === 'jumpTo') {
+                    this.stop(undefined, tx);
+                    suggestion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted, alternativeAction: false });
+                }
+                this._jumpedToId.set(s.inlineSuggestion.semanticId, tx);
+                this.dontRefetchSignal.trigger(tx);
+                const targetRange = s.inlineSuggestion.targetRange;
+                const targetPosition = targetRange.getStartPosition();
+                this._editor.setPosition(targetPosition, 'inlineCompletions.jump');
+                // TODO: consider using view information to reveal it
+                const isSingleLineChange = targetRange.isSingleLine() && (s.inlineSuggestion.hint || (s.inlineSuggestion.action?.kind === 'edit' && !s.inlineSuggestion.action.textReplacement.text.includes('\n')));
+                if (isSingleLineChange || s.inlineSuggestion.action?.kind === 'jumpTo') {
+                    this._editor.revealPosition(targetPosition, 0 /* ScrollType.Smooth */);
+                }
+                else {
+                    const revealRange = new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1);
+                    this._editor.revealRange(revealRange, 0 /* ScrollType.Smooth */);
+                }
+                s.inlineSuggestion.identity.setJumpTo(tx);
+                this._editor.focus();
+            });
+        }
+        finally {
+            suggestion.removeRef();
+        }
     }
-    async handleInlineSuggestionShown(inlineCompletion, viewKind, viewData) {
-        await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData);
+    async handleInlineSuggestionShown(inlineCompletion, viewKind, viewData, timeWhenShown) {
+        await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData, this.textModel, timeWhenShown);
     }
 };
 InlineCompletionsModel = __decorate([
@@ -966,7 +1006,8 @@ InlineCompletionsModel = __decorate([
     __param(10, IAccessibilityService),
     __param(11, ILanguageFeaturesService),
     __param(12, ICodeEditorService),
-    __param(13, IInlineCompletionsService)
+    __param(13, IInlineCompletionsService),
+    __param(14, IDefaultAccountService)
 ], InlineCompletionsModel);
 export { InlineCompletionsModel };
 export var VersionIdChangeReason;
@@ -1041,4 +1082,26 @@ export function isSuggestionInViewport(editor, suggestion, reader = undefined) {
     const viewportRange = new Range(visibleRanges[0].startLineNumber, visibleRanges[0].startColumn, visibleRanges[visibleRanges.length - 1].endLineNumber, visibleRanges[visibleRanges.length - 1].endColumn);
     return viewportRange.containsRange(targetRange);
 }
+function skuFromAccount(account) {
+    if (account?.access_type_sku && account?.copilot_plan) {
+        return { type: account.access_type_sku, plan: account.copilot_plan };
+    }
+    return undefined;
+}
+class DisposableCallback {
+    constructor(cb) {
+        this.handler = (val) => {
+            return this._cb?.(val);
+        };
+        this._cb = cb;
+    }
+    dispose() {
+        this._cb = undefined;
+    }
+}
+function createDisposableCb(cb, store) {
+    const dcb = new DisposableCallback(cb);
+    store.add(dcb);
+    return dcb.handler;
+}
 //# sourceMappingURL=inlineCompletionsModel.js.map