@codingame/monaco-vscode-api 23.3.0 → 24.1.1

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js

@@ -32,7 +32,6 @@ import { AnimatedValue, easeOutCubic, ObservableAnimatedValue } from './animatio
 import { computeGhostText } from './computeGhostText.js';
 import { ghostTextsOrReplacementsEqual, GhostText, ghostTextOrReplacementEquals } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
-import { InlineEdit } from './inlineEdit.js';
 import { InlineCompletionEditorType } from './provideInlineCompletions.js';
 import { singleTextRemoveCommonPrefix, singleTextEditAugments } from './singleTextEditHelpers.js';
 import { EditSources } from '../../../../common/textModelEditSource.js';
@@ -42,6 +41,7 @@ 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.service.js';
 import { derived, derivedHandleChanges, derivedOpts } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
@@ -53,7 +53,10 @@ import { observableFromEvent } from '../../../../../base/common/observableIntern
 
 let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     get isAcceptingPartially() { return this._isAcceptingPartially; }
-    constructor(textModel, _selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _enabled, _editor, _instantiationService, _commandService, _languageConfigurationService, _accessibilityService, _languageFeaturesService, _codeEditorService, _inlineCompletionsService) {
+    get editor() {
+        return this._editor;
+    }
+    constructor(textModel, _selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _enabled, _editor, _instantiationService, _commandService, _languageConfigurationService, _accessibilityService, _languageFeaturesService, _codeEditorService, _inlineCompletionsService, defaultAccountService) {
         super();
         this.textModel = textModel;
         this._selectedSuggestItem = _selectedSuggestItem;
@@ -77,13 +80,14 @@ 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);
-            if (!state || !state.inlineCompletion) {
+            if (!state || !state.inlineSuggestion) {
                 return false;
             }
-            return isSuggestionInViewport(this._editor, state.inlineCompletion);
+            return isSuggestionInViewport(this._editor, state.inlineSuggestion);
         });
         this._onDidAccept = ( new Emitter());
         this.onDidAccept = this._onDidAccept.event;
@@ -204,6 +208,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 typingInterval: typingInterval.averageInterval,
                 typingIntervalCharacterCount: typingInterval.characterCount,
                 availableProviders: [],
+                sku: this.sku.read(undefined),
             };
             let context = {
                 triggerKind: changeSummary.inlineCompletionTriggerKind,
@@ -316,11 +321,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 }
                 if (a.kind === 'ghostText' && b.kind === 'ghostText') {
                     return ghostTextsOrReplacementsEqual(a.ghostTexts, b.ghostTexts)
-                        && a.inlineCompletion === b.inlineCompletion
+                        && a.inlineSuggestion === b.inlineSuggestion
                         && 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;
             }
@@ -335,18 +340,14 @@ 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') &&
                     item.inlineEdit?.command.arguments?.length ? ( URI.from(item.inlineEdit?.command.arguments[0])) : undefined;
-                return { kind: 'inlineEdit', inlineEdit, inlineCompletion: 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) {
@@ -369,17 +370,17 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const edits = ( validEditsAndGhostTexts.map(({ edit }) => edit));
                 const ghostTexts = ( validEditsAndGhostTexts.map(({ ghostText }) => ghostText));
                 const primaryGhostText = ghostTexts[0] ?? ( new GhostText(fullEdit.range.endLineNumber, []));
-                return { kind: 'ghostText', edits, primaryGhostText, ghostTexts, inlineCompletion: augmentation?.completion, suggestItem };
+                return { kind: 'ghostText', edits, primaryGhostText, ghostTexts, inlineSuggestion: augmentation?.completion, suggestItem };
             }
             else {
                 if (!this._isActive.read(reader)) {
                     return undefined;
                 }
-                const inlineCompletion = this.selectedInlineCompletion.read(reader);
-                if (!inlineCompletion) {
+                const inlineSuggestion = this.selectedInlineCompletion.read(reader);
+                if (!inlineSuggestion) {
                     return undefined;
                 }
-                const replacement = inlineCompletion.getSingleTextEdit();
+                const replacement = inlineSuggestion.getSingleTextEdit();
                 const mode = this._inlineSuggestMode.read(reader);
                 const positions = this._positions.read(reader);
                 const allPotentialEdits = [replacement, ...getSecondaryEdits(this.textModel, positions, replacement)];
@@ -393,7 +394,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 if (!ghostTexts[0]) {
                     return undefined;
                 }
-                return { kind: 'ghostText', edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineCompletion, suggestItem: undefined };
+                return { kind: 'ghostText', edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineSuggestion, suggestItem: undefined };
             }
         });
         this.status = derived(this, reader => {
@@ -431,7 +432,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             return !!s;
         });
         this.warning = derived(this, reader => {
-            return this.inlineCompletionState.read(reader)?.inlineCompletion?.warning;
+            return this.inlineCompletionState.read(reader)?.inlineSuggestion?.warning;
         });
         this.ghostTexts = derivedOpts({ owner: this, equalsFn: ghostTextsOrReplacementsEqual }, reader => {
             const v = this.inlineCompletionState.read(reader);
@@ -452,12 +453,12 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!state || state.kind !== 'inlineEdit') {
                 return false;
             }
-            if (state.inlineCompletion.hint) {
+            if (state.inlineSuggestion.hint || state.inlineSuggestion.action?.kind === 'jumpTo') {
                 return false;
             }
-            const isCurrentModelVersion = state.inlineCompletion.updatedEditModelVersion === this._textModelVersionId.read(reader);
+            const isCurrentModelVersion = state.inlineSuggestion.updatedEditModelVersion === this._textModelVersionId.read(reader);
             return (this._inlineEditsShowCollapsedEnabled.read(reader) || !isCurrentModelVersion)
-                && this._jumpedToId.read(reader) !== state.inlineCompletion.semanticId
+                && this._jumpedToId.read(reader) !== state.inlineSuggestion.semanticId
                 && !this._inAcceptFlow.read(reader);
         });
         this._tabShouldIndent = derived(this, reader => {
@@ -491,10 +492,13 @@ 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;
             }
-            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader) && !s.inlineCompletion.hint?.jumpToEdit) {
+            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader)) {
                 return false;
             }
             return !s.cursorAtInlineEdit.read(reader);
