@codingame/monaco-vscode-api 18.4.0 → 19.0.1

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

@@ -6,7 +6,7 @@ import { IInstantiationService } from "../../../../../platform/instantiation/com
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
 import { Position } from "../../../../common/core/position.js";
 import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { Command, InlineCompletion, InlineCompletionTriggerKind } from "../../../../common/languages.js";
+import { InlineCompletion, InlineCompletionTriggerKind, InlineCompletionCommand } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
 import { IFeatureDebounceInformation } from "../../../../common/services/languageFeatureDebounce.js";
@@ -15,7 +15,11 @@ import { IModelContentChangedEvent } from "../../../../common/textModelEvents.js
 import { GhostTextOrReplacement } from "./ghostText.js";
 import { InlineEdit } from "./inlineEdit.js";
 import { InlineCompletionItem, InlineEditItem, InlineSuggestionItem } from "./inlineSuggestionItem.js";
+import { InlineCompletionEditorType } from "./provideInlineCompletions.js";
 import { SuggestItemInfo } from "./suggestWidgetAdapter.js";
+import { ICodeEditorService } from "../../../../browser/services/codeEditorService.service.js";
+import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inlineEdits/inlineEditsViewInterface.js";
+import { IInlineCompletionsService } from "../../../../browser/services/inlineCompletionsService.service.js";
 export declare class InlineCompletionsModel extends Disposable {
     readonly textModel: ITextModel;
     private readonly _selectedSuggestItem;
@@ -29,6 +33,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _languageConfigurationService;
     private readonly _accessibilityService;
     private readonly _languageFeaturesService;
+    private readonly _codeEditorService;
     private readonly _source;
     private readonly _isActive;
     private readonly _onlyRequestInlineEditsSignal;
@@ -48,7 +53,8 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _suppressedInlineCompletionGroupIds;
     private readonly _inlineEditsEnabled;
     private readonly _inlineEditsShowCollapsedEnabled;
-    constructor(textModel: ITextModel, _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>, _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _positions: IObservable<readonly Position[]>, _debounceValue: IFeatureDebounceInformation, _enabled: IObservable<boolean>, _editor: ICodeEditor, _instantiationService: IInstantiationService, _commandService: ICommandService, _languageConfigurationService: ILanguageConfigurationService, _accessibilityService: IAccessibilityService, _languageFeaturesService: ILanguageFeaturesService);
+    private readonly _triggerCommandOnProviderChange;
+    constructor(textModel: ITextModel, _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>, _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _positions: IObservable<readonly Position[]>, _debounceValue: IFeatureDebounceInformation, _enabled: IObservable<boolean>, _editor: ICodeEditor, _instantiationService: IInstantiationService, _commandService: ICommandService, _languageConfigurationService: ILanguageConfigurationService, _accessibilityService: IAccessibilityService, _languageFeaturesService: ILanguageFeaturesService, _codeEditorService: ICodeEditorService, inlineCompletionsService: IInlineCompletionsService);
     private _lastShownInlineCompletionInfo;
     private _lastAcceptedInlineCompletionInfo;
     private readonly _didUndoInlineEdits;
@@ -71,7 +77,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _filteredInlineCompletionItems;
     readonly selectedInlineCompletionIndex: IObservableWithChange<number, void>;
     readonly selectedInlineCompletion: IObservableWithChange<InlineCompletionItem | undefined, void>;
-    readonly activeCommands: IObservable<Command[]>;
+    readonly activeCommands: IObservable<InlineCompletionCommand[]>;
     readonly lastTriggerKind: IObservable<InlineCompletionTriggerKind | undefined>;
     readonly inlineCompletionsCount: IObservableWithChange<number | undefined, void>;
     private readonly _hasVisiblePeekWidgets;
@@ -114,6 +120,8 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _tabShouldIndent;
     readonly tabShouldJumpToInlineEdit: IObservableWithChange<boolean, void>;
     readonly tabShouldAcceptInlineEdit: IObservableWithChange<boolean, void>;
+    readonly isInDiffEditor: boolean;
+    readonly editorType: InlineCompletionEditorType;
     private _deltaSelectedInlineCompletionIndex;
     next(): Promise<void>;
     previous(): Promise<void>;
@@ -128,7 +136,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _inAcceptFlow;
     readonly inAcceptFlow: IObservable<boolean>;
     jump(): void;
-    handleInlineSuggestionShown(inlineCompletion: InlineSuggestionItem): Promise<void>;
+    handleInlineSuggestionShown(inlineCompletion: InlineSuggestionItem, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): Promise<void>;
 }
 interface Repro {
     documentValue: string;

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

@@ -14,7 +14,6 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { CursorColumns } from '../../../../common/core/cursorColumns.js';
-import { EditOperation } from '../../../../common/core/editOperation.js';
 import { LineRange } from '../../../../common/core/ranges/lineRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
@@ -34,20 +33,23 @@ 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 { TextModelEditReason } from '../../../../common/textModelEditReason.js';
+import { EditReasons } from '../../../../common/textModelEditReason.js';
+import { ICodeEditorService } from '../../../../browser/services/codeEditorService.service.js';
+import { IInlineCompletionsService } from '../../../../browser/services/inlineCompletionsService.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';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
-import { recomputeInitiallyAndOnChange } from '../../../../../base/common/observableInternal/utils/utils.js';
-import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { recomputeInitiallyAndOnChange, mapObservableArrayCached } from '../../../../../base/common/observableInternal/utils/utils.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
-import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
 let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     get isAcceptingPartially() { return this._isAcceptingPartially; }
-    constructor(textModel, _selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _enabled, _editor, _instantiationService, _commandService, _languageConfigurationService, _accessibilityService, _languageFeaturesService) {
+    constructor(textModel, _selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _enabled, _editor, _instantiationService, _commandService, _languageConfigurationService, _accessibilityService, _languageFeaturesService, _codeEditorService, inlineCompletionsService) {
         super();
         this.textModel = textModel;
         this._selectedSuggestItem = _selectedSuggestItem;
@@ -61,14 +63,15 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._languageConfigurationService = _languageConfigurationService;
         this._accessibilityService = _accessibilityService;
         this._languageFeaturesService = _languageFeaturesService;
-        this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this._textModelVersionId, this._debounceValue));
+        this._codeEditorService = _codeEditorService;
+        this.primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? ( new Position(1, 1)));
+        this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this._textModelVersionId, this._debounceValue, this.primaryPosition));
         this._isActive = observableValue(this, false);
         this._onlyRequestInlineEditsSignal = observableSignal(this);
         this._forceUpdateExplicitlySignal = observableSignal(this);
         this._noDelaySignal = observableSignal(this);
         this._fetchSpecificProviderSignal = observableSignal(this);
         this._selectedInlineCompletionId = observableValue(this, undefined);
