add preceeded flag (microsoft#255891)

Author: benibenj

src/vs/editor/common/languages.ts

@@ -992,6 +992,7 @@ export type LifetimeSummary = {
 	editorType: string;
 	viewKind: string | undefined;
 	error: string | undefined;
+	preceeded: boolean;
 	languageId: string;
 	requestReason: string;
 	cursorColumnDistance?: number;

src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts

@@ -422,6 +422,7 @@ class InlineCompletionsState extends Disposable {
 			if (oldItem && oldItem !== i) {
 				item = i.withIdentity(oldItem.identity);
 				oldItem.setEndOfLifeReason({ kind: InlineCompletionEndOfLifeReasonKind.Ignored, userTypingDisagreed: false, supersededBy: i.getSourceCompletion() });
+				i.setIsPreceeded();
 			} else {
 				item = i;
 			}

src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts

@@ -120,6 +120,10 @@ abstract class InlineSuggestionItemBase {
 		this._data.reportInlineEditError(reason);
 	}
 
+	public setIsPreceeded(): void {
+		this._data.setIsPreceeded();
+	}
+
 	/**
 	 * Avoid using this method. Instead introduce getters for the needed properties.
 	*/

src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts

@@ -267,6 +267,7 @@ export class InlineSuggestData {
 	private _viewData: InlineSuggestViewData;
 	private _didReportEndOfLife = false;
 	private _lastSetEndOfLifeReason: InlineCompletionEndOfLifeReason | undefined = undefined;
+	private _isPreceeded = false;
 	private _partiallyAcceptedCount = 0;
 
 	constructor(
@@ -347,6 +348,7 @@ export class InlineSuggestData {
 				shown: this._didShow,
 				shownDuration: this._shownDuration,
 				shownDurationUncollapsed: this._showUncollapsedDuration,
+				preceeded: this._isPreceeded,
 				timeUntilShown: this._timeUntilShown,
 				editorType: this._viewData.editorType,
 				languageId: this._requestInfo.languageId,
@@ -369,6 +371,10 @@ export class InlineSuggestData {
 		}
 	}
 
+	public setIsPreceeded(): void {
+		this._isPreceeded = true;
+	}
+
 	/**
 	 * Sets the end of life reason, but does not send the event to the provider yet.
 	*/

src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts

@@ -446,15 +446,16 @@ export class InlineEditsView extends Disposable {
 		}));
 
 		const cursorPosition = inlineEdit.cursorPosition;
+		const startsWithEOL = stringChanges[0].modified.startsWith(textModel.getEOL());
 		const viewData: InlineCompletionViewData = {
 			cursorColumnDistance: inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
-			cursorLineDistance: inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber,
+			cursorLineDistance: inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber + (startsWithEOL && inlineEdit.lineEdit.lineRange.startLineNumber >= cursorPosition.lineNumber ? 1 : 0),
 			lineCountOriginal: inlineEdit.lineEdit.lineRange.length,
 			lineCountModified: inlineEdit.lineEdit.newLines.length,
 			characterCountOriginal: stringChanges.reduce((acc, r) => acc + r.original.length, 0),
 			characterCountModified: stringChanges.reduce((acc, r) => acc + r.modified.length, 0),
 			disjointReplacements: stringChanges.length,
-			sameShapeReplacements: stringChanges.length > 1 ? stringChanges.every(r => r.original === stringChanges[0].original && r.modified === stringChanges[0].modified) : undefined,
+			sameShapeReplacements: stringChanges.every(r => r.original === stringChanges[0].original && r.modified === stringChanges[0].modified),
 		};
 
 		switch (view) {

src/vs/monaco.d.ts

@@ -7565,6 +7565,7 @@ declare namespace monaco.languages {
 		editorType: string;
 		viewKind: string | undefined;
 		error: string | undefined;
+		preceeded: boolean;
 		languageId: string;
 		requestReason: string;
 		cursorColumnDistance?: number;

src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts

@@ -655,6 +655,7 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 					timeUntilShown: lifetimeSummary.timeUntilShown,
 					editorType: lifetimeSummary.editorType,
 					viewKind: lifetimeSummary.viewKind,
+					preceeded: lifetimeSummary.preceeded,
 					requestReason: lifetimeSummary.requestReason,
 					error: lifetimeSummary.error,
 					typingInterval: lifetimeSummary.typingInterval,
@@ -1308,6 +1309,7 @@ type InlineCompletionEndOfLifeEvent = {
 	timeUntilShown: number | undefined;
 	reason: 'accepted' | 'rejected' | 'ignored';
 	partiallyAccepted: number;
+	preceeded: boolean;
 	requestReason: string;
 	languageId: string;
 	error: string | undefined;
@@ -1338,6 +1340,7 @@ type InlineCompletionsEndOfLifeClassification = {
 	timeUntilShown: { 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' };
+	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' };
 	error: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The error message if the inline completion failed' };