@@ -504,19 +508,22 @@ 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;
             }
             if (this._tabShouldIndent.read(reader)) {
                 return false;
             }
-            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader) && !s.inlineCompletion.hint?.jumpToEdit) {
+            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader)) {
                 return true;
             }
-            if (s.inlineCompletion.targetRange.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
+            if (s.inlineSuggestion.targetRange.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
                 return true;
             }
-            if (this._jumpedToId.read(reader) === s.inlineCompletion.semanticId) {
+            if (this._jumpedToId.read(reader) === s.inlineSuggestion.semanticId) {
                 return true;
             }
             return s.cursorAtInlineEdit.read(reader);
@@ -541,6 +548,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(account => this.sku.set(skuFromAccount(account), undefined));
+        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) {
@@ -558,8 +567,8 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     : InlineCompletionEditorType.TextEditor;
         }
         this._register(recomputeInitiallyAndOnChange(this.state, (s) => {
-            if (s && s.inlineCompletion) {
-                this._inlineCompletionsService.reportNewCompletion(s.inlineCompletion.requestUuid);
+            if (s && s.inlineSuggestion) {
+                this._inlineCompletionsService.reportNewCompletion(s.inlineSuggestion.requestUuid);
             }
         }));
         this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletionsPromise));
@@ -575,14 +584,20 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._jumpedToId.set(undefined, undefined);
             }
         }));
-        const inlineEditSemanticId = ( this.inlineEditState.map(s => s?.inlineCompletion.semanticId));
+        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);
             if (id) {
                 this._editor.pushUndoStop();
                 this._lastShownInlineCompletionInfo = {
                     alternateTextModelVersionId: this.textModel.getAlternativeVersionId(),
-                    inlineCompletion: this.state.get().inlineCompletion,
+                    inlineCompletion: this.state.get().inlineSuggestion,
                 };
             }
         }));
@@ -604,7 +619,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     return;
                 }
                 const activeState = this.state.get();