-        this.primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? ( new Position(1, 1)));
         this._isAcceptingPartially = false;
         this._onDidAccept = ( new Emitter());
         this.onDidAccept = this._onDidAccept.event;
@@ -76,9 +79,15 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._suggestPreviewEnabled = ( this._editorObs.getOption(EditorOption.suggest).map(v => v.preview));
         this._suggestPreviewMode = ( this._editorObs.getOption(EditorOption.suggest).map(v => v.previewMode));
         this._inlineSuggestMode = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => v.mode));
-        this._suppressedInlineCompletionGroupIds = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ( new Set(v.experimental.suppressInlineSuggestions))));
+        this._suppressedInlineCompletionGroupIds = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ( new Set(v.experimental.suppressInlineSuggestions.split(',')))));
         this._inlineEditsEnabled = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.enabled));
         this._inlineEditsShowCollapsedEnabled = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed));
+        this._triggerCommandOnProviderChange = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.experimental.triggerCommandOnProviderChange));
+        this._register(inlineCompletionsService.onDidChangeIsSnoozing((isSnoozing) => {
+            if (isSnoozing) {
+                this.stop();
+            }
+        }));
         this._lastShownInlineCompletionInfo = undefined;
         this._lastAcceptedInlineCompletionInfo = undefined;
         this._didUndoInlineEdits = derivedHandleChanges({
@@ -118,12 +127,20 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     onlyRequestInlineEdits: false,
                     shouldDebounce: true,
                     provider: undefined,
+                    textChange: false,
+                    changeReason: '',
                 }),
                 handleChange: (ctx, changeSummary) => {
-                    if (ctx.didChange(this._textModelVersionId) && ( this._preserveCurrentCompletionReasons.has(this._getReason(ctx.change)))) {
-                        changeSummary.preserveCurrentCompletion = true;
+                    if (ctx.didChange(this._textModelVersionId)) {
+                        if (( this._preserveCurrentCompletionReasons.has(this._getReason(ctx.change)))) {
+                            changeSummary.preserveCurrentCompletion = true;
+                        }
+                        const detailedReasons = ctx.change?.detailedReasons ?? [];
+                        changeSummary.changeReason = detailedReasons.length > 0 ? detailedReasons[0].getType() : '';
+                        changeSummary.textChange = true;
                     }
                     else if (ctx.didChange(this._forceUpdateExplicitlySignal)) {
+                        changeSummary.preserveCurrentCompletion = true;
                         changeSummary.inlineCompletionTriggerKind = InlineCompletionTriggerKind.Explicit;
                     }
                     else if (ctx.didChange(this.dontRefetchSignal)) {
@@ -145,7 +162,8 @@ 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);
+            const shouldUpdate = ((this._enabled.read(reader) && this._selectedSuggestItem.read(reader)) || this._isActive.read(reader))
+                && (!inlineCompletionsService.isSnoozing() || changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit);
             if (!shouldUpdate) {
                 this._source.cancelUpdate();
                 return undefined;
@@ -156,7 +174,6 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (suggestWidgetInlineCompletions && !suggestItem) {
                 this._source.seedInlineCompletionsWithSuggestWidget();
             }
-            const cursorPosition = this.primaryPosition.get();
             if (changeSummary.dontRefetch) {
                 return Promise.resolve(true);
             }
@@ -166,13 +183,29 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 });
                 return undefined;
             }
