@codingame/monaco-vscode-api 25.1.2 → 26.0.0

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

@@ -53,11 +53,29 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
-    get isAcceptingPartially() { return this._isAcceptingPartially; }
+    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, defaultAccountService) {
+    constructor(
+        textModel,
+        _selectedSuggestItem,
+        _textModelVersionId,
+        _positions,
+        _debounceValue,
+        _enabled,
+        _editor,
+        _instantiationService,
+        _commandService,
+        _languageConfigurationService,
+        _accessibilityService,
+        _languageFeaturesService,
+        _codeEditorService,
+        _inlineCompletionsService,
+        defaultAccountService
+    ) {
         super();
         this.textModel = textModel;
         this._selectedSuggestItem = _selectedSuggestItem;
@@ -97,7 +115,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._didUndoInlineEdits = derivedHandleChanges({
             owner: this,
             changeTracker: {
-                createChangeSummary: () => ({ didUndo: false }),
+                createChangeSummary: () => ({
+                    didUndo: false
+                }),
                 handleChange: (ctx, changeSummary) => {
                     changeSummary.didUndo = ctx.didChange(this._textModelVersionId) && !!ctx.change?.isUndoing;
                     return true;
@@ -105,11 +125,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
         }, (reader, changeSummary) => {
             const versionId = this._textModelVersionId.read(reader);
-            if (versionId !== null
-                && this._lastAcceptedInlineCompletionInfo
-                && this._lastAcceptedInlineCompletionInfo.textModelVersionIdAfter === versionId - 1
-                && this._lastAcceptedInlineCompletionInfo.inlineCompletion.isInlineEdit
-                && changeSummary.didUndo) {
+            if (versionId !== null && this._lastAcceptedInlineCompletionInfo && this._lastAcceptedInlineCompletionInfo.textModelVersionIdAfter === versionId - 1 && this._lastAcceptedInlineCompletionInfo.inlineCompletion.isInlineEdit && changeSummary.didUndo) {
                 this._lastAcceptedInlineCompletionInfo = undefined;
                 return true;
             }
@@ -118,7 +134,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._preserveCurrentCompletionReasons = ( new Set([
             VersionIdChangeReason.Redo,
             VersionIdChangeReason.Undo,
-            VersionIdChangeReason.AcceptWord,
+            VersionIdChangeReason.AcceptWord
         ]));
         this.dontRefetchSignal = observableSignal(this);
         this._fetchInlineCompletionsPromise = derivedHandleChanges({
@@ -131,8 +147,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     onlyRequestInlineEdits: false,
                     shouldDebounce: true,
                     provider: undefined,
+                    changeHint: undefined,
                     textChange: false,
-                    changeReason: '',
+                    changeReason: ""
                 }),
                 handleChange: (ctx, changeSummary) => {
                     if (ctx.didChange(this._textModelVersionId)) {
@@ -140,25 +157,22 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                             changeSummary.preserveCurrentCompletion = true;
                         }
                         const detailedReasons = ctx.change?.detailedReasons ?? [];
-                        changeSummary.changeReason = detailedReasons.length > 0 ? detailedReasons[0].getType() : '';
+                        changeSummary.changeReason = detailedReasons.length > 0 ? detailedReasons[0].getType() : "";
                         changeSummary.textChange = true;
-                    }
-                    else if (ctx.didChange(this._forceUpdateExplicitlySignal)) {
+                    } else if (ctx.didChange(this._forceUpdateExplicitlySignal)) {
                         changeSummary.preserveCurrentCompletion = true;
                         changeSummary.inlineCompletionTriggerKind = InlineCompletionTriggerKind.Explicit;
-                    }
-                    else if (ctx.didChange(this.dontRefetchSignal)) {
+                    } else if (ctx.didChange(this.dontRefetchSignal)) {
                         changeSummary.dontRefetch = true;
-                    }
-                    else if (ctx.didChange(this._onlyRequestInlineEditsSignal)) {
+                    } else if (ctx.didChange(this._onlyRequestInlineEditsSignal)) {
                         changeSummary.onlyRequestInlineEdits = true;
-                    }
-                    else if (ctx.didChange(this._fetchSpecificProviderSignal)) {
-                        changeSummary.provider = ctx.change;
+                    } else if (ctx.didChange(this._fetchSpecificProviderSignal)) {
+                        changeSummary.provider = ctx.change?.provider;
+                        changeSummary.changeHint = ctx.change?.changeHint;
                     }
                     return true;
-                },
-            },
+                }
+            }
         }, (reader, changeSummary) => {
             this._source.clearOperationOnTextModelChange.read(reader);
             this._noDelaySignal.read(reader);
@@ -166,8 +180,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             this._onlyRequestInlineEditsSignal.read(reader);
             this._forceUpdateExplicitlySignal.read(reader);
             this._fetchSpecificProviderSignal.read(reader);
-            const shouldUpdate = ((this._enabled.read(reader) && this._selectedSuggestItem.read(reader)) || this._isActive.read(reader))
-                && (!this._inlineCompletionsService.isSnoozing() || changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit);
+            const shouldUpdate = ((this._enabled.read(reader) && this._selectedSuggestItem.read(reader)) || this._isActive.read(reader)) && (!this._inlineCompletionsService.isSnoozing() || changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit);
             if (!shouldUpdate) {
                 this._source.cancelUpdate();
                 return undefined;
@@ -190,12 +203,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 });
                 return undefined;
             }
-            let reason = '';
+            let reason = "";
             if (changeSummary.provider) {
-                reason += 'providerOnDidChange';
-            }
-            else if (changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit) {
-                reason += 'explicit';
+                reason += "providerOnDidChange";
+            } else if (changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit) {
+                reason += "explicit";
             }
             if (changeSummary.changeReason) {
                 reason += reason.length > 0 ? `:${changeSummary.changeReason}` : changeSummary.changeReason;
@@ -209,7 +221,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 typingInterval: typingInterval.averageInterval,
                 typingIntervalCharacterCount: typingInterval.characterCount,
                 availableProviders: [],
-                sku: this.sku.read(undefined),
+                sku: this.sku.read(undefined)
             };
             let context = {
                 triggerKind: changeSummary.inlineCompletionTriggerKind,
@@ -218,30 +230,44 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 includeInlineEdits: this._inlineEditsEnabled.read(reader),
                 requestIssuedDateTime: requestInfo.startTime,
                 earliestShownDateTime: requestInfo.startTime + (changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit || this.inAcceptFlow.read(undefined) ? 0 : this._minShowDelay.read(undefined)),
+                changeHint: changeSummary.changeHint
             };
             if (context.triggerKind === InlineCompletionTriggerKind.Automatic && changeSummary.textChange) {
                 if (this.textModel.getAlternativeVersionId() === this._lastShownInlineCompletionInfo?.alternateTextModelVersionId) {
                     context = {
                         ...context,
                         includeInlineCompletions: !this._lastShownInlineCompletionInfo.inlineCompletion.isInlineEdit,
-                        includeInlineEdits: this._lastShownInlineCompletionInfo.inlineCompletion.isInlineEdit,
+                        includeInlineEdits: this._lastShownInlineCompletionInfo.inlineCompletion.isInlineEdit
                     };
                 }
             }
             const itemToPreserveCandidate = this.selectedInlineCompletion.read(undefined) ?? this._inlineCompletionItems.read(undefined)?.inlineEdit;
-            const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable
-                ? itemToPreserveCandidate : undefined;
+            const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable ? itemToPreserveCandidate : undefined;
             const userJumpedToActiveCompletion = ( this._jumpedToId.map(
                 jumpedTo => !!jumpedTo && jumpedTo === this._inlineCompletionItems.read(undefined)?.inlineEdit?.semanticId
             ));
-            const providers = changeSummary.provider
-                ? { providers: [changeSummary.provider], label: 'single:' + changeSummary.provider.providerId?.toString() }
-                : { providers: this._languageFeaturesService.inlineCompletionsProvider.all(this.textModel), label: undefined };
+            const providers = changeSummary.provider ? {
+                providers: [changeSummary.provider],
+                label: "single:" + changeSummary.provider.providerId?.toString()
+            } : {
+                providers: this._languageFeaturesService.inlineCompletionsProvider.all(this.textModel),
+                label: undefined
+            };
             const availableProviders = this.getAvailableProviders(providers.providers);
             requestInfo.availableProviders = ( availableProviders.map(p => p.providerId)).filter(isDefined);
-            return this._source.fetch(availableProviders, providers.label, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, requestInfo);
+            return this._source.fetch(
+                availableProviders,
+                providers.label,
+                context,
+                itemToPreserve?.identity,
+                changeSummary.shouldDebounce,
+                userJumpedToActiveCompletion,
+                requestInfo
+            );
         });
