@codingame/monaco-vscode-api 20.5.0 → 21.0.1

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js

@@ -97,8 +97,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1291, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1292, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1293, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1294, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this.hot = createHotClass(InlineSuggestionHintsContentWidget_1); }
@@ -116,7 +116,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1293, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1295, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -164,9 +164,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1294, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1296, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1295, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1297, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(( new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';

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

@@ -20,6 +20,7 @@ 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";
+import { URI } from "../../../../../base/common/uri.js";
 export declare class InlineCompletionsModel extends Disposable {
     readonly textModel: ITextModel;
     private readonly _selectedSuggestItem;
@@ -57,6 +58,8 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _inlineEditsEnabled;
     private readonly _inlineEditsShowCollapsedEnabled;
     private readonly _triggerCommandOnProviderChange;
+    private readonly _minShowDelay;
+    private readonly _showOnSuggestConflict;
     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;
@@ -70,6 +73,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private _getReason;
     readonly dontRefetchSignal: import("../../../../../base/common/observable.js").IObservableSignal<void>;
     private readonly _fetchInlineCompletionsPromise;
+    private getAvailableProviders;
     trigger(tx?: ITransaction, options?: {
         onlyFetchInlineEdits?: boolean;
         noDelay?: boolean;
@@ -84,6 +88,7 @@ export declare class InlineCompletionsModel extends Disposable {
     readonly lastTriggerKind: IObservable<InlineCompletionTriggerKind | undefined>;
     readonly inlineCompletionsCount: IObservableWithChange<number | undefined, void>;
     private readonly _hasVisiblePeekWidgets;
+    private readonly _shouldShowOnSuggestConflict;
     readonly state: IObservable<{
         kind: "ghostText";
         edits: readonly TextReplacement[];
@@ -97,6 +102,7 @@ export declare class InlineCompletionsModel extends Disposable {
         inlineEdit: InlineEdit;
         inlineCompletion: InlineEditItem;
         cursorAtInlineEdit: IObservable<boolean>;
+        nextEditUri: URI | undefined;
     } | undefined>;
     readonly status: IObservableWithChange<"loading" | "ghostText" | "inlineEdit" | "noSuggestion", void>;
     readonly inlineCompletionState: IObservableWithChange<{
@@ -113,6 +119,7 @@ export declare class InlineCompletionsModel extends Disposable {
         inlineEdit: InlineEdit;
         inlineCompletion: InlineEditItem;
         cursorAtInlineEdit: IObservable<boolean>;
+        nextEditUri: URI | undefined;
     } | undefined, void>;
     readonly inlineEditAvailable: IObservableWithChange<boolean, void>;
     private _computeAugmentation;

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

@@ -41,6 +41,7 @@ import { IInlineCompletionsService } from '../../../../browser/services/inlineCo
 import { TypingInterval } from './typingSpeed.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { 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';
@@ -178,7 +179,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             this._textModelVersionId.read(reader);
             const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.get();
-            const suggestItem = this._selectedSuggestItem.read(reader);
+            let suggestItem = this._selectedSuggestItem.read(reader);
+            if (this._shouldShowOnSuggestConflict.get()) {
+                suggestItem = undefined;
+            }
             if (suggestWidgetInlineCompletions && !suggestItem) {
                 this._source.seedInlineCompletionsWithSuggestWidget();
             }
@@ -216,6 +220,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 includeInlineCompletions: !changeSummary.onlyRequestInlineEdits,
                 includeInlineEdits: this._inlineEditsEnabled.read(reader),
                 requestIssuedDateTime: requestInfo.startTime,
+                earliestShownDateTime: requestInfo.startTime + (changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit || this.inAcceptFlow.get() ? 0 : this._minShowDelay.get()),
             };
             if (context.triggerKind === InlineCompletionTriggerKind.Automatic && changeSummary.textChange) {
                 if (this.textModel.getAlternativeVersionId() === this._lastShownInlineCompletionInfo?.alternateTextModelVersionId) {
@@ -235,9 +240,8 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const providers = changeSummary.provider
                 ? { providers: [changeSummary.provider], label: 'single:' + changeSummary.provider.providerId?.toString() }
                 : { providers: this._languageFeaturesService.inlineCompletionsProvider.all(this.textModel), label: undefined };
-            const suppressedProviderGroupIds = this._suppressedInlineCompletionGroupIds.get();
-            const availableProviders = providers.providers.filter(provider => !(provider.groupId && ( suppressedProviderGroupIds.has(provider.groupId))));
-            return this._source.fetch(availableProviders, providers.label, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, !!changeSummary.provider, requestInfo);
+            const availableProviders = this.getAvailableProviders(providers.providers);
+            return this._source.fetch(availableProviders, providers.label, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, requestInfo);
         });
         this._inlineCompletionItems = derivedOpts({ owner: this }, reader => {
             const c = this._source.inlineCompletions.read(reader);
@@ -295,6 +299,23 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
         });
         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') {
+                const hasInlineCompletion = !!this.selectedInlineCompletion.read(reader);
+                if (hasInlineCompletion) {
+                    const item = this._selectedSuggestItem.read(reader);
+                    if (!item) {
+                        return false;
+                    }
+                    if (showOnSuggestConflict === 'whenSuggestListIsIncomplete') {
+                        return item.listIncomplete;
+                    }
+                    return true;
+                }
+            }
+            return false;
+        });
         this.state = derivedOpts({
             owner: this,
             equalsFn: (a, b) => {
@@ -328,10 +349,12 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const inlineEdit = ( new InlineEdit(edit, commands ?? [], inlineEditResult));
                 const edits = inlineEditResult.updatedEdit;
                 const e = edits ? TextEdit.fromStringEdit(edits, ( new TextModelText(this.textModel))).replacements : [edit];
-                return { kind: 'inlineEdit', inlineEdit, inlineCompletion: inlineEditResult, edits: e, cursorAtInlineEdit };
+                const nextEditUri = (item.inlineEdit?.command?.id === 'vscode.open' || item.inlineEdit?.command?.id === '_workbench.open') &&
+                    item.inlineEdit?.command.arguments?.length ? ( URI.from(item.inlineEdit?.command.arguments[0])) : undefined;
+                return { kind: 'inlineEdit', inlineEdit, inlineCompletion: inlineEditResult, edits: e, cursorAtInlineEdit, nextEditUri };
             }
             const suggestItem = this._selectedSuggestItem.read(reader);
-            if (suggestItem) {
+            if (!this._shouldShowOnSuggestConflict.read(reader) && suggestItem) {
                 const suggestCompletionEdit = singleTextRemoveCommonPrefix(suggestItem.getSingleTextEdit(), model);
                 const augmentation = this._computeAugmentation(suggestCompletionEdit, reader);
                 const isSuggestionPreviewEnabled = this._suggestPreviewEnabled.read(reader);
@@ -509,13 +532,17 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         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);
-        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.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));
+        const suggest = this._editorObs.getOption(EditorOption.suggest);
+        this._suggestPreviewEnabled = ( suggest.map(v => v.preview));
+        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._inlineEditsEnabled = ( inlineSuggest.map(v => !!v.edits.enabled));
+        this._inlineEditsShowCollapsedEnabled = ( inlineSuggest.map(s => s.edits.showCollapsed));
+        this._triggerCommandOnProviderChange = ( inlineSuggest.map(s => s.triggerCommandOnProviderChange));
+        this._minShowDelay = ( inlineSuggest.map(s => s.minShowDelay));
+        this._showOnSuggestConflict = ( inlineSuggest.map(s => s.experimental.showOnSuggestConflict));
         this._typing = this._register(( new TypingInterval(this.textModel)));
         this._register(this._inlineCompletionsService.onDidChangeIsSnoozing((isSnoozing) => {
             if (isSnoozing) {
@@ -532,6 +559,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 : this.isInDiffEditor ? InlineCompletionEditorType.DiffEditor
                     : InlineCompletionEditorType.TextEditor;
         }
+        this._register(recomputeInitiallyAndOnChange(this.state, (s) => {
+            if (s && s.inlineCompletion) {
+                this._inlineCompletionsService.reportNewCompletion(s.inlineCompletion.requestUuid);
+            }
+        }));
         this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletionsPromise));
         this._register(autorun(reader => {
             this._editorObs.versionId.read(reader);
@@ -625,6 +657,22 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         return VersionIdChangeReason.Other;
     }
+    getAvailableProviders(providers) {
+        const suppressedProviderGroupIds = this._suppressedInlineCompletionGroupIds.get();
+        const unsuppressedProviders = providers.filter(provider => !(provider.groupId && ( suppressedProviderGroupIds.has(provider.groupId))));
+        const excludedGroupIds = ( new Set());
+        for (const provider of unsuppressedProviders) {
+            provider.excludesGroupIds?.forEach(p => excludedGroupIds.add(p));
+        }
+        const availableProviders = [];
+        for (const provider of unsuppressedProviders) {
+            if (provider.groupId && ( excludedGroupIds.has(provider.groupId))) {
+                continue;
+            }
+            availableProviders.push(provider);
+        }
+        return availableProviders;
+    }
     async trigger(tx, options) {
         subtransaction(tx, tx => {
             if (options?.onlyFetchInlineEdits) {
@@ -686,12 +734,13 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     async next() { await this._deltaSelectedInlineCompletionIndex(1); }
     async previous() { await this._deltaSelectedInlineCompletionIndex(-1); }
-    _getMetadata(completion, type = undefined) {
+    _getMetadata(completion, languageId, type = undefined) {
         if (type) {
             return EditSources.inlineCompletionPartialAccept({
                 nes: completion.isInlineEdit,
                 requestUuid: completion.requestUuid,
                 providerId: completion.source.provider.providerId,
+                languageId,
                 type,
             });
         }
@@ -700,6 +749,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 nes: completion.isInlineEdit,
                 requestUuid: completion.requestUuid,
                 providerId: completion.source.provider.providerId,
+                languageId
             });
         }
     }
@@ -708,6 +758,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             throw ( new BugIndicatingError());
         }
         let completion;
+        let isNextEditUri = false;
         const state = this.state.get();
         if (state?.kind === 'ghostText') {
             if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
@@ -717,6 +768,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         else if (state?.kind === 'inlineEdit') {
             completion = state.inlineCompletion;
+            isNextEditUri = !!state.nextEditUri;
         }
         else {
             return;
@@ -724,11 +776,13 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         completion.addRef();
         try {
             editor.pushUndoStop();
-            if (completion.snippetInfo) {
+            if (isNextEditUri) {
+            }
+            else if (completion.snippetInfo) {
                 const mainEdit = TextReplacement.delete(completion.editRange);
                 const additionalEdits = ( completion.additionalTextEdits.map(e => ( new TextReplacement(Range.lift(e.range), e.text ?? ''))));
                 const edit = TextEdit.fromParallelReplacementsUnsorted([mainEdit, ...additionalEdits]);
-                editor.edit(edit, this._getMetadata(completion));
+                editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
                 editor.setPosition(completion.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
                 SnippetController2.get(editor)?.insert(completion.snippetInfo.snippet, { undoStopBefore: false });
             }
@@ -741,7 +795,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 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));
+                editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
                 if (completion.displayLocation === undefined) {
                     editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
                 }
@@ -849,7 +903,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             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 });
+            completion.reportPartialAccept(acceptedLength, { kind, acceptedLength: acceptedLength }, { characters: acceptUntilIndexExclusive, ratio: acceptUntilIndexExclusive / ghostTextVal.length, count: 1 });
         }
         finally {
             completion.removeRef();
@@ -866,6 +920,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         augmentedCompletion.completion.reportPartialAccept(itemEdit.text.length, {
             kind: PartialAcceptTriggerKind.Suggest,
             acceptedLength,
+        }, {
+            characters: itemEdit.text.length,
+            count: 1,
+            ratio: 1
         });
     }
     extractReproSample() {

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

@@ -33,7 +33,7 @@ export declare class InlineCompletionsSource extends Disposable {
     private _log;
     private readonly _loadingCount;
     readonly loading: IObservable<boolean>;
-    fetch(providers: InlineCompletionsProvider[], providersLabel: string | undefined, context: InlineCompletionContextWithoutUuid, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, providerhasChangedCompletion: boolean, requestInfo: InlineSuggestRequestInfo): Promise<boolean>;
+    fetch(providers: InlineCompletionsProvider[], providersLabel: string | undefined, context: InlineCompletionContextWithoutUuid, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, requestInfo: InlineSuggestRequestInfo): Promise<boolean>;
     clear(tx: ITransaction): void;
     seedInlineCompletionsWithSuggestWidget(): void;
     clearSuggestWidgetInlineCompletions(tx: ITransaction): void;

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

@@ -88,11 +88,11 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         }
         this._structuredFetchLogger.log(entry);
     }
-    fetch(providers, providersLabel, context, activeInlineCompletion, withDebounce, userJumpedToActiveCompletion, providerhasChangedCompletion, requestInfo) {
+    fetch(providers, providersLabel, context, activeInlineCompletion, withDebounce, userJumpedToActiveCompletion, requestInfo) {
         const position = this._cursorPosition.get();
         const request = ( new UpdateRequest(position, context, this._textModel.getVersionId(), ( new Set(providers))));
         const target = context.selectedSuggestionInfo ? this.suggestWidgetInlineCompletions.get() : this.inlineCompletions.get();
-        if (!providerhasChangedCompletion && this._updateOperation.value?.request.satisfies(request)) {
+        if (this._updateOperation.value?.request.satisfies(request)) {
             return this._updateOperation.value.promise;
         }
         else if (target?.request?.satisfies(request)) {
@@ -172,6 +172,10 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
                     })));
                     this._log({ sourceId: 'InlineCompletions.fetch', kind: 'end', requestId, durationMs: (Date.now() - startTime.getTime()), error, result, time: Date.now(), didAllProvidersReturn });
                 }
+                const remainingTimeToWait = context.earliestShownDateTime - Date.now();
+                if (remainingTimeToWait > 0) {
+                    await wait(remainingTimeToWait, source.token);
+                }
                 if (source.token.isCancellationRequested || this._store.isDisposed || this._textModel.getVersionId() !== request.versionId
                     || userJumpedToActiveCompletion.get() ) {
                     return false;
@@ -338,8 +342,8 @@ class InlineCompletionsState extends Disposable {
             let item;
             if (oldItem && oldItem !== i) {
                 item = i.withIdentity(oldItem.identity);
+                i.setIsPreceeded(oldItem);
                 oldItem.setEndOfLifeReason({ kind: InlineCompletionEndOfLifeReasonKind.Ignored, userTypingDisagreed: false, supersededBy: i.getSourceCompletion() });
-                i.setIsPreceeded();
             }
             else {
                 item = i;

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

@@ -6,9 +6,9 @@ import { Position } from "../../../../common/core/position.js";
 import { PositionOffsetTransformerBase } from "../../../../common/core/text/positionToOffset.js";
 import { Range } from "../../../../common/core/range.js";
 import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { InlineCompletion, Command, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionEndOfLifeReason } from "../../../../common/languages.js";
+import { InlineCompletion, Command, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionEndOfLifeReason, InlineCompletionDisplayLocationKind } from "../../../../common/languages.js";
 import { ITextModel } from "../../../../common/model.js";
-import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, SnippetInfo } from "./provideInlineCompletions.js";
+import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, PartialAcceptance, SnippetInfo } from "./provideInlineCompletions.js";
 import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inlineEdits/inlineEditsViewInterface.js";
 export type InlineSuggestionItem = InlineEditItem | InlineCompletionItem;
 export declare namespace InlineSuggestionItem {
@@ -38,6 +38,7 @@ declare abstract class InlineSuggestionItemBase {
     /** @deprecated */
     get shownCommand(): Command | undefined;
     get requestUuid(): string;
+    get partialAccepts(): PartialAcceptance;
     /**
      * A reference to the original inline completion this inline completion has been constructed from.
      * Used for event data to ensure referential equality.
@@ -50,11 +51,11 @@ declare abstract class InlineSuggestionItemBase {
     addRef(): void;
     removeRef(): void;
     reportInlineEditShown(commandService: ICommandService, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): void;
-    reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo): void;
+    reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo, partialAcceptance: PartialAcceptance): void;
     reportEndOfLife(reason: InlineCompletionEndOfLifeReason): void;
     setEndOfLifeReason(reason: InlineCompletionEndOfLifeReason): void;
     reportInlineEditError(reason: string): void;
-    setIsPreceeded(): void;
+    setIsPreceeded(item: InlineSuggestionItem): void;
     /**
      * Avoid using this method. Instead introduce getters for the needed properties.
     */
@@ -72,6 +73,7 @@ export declare class InlineSuggestionIdentity {
 declare class InlineSuggestDisplayLocation implements IDisplayLocation {
     readonly range: Range;
     readonly label: string;
+    readonly kind: InlineCompletionDisplayLocationKind;
     static create(displayLocation: IDisplayLocation): InlineSuggestDisplayLocation;
     private constructor();
     withEdit(edit: StringEdit, positionOffsetTransformer: PositionOffsetTransformerBase): InlineSuggestDisplayLocation | undefined;

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

@@ -54,6 +54,7 @@ class InlineSuggestionItemBase {
     }
     get shownCommand() { return this._sourceInlineCompletion.shownCommand; }
     get requestUuid() { return this._data.context.requestUuid; }
+    get partialAccepts() { return this._data.partialAccepts; }
     get _sourceInlineCompletion() { return this._data.sourceInlineCompletion; }
     addRef() {
         this.identity.addRef();
@@ -66,8 +67,8 @@ class InlineSuggestionItemBase {
     reportInlineEditShown(commandService, viewKind, viewData) {
         this._data.reportInlineEditShown(commandService, this.insertText, viewKind, viewData);
     }
-    reportPartialAccept(acceptedCharacters, info) {
-        this._data.reportPartialAccept(acceptedCharacters, info);
+    reportPartialAccept(acceptedCharacters, info, partialAcceptance) {
+        this._data.reportPartialAccept(acceptedCharacters, info, partialAcceptance);
     }
     reportEndOfLife(reason) {
         this._data.reportEndOfLife(reason);
@@ -78,8 +79,8 @@ class InlineSuggestionItemBase {
     reportInlineEditError(reason) {
         this._data.reportInlineEditError(reason);
     }
-    setIsPreceeded() {
-        this._data.setIsPreceeded();
+    setIsPreceeded(item) {
+        this._data.setIsPreceeded(item.partialAccepts);
     }
     getSourceCompletion() {
         return this._sourceInlineCompletion;
@@ -105,11 +106,12 @@ class InlineSuggestionIdentity {
 }
 class InlineSuggestDisplayLocation {
     static create(displayLocation) {
-        return ( new InlineSuggestDisplayLocation(displayLocation.range, displayLocation.label));
+        return ( new InlineSuggestDisplayLocation(displayLocation.range, displayLocation.label, displayLocation.kind));
     }
-    constructor(range, label) {
+    constructor(range, label, kind) {
         this.range = range;
         this.label = label;
+        this.kind = kind;
     }
     withEdit(edit, positionOffsetTransformer) {
         const offsetRange = ( new OffsetRange(
@@ -121,7 +123,7 @@ class InlineSuggestDisplayLocation {
             return undefined;
         }
         const newRange = positionOffsetTransformer.getRange(newOffsetRange);
-        return ( new InlineSuggestDisplayLocation(newRange, this.label));
+        return ( new InlineSuggestDisplayLocation(newRange, this.label, this.kind));
     }
 }
 class InlineCompletionItem extends InlineSuggestionItemBase {

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

@@ -6,7 +6,7 @@ import { ISingleEditOperation } from "../../../../common/core/editOperation.js";
 import { Position } from "../../../../common/core/position.js";
 import { Range } from "../../../../common/core/range.js";
 import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { InlineCompletionEndOfLifeReason, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason } from "../../../../common/languages.js";
+import { InlineCompletionEndOfLifeReason, InlineCompletionDisplayLocationKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
 import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inlineEdits/inlineEditsViewInterface.js";
@@ -27,6 +27,15 @@ export type InlineSuggestRequestInfo = {
     typingInterval: number;
     typingIntervalCharacterCount: number;
 };
+export type InlineSuggestProviderRequestInfo = {
+    startTime: number;
+    endTime: number;
+};
+export type PartialAcceptance = {
+    characters: number;
+    count: number;
+    ratio: number;
+};
 export type InlineSuggestViewData = {
     editorType: InlineCompletionEditorType;
     renderData?: InlineCompletionViewData;
@@ -44,6 +53,8 @@ export declare class InlineSuggestData {
     readonly context: InlineCompletionContext;
     readonly isInlineEdit: boolean;
     private readonly _requestInfo;
+    private readonly _providerRequestInfo;
+    private readonly _correlationId;
     private _didShow;
     private _timeUntilShown;
     private _showStartTime;
@@ -55,11 +66,13 @@ export declare class InlineSuggestData {
     private _lastSetEndOfLifeReason;
     private _isPreceeded;
     private _partiallyAcceptedCount;
-    constructor(range: Range, insertText: string, snippetInfo: SnippetInfo | undefined, displayLocation: IDisplayLocation | undefined, additionalTextEdits: readonly ISingleEditOperation[], sourceInlineCompletion: InlineCompletion, source: InlineSuggestionList, context: InlineCompletionContext, isInlineEdit: boolean, _requestInfo: InlineSuggestRequestInfo);
+    private _partiallyAcceptedSinceOriginal;
+    constructor(range: Range, insertText: string, snippetInfo: SnippetInfo | undefined, displayLocation: IDisplayLocation | undefined, additionalTextEdits: readonly ISingleEditOperation[], sourceInlineCompletion: InlineCompletion, source: InlineSuggestionList, context: InlineCompletionContext, isInlineEdit: boolean, _requestInfo: InlineSuggestRequestInfo, _providerRequestInfo: InlineSuggestProviderRequestInfo, _correlationId: string | undefined);
     get showInlineEditMenu(): boolean;
+    get partialAccepts(): PartialAcceptance;
     getSingleTextEdit(): TextReplacement;
     reportInlineEditShown(commandService: ICommandService, updatedInsertText: string, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): Promise<void>;
-    reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo): void;
+    reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo, partialAcceptance: PartialAcceptance): void;
     /**
      * Sends the end of life event to the provider.
      * If no reason is provided, the last set reason is used.
@@ -67,7 +80,7 @@ export declare class InlineSuggestData {
     */
     reportEndOfLife(reason?: InlineCompletionEndOfLifeReason): void;
     reportInlineEditError(message: string): void;
-    setIsPreceeded(): void;
+    setIsPreceeded(partialAccepts: PartialAcceptance): void;
     /**
      * Sets the end of life reason, but does not send the event to the provider yet.
     */
@@ -82,6 +95,7 @@ export interface SnippetInfo {
 export interface IDisplayLocation {
     range: Range;
     label: string;
+    kind: InlineCompletionDisplayLocationKind;
 }
 export declare enum InlineCompletionEditorType {
     TextEditor = "textEditor",