+            let reason = '';
+            if (changeSummary.provider) {
+                reason += 'providerOnDidChange';
+            }
+            else if (changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit) {
+                reason += 'explicit';
+            }
+            if (changeSummary.changeReason) {
+                reason += reason.length > 0 ? `:${changeSummary.changeReason}` : changeSummary.changeReason;
+            }
+            const requestInfo = {
+                editorType: this.editorType,
+                startTime: Date.now(),
+                languageId: this.textModel.getLanguageId(),
+                reason,
+            };
             let context = {
                 triggerKind: changeSummary.inlineCompletionTriggerKind,
                 selectedSuggestionInfo: suggestItem?.toSelectedSuggestionInfo(),
                 includeInlineCompletions: !changeSummary.onlyRequestInlineEdits,
                 includeInlineEdits: this._inlineEditsEnabled.read(reader),
             };
-            if (context.triggerKind === InlineCompletionTriggerKind.Automatic) {
+            if (context.triggerKind === InlineCompletionTriggerKind.Automatic && changeSummary.textChange) {
                 if (this.textModel.getAlternativeVersionId() === this._lastShownInlineCompletionInfo?.alternateTextModelVersionId) {
                     context = {
                         ...context,
@@ -190,7 +223,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const providers = changeSummary.provider ? [changeSummary.provider] : this._languageFeaturesService.inlineCompletionsProvider.all(this.textModel);
             const suppressedProviderGroupIds = this._suppressedInlineCompletionGroupIds.get();
             const availableProviders = providers.filter(provider => !(provider.groupId && ( suppressedProviderGroupIds.has(provider.groupId))));
-            return this._source.fetch(availableProviders, cursorPosition, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, !!changeSummary.provider);
+            return this._source.fetch(availableProviders, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, !!changeSummary.provider, requestInfo);
         });
         this._inlineCompletionItems = derivedOpts({ owner: this }, reader => {
             const c = this._source.inlineCompletions.read(reader);
@@ -472,14 +505,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return s.cursorAtInlineEdit.read(reader);
         });
+        {
+            const [diffEditor] = this._codeEditorService.listDiffEditors()
+                .filter(d => d.getOriginalEditor().getId() === this._editor.getId() ||
+                d.getModifiedEditor().getId() === this._editor.getId());
+            this.editorType = !!diffEditor ? InlineCompletionEditorType.DiffEditor : InlineCompletionEditorType.TextEditor;
+            this.isInDiffEditor = this.editorType === InlineCompletionEditorType.DiffEditor;
+        }
         this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletionsPromise));