-        this._inlineCompletionItems = derivedOpts({ owner: this }, reader => {
+        this._inlineCompletionItems = derivedOpts({
+            owner: this
+        }, reader => {
             const c = this._source.inlineCompletions.read(reader);
             if (!c) {
                 return undefined;
@@ -254,8 +280,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     if (completion.isVisible(this.textModel, cursorPosition)) {
                         visibleCompletions.push(completion);
                     }
-                }
-                else {
+                } else {
                     inlineEdit = completion;
                 }
             }
@@ -264,49 +289,53 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return {
                 inlineCompletions: visibleCompletions,
-                inlineEdit,
+                inlineEdit
             };
         });
-        this._filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: arrayEqualsC() }, reader => {
+        this._filteredInlineCompletionItems = derivedOpts({
+            owner: this,
+            equalsFn: arrayEqualsC()
+        }, reader => {
             const c = this._inlineCompletionItems.read(reader);
             return c?.inlineCompletions ?? [];
         });
-        this.selectedInlineCompletionIndex = derived(this, (reader) => {
+        this.selectedInlineCompletionIndex = derived(this, reader => {
             const selectedInlineCompletionId = this._selectedInlineCompletionId.read(reader);
             const filteredCompletions = this._filteredInlineCompletionItems.read(reader);
-            const idx = this._selectedInlineCompletionId === undefined ? -1
-                : filteredCompletions.findIndex(v => v.semanticId === selectedInlineCompletionId);
+            const idx = this._selectedInlineCompletionId === undefined ? -1 : filteredCompletions.findIndex(v => v.semanticId === selectedInlineCompletionId);
             if (idx === -1) {
                 this._selectedInlineCompletionId.set(undefined, undefined);
                 return 0;
             }
             return idx;
         });
-        this.selectedInlineCompletion = derived(this, (reader) => {
+        this.selectedInlineCompletion = derived(this, reader => {
             const filteredCompletions = this._filteredInlineCompletionItems.read(reader);
             const idx = this.selectedInlineCompletionIndex.read(reader);
             return filteredCompletions[idx];
         });
-        this.activeCommands = derivedOpts({ owner: this, equalsFn: arrayEqualsC() }, 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;
-            }
-            else {
+            } else {
                 return undefined;
             }
         });
         this._hasVisiblePeekWidgets = derived(this, reader => this._editorObs.openedPeekWidgets.read(reader) > 0);
         this._shouldShowOnSuggestConflict = derived(this, reader => {
             const showOnSuggestConflict = this._showOnSuggestConflict.read(reader);
-            if (showOnSuggestConflict !== 'never') {
+            if (showOnSuggestConflict !== "never") {
                 const hasInlineCompletion = !!this.selectedInlineCompletion.read(reader);
                 if (hasInlineCompletion) {
                     const item = this._selectedSuggestItem.read(reader);
                     if (!item) {
                         return false;
                     }
-                    if (showOnSuggestConflict === 'whenSuggestListIsIncomplete') {
+                    if (showOnSuggestConflict === "whenSuggestListIsIncomplete") {
                         return item.listIncomplete;
                     }
                     return true;
@@ -320,17 +349,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 if (!a || !b) {
                     return a === b;
                 }
-                if (a.kind === 'ghostText' && b.kind === 'ghostText') {
-                    return ghostTextsOrReplacementsEqual(a.ghostTexts, b.ghostTexts)
-                        && a.inlineSuggestion === b.inlineSuggestion
-                        && a.suggestItem === b.suggestItem;
-                }
-                else if (a.kind === 'inlineEdit' && b.kind === 'inlineEdit') {
+                if (a.kind === "ghostText" && b.kind === "ghostText") {
+                    return ghostTextsOrReplacementsEqual(a.ghostTexts, b.ghostTexts) && a.inlineSuggestion === b.inlineSuggestion && a.suggestItem === b.suggestItem;
+                } else if (a.kind === "inlineEdit" && b.kind === "inlineEdit") {
                     return a.inlineSuggestion === b.inlineSuggestion;
                 }
                 return false;
             }
-        }, (reader) => {
+        }, reader => {
             const model = this.textModel;
             if (this._suppressInSnippetMode.read(reader) && this._isInSnippetMode.read(reader)) {
                 return undefined;
@@ -344,11 +370,17 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const cursorAtInlineEdit = ( this.primaryPosition.map(
                     cursorPos => LineRange.fromRangeInclusive(inlineEditResult.targetRange).addMargin(1, 1).contains(cursorPos.lineNumber)
                 ));
-                const stringEdit = inlineEditResult.action?.kind === 'edit' ? inlineEditResult.action.stringEdit : undefined;
+                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', inlineSuggestion: inlineEditResult, edits: replacements, cursorAtInlineEdit, nextEditUri };
+                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",
+                    inlineSuggestion: inlineEditResult,
+                    edits: replacements,
+                    cursorAtInlineEdit,
+                    nextEditUri
+                };
             }
             const suggestItem = this._selectedSuggestItem.read(reader);
             if (!this._shouldShowOnSuggestConflict.read(reader) && suggestItem) {
@@ -363,17 +395,35 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const mode = this._suggestPreviewMode.read(reader);
                 const positions = this._positions.read(reader);
                 const allPotentialEdits = [fullEdit, ...getSecondaryEdits(this.textModel, positions, fullEdit)];
-                const validEditsAndGhostTexts = ( allPotentialEdits
-                    .map(
-                    (edit, idx) => ({ edit, ghostText: edit ? computeGhostText(edit, model, mode, positions[idx], fullEditPreviewLength) : undefined })
-                ))
-                    .filter(({ edit, ghostText }) => edit !== undefined && ghostText !== undefined);
-                const edits = ( validEditsAndGhostTexts.map(({ edit }) => edit));
-                const ghostTexts = ( validEditsAndGhostTexts.map(({ ghostText }) => ghostText));
+                const validEditsAndGhostTexts = ( allPotentialEdits.map((edit, idx) => ({
+                    edit,
+                    ghostText: edit ? computeGhostText(edit, model, mode, positions[idx], fullEditPreviewLength) : undefined
+                }))).filter((
+                    {
+                        edit,
+                        ghostText
+                    }
+                ) => edit !== undefined && ghostText !== undefined);
+                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, inlineSuggestion: augmentation?.completion, suggestItem };
-            }
-            else {
+                return {
+                    kind: "ghostText",
+                    edits,
+                    primaryGhostText,
+                    ghostTexts,
+                    inlineSuggestion: augmentation?.completion,
+                    suggestItem
+                };
+            } else {
                 if (!this._isActive.read(reader)) {
                     return undefined;
                 }
@@ -385,35 +435,54 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const mode = this._inlineSuggestMode.read(reader);
                 const positions = this._positions.read(reader);
                 const allPotentialEdits = [replacement, ...getSecondaryEdits(this.textModel, positions, replacement)];
-                const validEditsAndGhostTexts = ( allPotentialEdits
-                    .map(
-                    (edit, idx) => ({ edit, ghostText: edit ? computeGhostText(edit, model, mode, positions[idx], 0) : undefined })
-                ))
-                    .filter(({ edit, ghostText }) => edit !== undefined && ghostText !== undefined);
-                const edits = ( validEditsAndGhostTexts.map(({ edit }) => edit));
-                const ghostTexts = ( validEditsAndGhostTexts.map(({ ghostText }) => ghostText));
+                const validEditsAndGhostTexts = ( allPotentialEdits.map((edit, idx) => ({
+                    edit,
+                    ghostText: edit ? computeGhostText(edit, model, mode, positions[idx], 0) : undefined
+                }))).filter((
+                    {
+                        edit,
+                        ghostText
+                    }
+                ) => edit !== undefined && ghostText !== undefined);
+                const edits = ( validEditsAndGhostTexts.map((
+                    {
+                        edit
+                    }
+                ) => edit));
+                const ghostTexts = ( validEditsAndGhostTexts.map((
+                    {
+                        ghostText
+                    }
+                ) => ghostText));
                 if (!ghostTexts[0]) {
                     return undefined;
                 }
-                return { kind: 'ghostText', edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineSuggestion, suggestItem: undefined };
+                return {
+                    kind: "ghostText",
+                    edits,
+                    primaryGhostText: ghostTexts[0],
+                    ghostTexts,
+                    inlineSuggestion,
+                    suggestItem: undefined
+                };
             }
         });
         this.status = derived(this, reader => {
             if (this._source.loading.read(reader)) {
-                return 'loading';
+                return "loading";
             }
             const s = this.state.read(reader);
-            if (s?.kind === 'ghostText') {
-                return 'ghostText';
+            if (s?.kind === "ghostText") {
+                return "ghostText";
             }
-            if (s?.kind === 'inlineEdit') {
-                return 'inlineEdit';
+            if (s?.kind === "inlineEdit") {
+                return "inlineEdit";
             }
-            return 'noSuggestion';
+            return "noSuggestion";
         });
         this.inlineCompletionState = derived(this, reader => {
             const s = this.state.read(reader);
-            if (!s || s.kind !== 'ghostText') {
+            if (!s || s.kind !== "ghostText") {
                 return undefined;
             }
             if (this._editorObs.inComposition.read(reader)) {
@@ -423,7 +492,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         });
         this.inlineEditState = derived(this, reader => {
             const s = this.state.read(reader);
-            if (!s || s.kind !== 'inlineEdit') {
+            if (!s || s.kind !== "inlineEdit") {
                 return undefined;
             }
             return s;
@@ -435,14 +504,20 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this.warning = derived(this, reader => {
             return this.inlineCompletionState.read(reader)?.inlineSuggestion?.warning;
         });
-        this.ghostTexts = derivedOpts({ owner: this, equalsFn: ghostTextsOrReplacementsEqual }, reader => {
+        this.ghostTexts = derivedOpts({
+            owner: this,
+            equalsFn: ghostTextsOrReplacementsEqual
+        }, reader => {
             const v = this.inlineCompletionState.read(reader);
             if (!v) {
                 return undefined;
             }
             return v.ghostTexts;
         });
-        this.primaryGhostText = derivedOpts({ owner: this, equalsFn: ghostTextOrReplacementEquals }, reader => {
+        this.primaryGhostText = derivedOpts({
+            owner: this,
+            equalsFn: ghostTextOrReplacementEquals
+        }, reader => {
             const v = this.inlineCompletionState.read(reader);
             if (!v) {
                 return undefined;
@@ -451,16 +526,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         });
         this.showCollapsed = derived(this, reader => {
             const state = this.state.read(reader);
-            if (!state || state.kind !== 'inlineEdit') {
+            if (!state || state.kind !== "inlineEdit") {
                 return false;
             }
-            if (state.inlineSuggestion.hint || state.inlineSuggestion.action?.kind === 'jumpTo') {
+            if (state.inlineSuggestion.hint || state.inlineSuggestion.action?.kind === "jumpTo") {
                 return false;
             }
             const isCurrentModelVersion = state.inlineSuggestion.updatedEditModelVersion === this._textModelVersionId.read(reader);
-            return (this._inlineEditsShowCollapsedEnabled.read(reader) || !isCurrentModelVersion)
-                && this._jumpedToId.read(reader) !== state.inlineSuggestion.semanticId
-                && !this._inAcceptFlow.read(reader);
+            return (this._inlineEditsShowCollapsedEnabled.read(reader) || !isCurrentModelVersion) && this._jumpedToId.read(reader) !== state.inlineSuggestion.semanticId && !this._inAcceptFlow.read(reader);
         });
         this._tabShouldIndent = derived(this, reader => {
             if (this._inAcceptFlow.read(reader)) {
@@ -479,8 +552,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             return selections?.some(s => {
                 if (s.isEmpty()) {
                     return this.textModel.getLineLength(s.startLineNumber) === 0;
-                }
-                else {
+                } else {
                     return isMultiLine(s) || s.containsRange(getNonIndentationRange(this.textModel, s.startLineNumber));
                 }
             });
@@ -493,7 +565,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!s) {
                 return false;
             }
-            if (s.inlineSuggestion.action?.kind === 'jumpTo') {
+            if (s.inlineSuggestion.action?.kind === "jumpTo") {
                 return true;
             }
             if (this.showCollapsed.read(reader)) {
@@ -509,7 +581,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!s) {
                 return false;
             }
-            if (s.inlineSuggestion.action?.kind === 'jumpTo') {
+            if (s.inlineSuggestion.action?.kind === "jumpTo") {
                 return false;
             }
             if (this.showCollapsed.read(reader)) {
@@ -532,7 +604,13 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._jumpedToId = observableValue(this, undefined);
         this._inAcceptFlow = observableValue(this, false);
         this.inAcceptFlow = this._inAcceptFlow;
-        this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this._textModelVersionId, this._debounceValue, this.primaryPosition));
+        this._source = this._register(this._instantiationService.createInstance(
+            InlineCompletionsSource,
+            this.textModel,
+            this._textModelVersionId,
+            this._debounceValue,
+            this.primaryPosition
+        ));
         this.lastTriggerKind = ( this._source.inlineCompletions.map(this, v => v?.request?.context.triggerKind));
         this._editorObs = observableCodeEditor(this._editor);
         const suggest = this._editorObs.getOption(EditorOption.suggest);
@@ -540,7 +618,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._suggestPreviewMode = ( suggest.map(v => v.previewMode));
         const inlineSuggest = this._editorObs.getOption(EditorOption.inlineSuggest);
         this._inlineSuggestMode = ( inlineSuggest.map(v => v.mode));
-        this._suppressedInlineCompletionGroupIds = ( inlineSuggest.map(v => ( new Set(v.experimental.suppressInlineSuggestions.split(',')))));
+        this._suppressedInlineCompletionGroupIds = ( inlineSuggest.map(v => ( new Set(v.experimental.suppressInlineSuggestions.split(",")))));
         this._inlineEditsEnabled = ( inlineSuggest.map(v => !!v.edits.enabled));
         this._inlineEditsShowCollapsedEnabled = ( inlineSuggest.map(s => s.edits.showCollapsed));
         this._triggerCommandOnProviderChange = ( inlineSuggest.map(s => s.triggerCommandOnProviderChange));
@@ -549,25 +627,27 @@ 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)));
+        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) => {
+        this._register(this._inlineCompletionsService.onDidChangeIsSnoozing(isSnoozing => {
             if (isSnoozing) {
                 this.stop();
             }
         }));
         {
             const isNotebook = this.textModel.uri.scheme === Schemas.vscodeNotebookCell;
-            const [diffEditor] = this._codeEditorService.listDiffEditors()
-                .filter(d => d.getOriginalEditor().getId() === this._editor.getId() ||
-                d.getModifiedEditor().getId() === this._editor.getId());
+            const [diffEditor] = this._codeEditorService.listDiffEditors().filter(
+                d => d.getOriginalEditor().getId() === this._editor.getId() || d.getModifiedEditor().getId() === this._editor.getId()
+            );
             this.isInDiffEditor = !!diffEditor;
-            this.editorType = isNotebook ? InlineCompletionEditorType.Notebook
-                : this.isInDiffEditor ? InlineCompletionEditorType.DiffEditor
-                    : InlineCompletionEditorType.TextEditor;
+            this.editorType = isNotebook ? InlineCompletionEditorType.Notebook : this.isInDiffEditor ? InlineCompletionEditorType.DiffEditor : InlineCompletionEditorType.TextEditor;
         }
-        this._register(recomputeInitiallyAndOnChange(this.state, (s) => {
+        this._register(recomputeInitiallyAndOnChange(this.state, s => {
             if (s && s.inlineSuggestion) {
                 this._inlineCompletionsService.reportNewCompletion(s.inlineSuggestion.requestUuid);
             }
@@ -579,7 +659,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }));
         this._register(autorun(reader => {
             const jumpToReset = ( this.state.map(
-                (s, reader) => !s || s.kind === 'inlineEdit' && !s.cursorAtInlineEdit.read(reader)
+                (s, reader) => !s || s.kind === "inlineEdit" && !s.cursorAtInlineEdit.read(reader)
             )).read(reader);
             if (jumpToReset) {
                 this._jumpedToId.set(undefined, undefined);
@@ -588,7 +668,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._register(autorun(reader => {
             const inlineSuggestion = ( this.state.map(s => s?.inlineSuggestion)).read(reader);
             if (inlineSuggestion) {
-                inlineSuggestion.addPerformanceMarker('activeSuggestion');
+                inlineSuggestion.addPerformanceMarker("activeSuggestion");
             }
         }));
         const inlineEditSemanticId = ( this.inlineEditState.map(s => s?.inlineSuggestion.semanticId));
@@ -598,16 +678,19 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._editor.pushUndoStop();
                 this._lastShownInlineCompletionInfo = {
                     alternateTextModelVersionId: this.textModel.getAlternativeVersionId(),
-                    inlineCompletion: this.state.get().inlineSuggestion,
+                    inlineCompletion: this.state.get().inlineSuggestion
                 };
             }
         }));
-        const inlineCompletionProviders = observableFromEvent(this._languageFeaturesService.inlineCompletionsProvider.onDidChange, () => this._languageFeaturesService.inlineCompletionsProvider.all(textModel));
+        const inlineCompletionProviders = observableFromEvent(
+            this._languageFeaturesService.inlineCompletionsProvider.onDidChange,
+            () => this._languageFeaturesService.inlineCompletionsProvider.all(textModel)
+        );
         mapObservableArrayCached(this, inlineCompletionProviders, (provider, store) => {
             if (!provider.onDidChangeInlineCompletions) {
                 return;
             }
-            store.add(provider.onDidChangeInlineCompletions(() => {
+            store.add(provider.onDidChangeInlineCompletions(changeHint => {
                 if (!this._enabled.get()) {
                     return;
                 }
@@ -616,7 +699,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     return;
                 }
                 if (this._triggerCommandOnProviderChange.get()) {
-                    this.trigger(undefined, { onlyFetchInlineEdits: true });
+                    this.trigger(undefined, {
+                        onlyFetchInlineEdits: true
+                    });
                     return;
                 }
                 const activeState = this.state.get();
@@ -624,7 +709,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     return;
                 }
                 transaction(tx => {
-                    this._fetchSpecificProviderSignal.trigger(tx, provider);
+                    this._fetchSpecificProviderSignal.trigger(tx, {
+                        provider,
+                        changeHint: changeHint ?? undefined
+                    });
                     this.trigger(tx);
                 });
             }));
@@ -639,7 +727,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         let startsWithIndentationLessThanTabSize = true;
         const ghostText = this?.primaryGhostText.read(reader);
         if (!!this?._selectedSuggestItem && ghostText && ghostText.parts.length > 0) {
-            const { column, lines } = ghostText.parts[0];
+            const {
+                column,
+                lines
+            } = ghostText.parts[0];
             const firstLine = lines[0].line;
             const indentationEndColumn = this.textModel.getLineIndentColumn(ghostText.lineNumber);
             const inIndentation = column <= indentationEndColumn;
@@ -656,7 +747,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         return {
             startsWithIndentation,
-            startsWithIndentationLessThanTabSize,
+            startsWithIndentationLessThanTabSize
         };
     }
     _getReason(e) {
@@ -701,20 +792,28 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._forceUpdateExplicitlySignal.trigger(tx);
             }
             if (options.provider) {
-                this._fetchSpecificProviderSignal.trigger(tx, options.provider);
+                this._fetchSpecificProviderSignal.trigger(tx, {
+                    provider: options.provider,
+                    changeHint: options.changeHint
+                });
             }
         });
         await this._fetchInlineCompletionsPromise.get();
     }
     async triggerExplicitly(tx, onlyFetchInlineEdits = false) {
-        return this.trigger(tx, { onlyFetchInlineEdits, explicit: true });
+        return this.trigger(tx, {
+            onlyFetchInlineEdits,
+            explicit: true
+        });
     }
-    stop(stopReason = 'automatic', tx) {
+    stop(stopReason = "automatic", tx) {
         subtransaction(tx, tx => {
-            if (stopReason === 'explicitCancel') {
+            if (stopReason === "explicitCancel") {
                 const inlineCompletion = this.state.get()?.inlineSuggestion;
                 if (inlineCompletion) {
-                    inlineCompletion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Rejected });
+                    inlineCompletion.reportEndOfLife({
+                        kind: InlineCompletionEndOfLifeReasonKind.Rejected
+                    });
                 }
             }
             this._isActive.set(false, tx);
@@ -724,13 +823,18 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     _computeAugmentation(suggestCompletion, reader) {
         const model = this.textModel;
         const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.read(reader);
-        const candidateInlineCompletions = suggestWidgetInlineCompletions
-            ? suggestWidgetInlineCompletions.inlineCompletions.filter(c => !c.isInlineEdit)
-            : [this.selectedInlineCompletion.read(reader)].filter(isDefined);
+        const candidateInlineCompletions = suggestWidgetInlineCompletions ? suggestWidgetInlineCompletions.inlineCompletions.filter(c => !c.isInlineEdit) : [this.selectedInlineCompletion.read(reader)].filter(isDefined);
         const augmentedCompletion = mapFindFirst(candidateInlineCompletions, completion => {
             let r = completion.getSingleTextEdit();
-            r = singleTextRemoveCommonPrefix(r, model, Range.fromPositions(r.range.getStartPosition(), suggestCompletion.range.getEndPosition()));
-            return singleTextEditAugments(r, suggestCompletion) ? { completion, edit: r } : undefined;
+            r = singleTextRemoveCommonPrefix(
+                r,
+                model,
+                Range.fromPositions(r.range.getStartPosition(), suggestCompletion.range.getEndPosition())
+            );
+            return singleTextEditAugments(r, suggestCompletion) ? {
+                completion,
+                edit: r
+            } : undefined;
         });
         return augmentedCompletion;
     }
@@ -740,13 +844,16 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         if (completions.length > 0) {
             const newIdx = (this.selectedInlineCompletionIndex.get() + delta + completions.length) % completions.length;
             this._selectedInlineCompletionId.set(completions[newIdx].semanticId, undefined);
-        }
-        else {
+        } else {
             this._selectedInlineCompletionId.set(undefined, undefined);
         }
     }
-    async next() { await this._deltaSelectedInlineCompletionIndex(1); }
-    async previous() { await this._deltaSelectedInlineCompletionIndex(-1); }
+    async next() {
+        await this._deltaSelectedInlineCompletionIndex(1);
+    }
+    async previous() {
+        await this._deltaSelectedInlineCompletionIndex(-1);
+    }
     _getMetadata(completion, languageId, type = undefined) {
         if (type) {
             return EditSources.inlineCompletionPartialAccept({
@@ -755,10 +862,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 providerId: completion.source.provider.providerId,
                 languageId,
                 type,
-                correlationId: completion.getSourceCompletion().correlationId,
+                correlationId: completion.getSourceCompletion().correlationId
             });
-        }
-        else {
+        } else {
             return EditSources.inlineCompletionAccept({
                 nes: completion.isInlineEdit,
                 requestUuid: completion.requestUuid,
@@ -775,56 +881,54 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         let completion;
         let isNextEditUri = false;
         const state = this.state.get();
-        if (state?.kind === 'ghostText') {
+        if (state?.kind === "ghostText") {
             if (!state || state.primaryGhostText.isEmpty() || !state.inlineSuggestion) {
                 return;
             }
             completion = state.inlineSuggestion;
-        }
-        else if (state?.kind === 'inlineEdit') {
+        } else if (state?.kind === "inlineEdit") {
             completion = state.inlineSuggestion;
             isNextEditUri = !!state.nextEditUri;
-        }
-        else {
+        } else {
             return;
         }
         completion.addRef();
         try {
             let followUpTrigger = false;
             editor.pushUndoStop();
-            if (isNextEditUri) {
-            }
-            else if (completion.action?.kind === 'edit') {
+            if (isNextEditUri)
+                {} 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);
-                }
-                else if (action.snippetInfo) {
+                    await this._commandService.executeCommand(altCommand.id, ...(altCommand.arguments || [])).then(undefined, onUnexpectedExternalError);
+                } 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 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 });
-                }
-                else {
+                    editor.setPosition(action.snippetInfo.range.getStartPosition(), "inlineCompletionAccept");
+                    SnippetController2.get(editor)?.insert(action.snippetInfo.snippet, {
+                        undoStopBefore: false
+                    });
+                } else {
                     const edits = state.edits;
                     let minimalEdits = edits;
-                    if (state.kind === 'ghostText') {
+                    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 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');
+                        editor.setSelections(
+                            state.kind === "inlineEdit" ? selections.slice(-1) : selections,
+                            "inlineCompletionAccept"
+                        );
                     }
-                    if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
+                    if (state.kind === "inlineEdit" && !this._accessibilityService.isMotionReduced()) {
                         const editRanges = edit.getNewRanges();
                         const dec = this._store.add(( new FadeoutDecoration(editor, editRanges, () => {
                             this._store.delete(dec);
@@ -835,37 +939,38 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             this._onDidAccept.fire();
             this.stop();
             if (completion.command) {
-                await this._commandService
-                    .executeCommand(completion.command.id, ...(completion.command.arguments || []))
-                    .then(undefined, onUnexpectedExternalError);
+                await this._commandService.executeCommand(completion.command.id, ...(completion.command.arguments || [])).then(undefined, onUnexpectedExternalError);
             }
             if (followUpTrigger) {
                 this.trigger(undefined);
             }
-            completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted, alternativeAction });
-        }
-        finally {
+            completion.reportEndOfLife({
+                kind: InlineCompletionEndOfLifeReasonKind.Accepted,
+                alternativeAction
+            });
+        } finally {
             completion.removeRef();
             this._inAcceptFlow.set(true, undefined);
-            this._lastAcceptedInlineCompletionInfo = { textModelVersionIdAfter: this.textModel.getVersionId(), inlineCompletion: completion };
+            this._lastAcceptedInlineCompletionInfo = {
+                textModelVersionIdAfter: this.textModel.getVersionId(),
+                inlineCompletion: completion
+            };
         }
     }
     async acceptNextWord() {
-        await this._acceptNext(this._editor, 'word', (pos, text) => {
+        await this._acceptNext(this._editor, "word", (pos, text) => {
             const langId = this.textModel.getLanguageIdAtPosition(pos.lineNumber, pos.column);
             const config = this._languageConfigurationService.getLanguageConfiguration(langId);
-            const wordRegExp = ( new RegExp(config.wordDefinition.source, config.wordDefinition.flags.replace('g', '')));
+            const wordRegExp = ( new RegExp(config.wordDefinition.source, config.wordDefinition.flags.replace("g", "")));
             const m1 = text.match(wordRegExp);
             let acceptUntilIndexExclusive = 0;
             if (m1 && m1.index !== undefined) {
                 if (m1.index === 0) {
                     acceptUntilIndexExclusive = m1[0].length;
-                }
-                else {
+                } else {
                     acceptUntilIndexExclusive = m1.index;
                 }
-            }
-            else {
+            } else {
                 acceptUntilIndexExclusive = text.length;
             }
             const wsRegExp = /\s+/g;
@@ -879,7 +984,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }, PartialAcceptTriggerKind.Word);
     }
     async acceptNextLine() {
-        await this._acceptNext(this._editor, 'line', (pos, text) => {
+        await this._acceptNext(this._editor, "line", (pos, text) => {
             const m = text.match(/\n/);
             if (m && m.index !== undefined) {
                 return m.index + 1;
@@ -922,19 +1027,30 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const primaryEdit = ( new TextReplacement(replaceRange, newText));
                 const edits = [primaryEdit, ...getSecondaryEdits(this.textModel, positions, primaryEdit)].filter(isDefined);
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
-                editor.edit(TextEdit.fromParallelReplacementsUnsorted(edits), this._getMetadata(completion, type));
-                editor.setSelections(selections, 'inlineCompletionPartialAccept');
+                editor.edit(
+                    TextEdit.fromParallelReplacementsUnsorted(edits),
+                    this._getMetadata(completion, type)
+                );
+                editor.setSelections(selections, "inlineCompletionPartialAccept");
                 editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), ScrollType.Smooth);
-            }
-            finally {
+            } finally {
                 this._isAcceptingPartially = false;
             }
-            const acceptedRange = Range.fromPositions(completion.editRange.getStartPosition(), TextLength.ofText(partialGhostTextVal).addToPosition(ghostTextPos));
+            const acceptedRange = Range.fromPositions(
+                completion.editRange.getStartPosition(),
+                TextLength.ofText(partialGhostTextVal).addToPosition(ghostTextPos)
+            );
             const text = editor.getModel().getValueInRange(acceptedRange, EndOfLinePreference.LF);
             const acceptedLength = text.length;
-            completion.reportPartialAccept(acceptedLength, { kind, acceptedLength: acceptedLength }, { characters: acceptUntilIndexExclusive, ratio: acceptUntilIndexExclusive / ghostTextVal.length, count: 1 });
-        }
-        finally {
+            completion.reportPartialAccept(acceptedLength, {
+                kind,
+                acceptedLength: acceptedLength
+            }, {
+                characters: acceptUntilIndexExclusive,
+                ratio: acceptUntilIndexExclusive / ghostTextVal.length,
+                count: 1
+            });
+        } finally {
             completion.removeRef();
         }
     }
@@ -948,7 +1064,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         const acceptedLength = alreadyAcceptedLength + itemEdit.text.length;
         augmentedCompletion.completion.reportPartialAccept(itemEdit.text.length, {
             kind: PartialAcceptTriggerKind.Suggest,
-            acceptedLength,
+            acceptedLength
         }, {
             characters: itemEdit.text.length,
             count: 1,
@@ -960,7 +1076,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         const item = this.state.get()?.inlineSuggestion;
         return {
             documentValue: value,
-            inlineCompletion: item?.getSourceCompletion(),
+            inlineCompletion: item?.getSourceCompletion()
         };
     }
     jump() {
@@ -972,28 +1088,29 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         suggestion.addRef();
         try {
             transaction(tx => {
-                if (suggestion.action?.kind === 'jumpTo') {
+                if (suggestion.action?.kind === "jumpTo") {
                     this.stop(undefined, tx);
-                    suggestion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted, alternativeAction: false });
+                    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');
-                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.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 {
+                } 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 {
+        } finally {
             suggestion.removeRef();
         }
     }
@@ -1001,18 +1118,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData, this.textModel, timeWhenShown);
     }
 };
-InlineCompletionsModel = ( __decorate([
-    ( __param(7, IInstantiationService)),
-    ( __param(8, ICommandService)),
-    ( __param(9, ILanguageConfigurationService)),
-    ( __param(10, IAccessibilityService)),
-    ( __param(11, ILanguageFeaturesService)),
-    ( __param(12, ICodeEditorService)),
-    ( __param(13, IInlineCompletionsService)),
-    ( __param(14, IDefaultAccountService))
-], InlineCompletionsModel));
+InlineCompletionsModel = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, ICommandService)), ( __param(9, ILanguageConfigurationService)), ( __param(10, IAccessibilityService)), ( __param(11, ILanguageFeaturesService)), ( __param(12, ICodeEditorService)), ( __param(13, IInlineCompletionsService)), ( __param(14, IDefaultAccountService))], InlineCompletionsModel));
 var VersionIdChangeReason;
-(function (VersionIdChangeReason) {
+(function(VersionIdChangeReason) {
     VersionIdChangeReason[VersionIdChangeReason["Undo"] = 0] = "Undo";
     VersionIdChangeReason[VersionIdChangeReason["Redo"] = 1] = "Redo";
     VersionIdChangeReason[VersionIdChangeReason["AcceptWord"] = 2] = "AcceptWord";
@@ -1050,21 +1158,23 @@ class FadeoutDecoration extends Disposable {
     constructor(editor, ranges, onDispose) {
         super();
         if (onDispose) {
-            this._register({ dispose: () => onDispose() });
+            this._register({
+                dispose: () => onDispose()
+            });
         }
         this._register(observableCodeEditor(editor).setDecorations(constObservable(( ranges.map(range => ({
             range: range,
             options: {
-                description: 'animation',
-                className: 'edits-fadeout-decoration',
-                zIndex: 1,
+                description: "animation",
+                className: "edits-fadeout-decoration",
+                zIndex: 1
             }
         }))))));
         const animation = ( new AnimatedValue(1, 0, 1000, easeOutCubic));
         const val = ( new ObservableAnimatedValue(animation));
         this._register(autorun(reader => {
             const opacity = val.getValue(reader);
-            editor.getContainerDomNode().style.setProperty('--animation-opacity', ( opacity.toString()));
+            editor.getContainerDomNode().style.setProperty("--animation-opacity", ( opacity.toString()));
             if (animation.isFinished()) {
                 this.dispose();
             }
@@ -1087,14 +1197,17 @@ function isSuggestionInViewport(editor, suggestion, reader = undefined) {
     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 };
+    if (account?.entitlementsData?.access_type_sku && account?.entitlementsData?.copilot_plan) {
+        return {
+            type: account.entitlementsData.access_type_sku,
+            plan: account.entitlementsData.copilot_plan
+        };
     }
     return undefined;
 }
 class DisposableCallback {
     constructor(cb) {
-        this.handler = (val) => {
+        this.handler = val => {
             return this._cb?.(val);
         };
         this._cb = cb;