-                if (activeState && (activeState.inlineCompletion || activeState.edits) && activeState.inlineCompletion?.source.provider !== provider) {
+                if (activeState && (activeState.inlineSuggestion || activeState.edits) && activeState.inlineSuggestion?.source.provider !== provider) {
                     return;
                 }
                 transaction(tx => {
@@ -696,7 +711,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     stop(stopReason = 'automatic', tx) {
         subtransaction(tx, tx => {
             if (stopReason === 'explicitCancel') {
-                const inlineCompletion = this.state.get()?.inlineCompletion;
+                const inlineCompletion = this.state.get()?.inlineSuggestion;
                 if (inlineCompletion) {
                     inlineCompletion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Rejected });
                 }
@@ -739,18 +754,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());
         }
@@ -758,13 +775,13 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         let isNextEditUri = false;
         const state = this.state.get();
         if (state?.kind === 'ghostText') {
-            if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
+            if (!state || state.primaryGhostText.isEmpty() || !state.inlineSuggestion) {
                 return;
             }
-            completion = state.inlineCompletion;
+            completion = state.inlineSuggestion;
         }
         else if (state?.kind === 'inlineEdit') {
-            completion = state.inlineCompletion;
+            completion = state.inlineSuggestion;
             isNextEditUri = !!state.nextEditUri;
         }
         else {
@@ -772,35 +789,46 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         completion.addRef();
         try {
+            let followUpTrigger = false;
             editor.pushUndoStop();
             if (isNextEditUri) {
             }
-            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;
-                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) {
-                    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;
+                    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) {
+                        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();
@@ -810,6 +838,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     .executeCommand(completion.command.id, ...(completion.command.arguments || []))
                     .then(undefined, onUnexpectedExternalError);
             }
+            if (followUpTrigger) {
+                this.trigger(undefined);
+            }
             completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted });
         }
         finally {
@@ -860,11 +891,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             throw ( new BugIndicatingError());
         }
         const state = this.inlineCompletionState.get();
-        if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
+        if (!state || state.primaryGhostText.isEmpty() || !state.inlineSuggestion) {
             return;
         }
         const ghostText = state.primaryGhostText;
-        const completion = state.inlineCompletion;
+        const completion = state.inlineSuggestion;
         if (completion.snippetInfo) {
             await this.accept(editor);
             return;
@@ -892,7 +923,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
                 editor.edit(TextEdit.fromParallelReplacementsUnsorted(edits), this._getMetadata(completion, type));
                 editor.setSelections(selections, 'inlineCompletionPartialAccept');
-                editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), ScrollType.Immediate);
+                editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), ScrollType.Smooth);
             }
             finally {
                 this._isAcceptingPartially = false;
@@ -925,7 +956,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     extractReproSample() {
         const value = this.textModel.getValue();
-        const item = this.state.get()?.inlineCompletion;
+        const item = this.state.get()?.inlineSuggestion;
         return {
             documentValue: value,
             inlineCompletion: item?.getSourceCompletion(),
@@ -936,26 +967,37 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         if (!s) {
             return;
         }
-        transaction(tx => {
-            this._jumpedToId.set(s.inlineCompletion.semanticId, tx);
-            this.dontRefetchSignal.trigger(tx);
-            const targetRange = s.inlineCompletion.targetRange;
-            const targetPosition = targetRange.getStartPosition();
-            this._editor.setPosition(targetPosition, 'inlineCompletions.jump');
-            const isSingleLineChange = targetRange.isSingleLine() && (s.inlineCompletion.hint || !s.inlineCompletion.insertText.includes('\n'));
-            if (isSingleLineChange) {
-                this._editor.revealPosition(targetPosition);
-            }
-            else {
-                const revealRange = ( new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1));
-                this._editor.revealRange(revealRange, ScrollType.Immediate);
-            }
-            s.inlineCompletion.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 });
+                }
+                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');
+                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, ScrollType.Smooth);
+                }
+                else {
+                    const revealRange = ( new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1));
+                    this._editor.revealRange(revealRange, 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([
@@ -965,7 +1007,8 @@ InlineCompletionsModel = ( __decorate([
     ( __param(10, IAccessibilityService)),
     ( __param(11, ILanguageFeaturesService)),
     ( __param(12, ICodeEditorService)),
-    ( __param(13, IInlineCompletionsService))
+    ( __param(13, IInlineCompletionsService)),
+    ( __param(14, IDefaultAccountService))
 ], InlineCompletionsModel));
 var VersionIdChangeReason;
 (function (VersionIdChangeReason) {
@@ -1027,8 +1070,9 @@ class FadeoutDecoration extends Disposable {
         }));
     }
 }
-function isSuggestionInViewport(editor, suggestion) {
+function isSuggestionInViewport(editor, suggestion, reader = undefined) {
     const targetRange = suggestion.targetRange;
+    observableCodeEditor(editor).scrollTop.read(reader);
     const visibleRanges = editor.getVisibleRanges();
     if (visibleRanges.length < 1) {
         return false;
@@ -1041,5 +1085,11 @@ function isSuggestionInViewport(editor, suggestion) {
     ));
     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;
+}
 
-export { InlineCompletionsModel, VersionIdChangeReason, getSecondaryEdits };
+export { InlineCompletionsModel, VersionIdChangeReason, getSecondaryEdits, isSuggestionInViewport };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.d.ts

@@ -31,6 +31,7 @@ export declare class InlineCompletionsSource extends Disposable {
     private readonly _state;
     readonly inlineCompletions: IObservable<InlineCompletionsState>;
     readonly suggestWidgetInlineCompletions: IObservable<InlineCompletionsState>;
+    private readonly _renameProcessor;
     private _completionsEnabled;
     constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _cursorPosition: IObservable<Position>, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService);
     private _updateCompletionsEnablement;