-        this._register(autorun(reader => {
-            const item = this.inlineCompletionState.read(reader);
-            const completion = item?.inlineCompletion;
-            if (completion) {
-                this.handleInlineSuggestionShown(completion);
-            }
-        }));
         this._register(autorun(reader => {
             this._editorObs.versionId.read(reader);
             this._inAcceptFlow.set(false, undefined);
@@ -504,27 +537,32 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
         }));
         const inlineCompletionProviders = observableFromEvent(this._languageFeaturesService.inlineCompletionsProvider.onDidChange, () => this._languageFeaturesService.inlineCompletionsProvider.all(textModel));
-        this._register(autorunWithStore((reader, store) => {
-            const providers = inlineCompletionProviders.read(reader);
-            for (const provider of providers) {
-                if (!provider.onDidChangeInlineCompletions) {
-                    continue;
-                }
-                store.add(provider.onDidChangeInlineCompletions(() => {
-                    if (!this._enabled.get()) {
-                        return;
-                    }
-                    const activeState = this.state.get();
-                    if (activeState && (activeState.inlineCompletion || activeState.edits) && activeState.inlineCompletion?.source.provider !== provider) {
-                        return;
-                    }
-                    transaction(tx => {
-                        this._fetchSpecificProviderSignal.trigger(tx, provider);
-                        this.trigger(tx);
-                    });
-                }));
+        mapObservableArrayCached(this, inlineCompletionProviders, (provider, store) => {
+            if (!provider.onDidChangeInlineCompletions) {
+                return;
             }
-        }));
+            store.add(provider.onDidChangeInlineCompletions(() => {
+                if (!this._enabled.get()) {
+                    return;
+                }
+                const activeEditor = this._codeEditorService.getFocusedCodeEditor() || this._codeEditorService.getActiveCodeEditor();
+                if (activeEditor !== this._editor) {
+                    return;
+                }
+                if (this._triggerCommandOnProviderChange.get()) {
+                    this.trigger(undefined, { onlyFetchInlineEdits: true });
+                    return;
+                }
+                const activeState = this.state.get();
+                if (activeState && (activeState.inlineCompletion || activeState.edits) && activeState.inlineCompletion?.source.provider !== provider) {
+                    return;
+                }
+                transaction(tx => {
+                    this._fetchSpecificProviderSignal.trigger(tx, provider);
+                    this.trigger(tx);
+                });
+            }));
+        }).recomputeInitiallyAndOnChange(this._store);
         this._didUndoInlineEdits.recomputeInitiallyAndOnChange(this._store);
     }
     debugGetSelectedSuggestItem() {
@@ -629,12 +667,21 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     async next() { await this._deltaSelectedInlineCompletionIndex(1); }
     async previous() { await this._deltaSelectedInlineCompletionIndex(-1); }
     _getMetadata(completion, type = undefined) {
-        return ( new TextModelEditReason({
-            extensionId: completion.source.provider.groupId,
-            nes: completion.isInlineEdit,
-            type,
-            requestUuid: completion.requestUuid,
-        }));
+        if (type) {
+            return EditReasons.inlineCompletionPartialAccept({
+                nes: completion.isInlineEdit,
+                requestUuid: completion.requestUuid,
+                extensionId: completion.source.provider.groupId ?? 'unknown',
+                type,
+            });
+        }
+        else {
+            return EditReasons.inlineCompletionAccept({
+                nes: completion.isInlineEdit,
+                requestUuid: completion.requestUuid,
+                extensionId: completion.source.provider.groupId ?? 'unknown',
+            });
+        }
     }
     async accept(editor = this._editor) {
         if (editor.getModel() !== this.textModel) {
@@ -654,54 +701,51 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         else {
             return;
         }
-        completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted });
-        if (completion.command) {
-            completion.source.addRef();
-        }
-        editor.pushUndoStop();
-        if (completion.snippetInfo) {
-            TextModelEditReason.editWithReason(this._getMetadata(completion), () => {
-                editor.executeEdits('inlineSuggestion.accept', [
-                    EditOperation.replace(completion.editRange, ''),
-                    ...completion.additionalTextEdits
-                ]);
-            });
-            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);
-            }
-            const selections = ( getEndPositionsAfterApplying(minimalEdits).map(p => Selection.fromPositions(p)));
-            TextModelEditReason.editWithReason(this._getMetadata(completion), () => {
-                editor.executeEdits('inlineSuggestion.accept', [
-                    ...( edits.map(edit => EditOperation.replace(edit.range, edit.text))),
-                    ...completion.additionalTextEdits
-                ]);
-            });
-            if (completion.displayLocation === undefined) {
-                editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
+        completion.addRef();
+        try {
+            editor.pushUndoStop();
+            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));
+                editor.setPosition(completion.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
+                SnippetController2.get(editor)?.insert(completion.snippetInfo.snippet, { undoStopBefore: false });
             }
