Add acceptance ratio for suggestions (microsoft#260521)

benibenj · web-flow · commit 55e0109f2942 · 2025-08-08T11:23:31.000+02:00
Add the ratio of the suggestion which was accepted
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
@@ -986,6 +986,9 @@ export type InlineCompletionEndOfLifeReason<TInlineCompletion = InlineCompletion
 export type LifetimeSummary = {
 	requestUuid: string;
 	partiallyAccepted: number;
+	partiallyAcceptedCountSinceOriginal: number;
+	partiallyAcceptedRatioSinceOriginal: number;
+	partiallyAcceptedCharactersSinceOriginal: number;
 	shown: boolean;
 	shownDuration: number;
 	shownDurationUncollapsed: number;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -984,7 +984,11 @@ export class InlineCompletionsModel extends Disposable {
 			// This assumes that the inline completion and the model use the same EOL style.
 			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();
@@ -1003,6 +1007,10 @@ export class InlineCompletionsModel extends Disposable {
 		augmentedCompletion.completion.reportPartialAccept(itemEdit.text.length, {
 			kind: PartialAcceptTriggerKind.Suggest,
 			acceptedLength,
+		}, {
+			characters: itemEdit.text.length,
+			count: 1,
+			ratio: 1
 		});
 	}
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -421,8 +421,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;
 			}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts
@@ -21,7 +21,7 @@ import { linesDiffComputers } from '../../../../common/diff/linesDiffComputers.j
 import { InlineCompletion, InlineCompletionTriggerKind, Command, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionEndOfLifeReason } from '../../../../common/languages.js';
 import { ITextModel, EndOfLinePreference } from '../../../../common/model.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
-import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, SnippetInfo } from './provideInlineCompletions.js';
+import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, PartialAcceptance, SnippetInfo } from './provideInlineCompletions.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
@@ -75,6 +75,8 @@ abstract class InlineSuggestionItemBase {
 
 	public get requestUuid(): string { return this._data.context.requestUuid; }
 
+	public get partialAccepts(): PartialAcceptance { return this._data.partialAccepts; }
+
 	/**
 	 * A reference to the original inline completion this inline completion has been constructed from.
 	 * Used for event data to ensure referential equality.
@@ -104,8 +106,8 @@ abstract class InlineSuggestionItemBase {
 		this._data.reportInlineEditShown(commandService, this.insertText, viewKind, viewData);
 	}
 
-	public reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo) {
-		this._data.reportPartialAccept(acceptedCharacters, info);
+	public reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo, partialAcceptance: PartialAcceptance) {
+		this._data.reportPartialAccept(acceptedCharacters, info, partialAcceptance);
 	}
 
 	public reportEndOfLife(reason: InlineCompletionEndOfLifeReason): void {
@@ -120,8 +122,8 @@ abstract class InlineSuggestionItemBase {
 		this._data.reportInlineEditError(reason);
 	}
 
-	public setIsPreceeded(): void {
-		this._data.setIsPreceeded();
+	public setIsPreceeded(item: InlineSuggestionItem): void {
+		this._data.setIsPreceeded(item.partialAccepts);
 	}
 
 	/**
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -258,6 +258,12 @@ export type InlineSuggestProviderRequestInfo = {
 	endTime: number;
 };
 
+export type PartialAcceptance = {
+	characters: number;
+	count: number;
+	ratio: number;
+};
+
 export type InlineSuggestViewData = {
 	editorType: InlineCompletionEditorType;
 	renderData?: InlineCompletionViewData;
@@ -278,6 +284,7 @@ export class InlineSuggestData {
 	private _lastSetEndOfLifeReason: InlineCompletionEndOfLifeReason | undefined = undefined;
 	private _isPreceeded = false;
 	private _partiallyAcceptedCount = 0;
+	private _partiallyAcceptedSinceOriginal: PartialAcceptance = { characters: 0, ratio: 0, count: 0 };
 
 	constructor(
 		public readonly range: Range,
@@ -299,6 +306,8 @@ export class InlineSuggestData {
 
 	public get showInlineEditMenu() { return this.sourceInlineCompletion.showInlineEditMenu ?? false; }
 
+	public get partialAccepts(): PartialAcceptance { return this._partiallyAcceptedSinceOriginal; }
+
 	public getSingleTextEdit() {
 		return new TextReplacement(this.range, this.insertText);
 	}
@@ -321,8 +330,12 @@ export class InlineSuggestData {
 		}
 	}
 
-	public reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo) {
+	public reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo, partialAcceptance: PartialAcceptance) {
 		this._partiallyAcceptedCount++;
+		this._partiallyAcceptedSinceOriginal.characters += partialAcceptance.characters;
+		this._partiallyAcceptedSinceOriginal.ratio = Math.min(this._partiallyAcceptedSinceOriginal.ratio + (1 - this._partiallyAcceptedSinceOriginal.ratio) * partialAcceptance.ratio, 1);
+		this._partiallyAcceptedSinceOriginal.count += partialAcceptance.count;
+
 		this.source.provider.handlePartialAccept?.(
 			this.source.inlineSuggestions,
 			this.sourceInlineCompletion,
@@ -355,6 +368,9 @@ export class InlineSuggestData {
 			const summary: LifetimeSummary = {
 				requestUuid: this.context.requestUuid,
 				partiallyAccepted: this._partiallyAcceptedCount,
+				partiallyAcceptedCountSinceOriginal: this._partiallyAcceptedSinceOriginal.count,
+				partiallyAcceptedRatioSinceOriginal: this._partiallyAcceptedSinceOriginal.ratio,
+				partiallyAcceptedCharactersSinceOriginal: this._partiallyAcceptedSinceOriginal.characters,
 				shown: this._didShow,
 				shownDuration: this._shownDuration,
 				shownDurationUncollapsed: this._showUncollapsedDuration,
@@ -383,8 +399,13 @@ export class InlineSuggestData {
 		}
 	}
 
-	public setIsPreceeded(): void {
+	public setIsPreceeded(partialAccepts: PartialAcceptance): void {
 		this._isPreceeded = true;
+
+		if (this._partiallyAcceptedSinceOriginal.characters !== 0 || this._partiallyAcceptedSinceOriginal.ratio !== 0 || this._partiallyAcceptedSinceOriginal.count !== 0) {
+			console.warn('Expected partiallyAcceptedCountSinceOriginal to be { characters: 0, rate: 0, partialAcceptances: 0 } before setIsPreceeded.');
+		}
+		this._partiallyAcceptedSinceOriginal = partialAccepts;
 	}
 
 	/**
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -7626,6 +7626,9 @@ declare namespace monaco.languages {
 	export type LifetimeSummary = {
 		requestUuid: string;
 		partiallyAccepted: number;
+		partiallyAcceptedCountSinceOriginal: number;
+		partiallyAcceptedRatioSinceOriginal: number;
+		partiallyAcceptedCharactersSinceOriginal: number;
 		shown: boolean;
 		shownDuration: number;
 		shownDurationUncollapsed: number;
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -676,6 +676,9 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 					extensionId,
 					extensionVersion,
 					partiallyAccepted: lifetimeSummary.partiallyAccepted,
+					partiallyAcceptedCountSinceOriginal: lifetimeSummary.partiallyAcceptedCountSinceOriginal,
+					partiallyAcceptedRatioSinceOriginal: lifetimeSummary.partiallyAcceptedRatioSinceOriginal,
+					partiallyAcceptedCharactersSinceOriginal: lifetimeSummary.partiallyAcceptedCharactersSinceOriginal,
 					superseded: reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored && !!reason.supersededBy,
 					reason: reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted ? 'accepted'
 						: reason.kind === InlineCompletionEndOfLifeReasonKind.Rejected ? 'rejected'
@@ -1317,6 +1320,9 @@ type InlineCompletionEndOfLifeEvent = {
 	timeUntilProviderResponse: number;
 	reason: 'accepted' | 'rejected' | 'ignored';
 	partiallyAccepted: number;
+	partiallyAcceptedCountSinceOriginal: number;
+	partiallyAcceptedRatioSinceOriginal: number;
+	partiallyAcceptedCharactersSinceOriginal: number;
 	preceeded: boolean;
 	requestReason: string;
 	languageId: string;
@@ -1350,6 +1356,9 @@ type InlineCompletionsEndOfLifeClassification = {
 	timeUntilProviderResponse: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The time it took for the inline completion to be shown after the request' };
 	reason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason for the inline completion ending' };
 	partiallyAccepted: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How often the inline completion was partially accepted by the user' };
+	partiallyAcceptedCountSinceOriginal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How often the inline completion was partially accepted since the original request' };
+	partiallyAcceptedRatioSinceOriginal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The percentage of characters accepted since the original request' };
+	partiallyAcceptedCharactersSinceOriginal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The character count accepted since the original request' };
 	preceeded: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the inline completion was preceeded by another one' };
 	languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language ID of the document where the inline completion was shown' };
 	requestReason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason for the inline completion request' };