-            if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
-                const editRanges = ( new TextEdit(edits)).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));
+                if (completion.displayLocation === 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();
+            this.stop();
+            if (completion.command) {
+                await this._commandService
+                    .executeCommand(completion.command.id, ...(completion.command.arguments || []))
+                    .then(undefined, onUnexpectedExternalError);
             }
+            completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted });
         }
-        this._onDidAccept.fire();
-        this.stop();
-        if (completion.command) {
-            await this._commandService
-                .executeCommand(completion.command.id, ...(completion.command.arguments || []))
-                .then(undefined, onUnexpectedExternalError);
-            completion.source.removeRef();
+        finally {
+            completion.removeRef();
+            this._inAcceptFlow.set(true, undefined);
+            this._lastAcceptedInlineCompletionInfo = { textModelVersionIdAfter: this.textModel.getVersionId(), inlineCompletion: completion };
         }
-        this._inAcceptFlow.set(true, undefined);
-        this._lastAcceptedInlineCompletionInfo = { textModelVersionIdAfter: this.textModel.getVersionId(), inlineCompletion: completion };
     }
     async acceptNextWord() {
         await this._acceptNext(this._editor, 'word', (pos, text) => {
@@ -765,7 +809,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         const partialGhostTextVal = ghostTextVal.substring(0, acceptUntilIndexExclusive);
         const positions = this._positions.get();
         const cursorPosition = positions[0];
-        completion.source.addRef();
+        completion.addRef();
         try {
             this._isAcceptingPartially = true;
             try {
@@ -775,9 +819,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const primaryEdit = ( new TextReplacement(replaceRange, newText));
                 const edits = [primaryEdit, ...getSecondaryEdits(this.textModel, positions, primaryEdit)];
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
-                TextModelEditReason.editWithReason(this._getMetadata(completion, type), () => {
-                    editor.executeEdits('inlineSuggestion.accept', ( edits.map(edit => EditOperation.replace(edit.range, edit.text))));
-                });
+                editor.edit(TextEdit.fromParallelReplacementsUnsorted(edits), this._getMetadata(completion, type));
                 editor.setSelections(selections, 'inlineCompletionPartialAccept');
                 editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), ScrollType.Immediate);
             }
@@ -790,7 +832,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             completion.reportPartialAccept(acceptedLength, { kind, acceptedLength: acceptedLength });
         }
         finally {
-            completion.source.removeRef();
+            completion.removeRef();
         }
     }
     handleSuggestAccepted(item) {
@@ -836,8 +878,8 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             this._editor.focus();
         });
     }
-    async handleInlineSuggestionShown(inlineCompletion) {
-        await inlineCompletion.reportInlineEditShown(this._commandService);
+    async handleInlineSuggestionShown(inlineCompletion, viewKind, viewData) {
+        await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData);
     }
 };
 InlineCompletionsModel = ( __decorate([
@@ -845,7 +887,9 @@ InlineCompletionsModel = ( __decorate([
     ( __param(8, ICommandService)),
     ( __param(9, ILanguageConfigurationService)),
     ( __param(10, IAccessibilityService)),
-    ( __param(11, ILanguageFeaturesService))
+    ( __param(11, ILanguageFeaturesService)),
+    ( __param(12, ICodeEditorService)),
+    ( __param(13, IInlineCompletionsService))
 ], InlineCompletionsModel));
 var VersionIdChangeReason;
 (function (VersionIdChangeReason) {

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

@@ -11,11 +11,12 @@ import { ITextModel } from "../../../../common/model.js";
 import { IFeatureDebounceInformation } from "../../../../common/services/languageFeatureDebounce.js";
 import { IModelContentChangedEvent } from "../../../../common/textModelEvents.js";
 import { InlineSuggestionIdentity, InlineSuggestionItem } from "./inlineSuggestionItem.js";
-import { InlineCompletionContextWithoutUuid, InlineCompletionProviderResult } from "./provideInlineCompletions.js";
+import { InlineCompletionContextWithoutUuid, InlineSuggestRequestInfo } from "./provideInlineCompletions.js";
 export declare class InlineCompletionsSource extends Disposable {
     private readonly _textModel;
     private readonly _versionId;
     private readonly _debounceValue;
+    private readonly _cursorPosition;
     private readonly _languageConfigurationService;
     private readonly _logService;
     private readonly _configurationService;
@@ -27,12 +28,12 @@ export declare class InlineCompletionsSource extends Disposable {
     private readonly _state;
     readonly inlineCompletions: IObservable<InlineCompletionsState>;
     readonly suggestWidgetInlineCompletions: IObservable<InlineCompletionsState>;
-    constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService);
+    constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _cursorPosition: IObservable<Position>, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService);
     readonly clearOperationOnTextModelChange: IObservableWithChange<undefined, void>;
     private _log;
     private readonly _loadingCount;
     readonly loading: IObservable<boolean>;
-    fetch(providers: InlineCompletionsProvider[], position: Position, context: InlineCompletionContextWithoutUuid, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, providerhasChangedCompletion: boolean): Promise<boolean>;
+    fetch(providers: InlineCompletionsProvider[], context: InlineCompletionContextWithoutUuid, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, providerhasChangedCompletion: boolean, requestInfo: InlineSuggestRequestInfo): Promise<boolean>;
     clear(tx: ITransaction): void;
     seedInlineCompletionsWithSuggestWidget(): void;
     clearSuggestWidgetInlineCompletions(tx: ITransaction): void;
@@ -42,7 +43,8 @@ declare class UpdateRequest {
     readonly position: Position;
     readonly context: InlineCompletionContextWithoutUuid;
     readonly versionId: number;
-    constructor(position: Position, context: InlineCompletionContextWithoutUuid, versionId: number);
+    readonly providers: Set<InlineCompletionsProvider>;
+    constructor(position: Position, context: InlineCompletionContextWithoutUuid, versionId: number, providers: Set<InlineCompletionsProvider>);
     satisfies(other: UpdateRequest): boolean;
     get isExplicitRequest(): boolean;
 }
@@ -54,7 +56,7 @@ declare class InlineCompletionsState extends Disposable {
     private _findById;
     private _findByHash;
     createStateWithAppliedEdit(edit: StringEdit, textModel: ITextModel): InlineCompletionsState;
-    createStateWithAppliedResults(update: InlineCompletionProviderResult, request: UpdateRequest, textModel: ITextModel, itemToPreserve: InlineSuggestionIdentity | undefined): InlineCompletionsState;
+    createStateWithAppliedResults(updatedSuggestions: InlineSuggestionItem[], request: UpdateRequest, textModel: ITextModel, cursorPosition: Position, itemIdToPreserveAtTop: InlineSuggestionIdentity | undefined): InlineCompletionsState;
     clone(): InlineCompletionsState;
 }
 export {};