Dont debounce inline completion request after accepting an inline completion

Author: hediet

src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts

@@ -113,7 +113,7 @@ export class TriggerInlineEditAction extends EditorCommand {
 
 	public override async runEditorCommand(accessor: ServicesAccessor | null, editor: ICodeEditor, args: { triggerKind?: 'automatic' | 'explicit' }): Promise<void> {
 		const controller = InlineCompletionsController.get(editor);
-		await controller?.model.get()?.trigger(undefined, true);
+		await controller?.model.get()?.trigger(undefined, { onlyFetchInlineEdits: true });
 	}
 }
 

src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts

@@ -175,9 +175,13 @@ export class InlineCompletionsController extends Disposable {
 				'acceptSelectedSuggestion',
 			]);
 			if (commands.has(e.commandId) && editor.hasTextFocus() && this._enabled.get()) {
+				let noDelay = false;
+				if (e.commandId === inlineSuggestCommitId) {
+					noDelay = true;
+				}
 				this._editorObs.forceUpdate(tx => {
 					/** @description onDidExecuteCommand */
-					this.model.get()?.trigger(tx);
+					this.model.get()?.trigger(tx, { noDelay });
 				});
 			}
 		}));

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

@@ -44,6 +44,7 @@ export class InlineCompletionsModel extends Disposable {
 	private readonly _isActive = observableValue<boolean>(this, false);
 	private readonly _onlyRequestInlineEditsSignal = observableSignal(this);
 	private readonly _forceUpdateExplicitlySignal = observableSignal(this);
+	private readonly _noDelaySignal = observableSignal(this);
 
 	// We use a semantic id to keep the same inline completion selected even if the provider reorders the completions.
 	private readonly _selectedInlineCompletionId = observableValue<string | undefined>(this, undefined);
@@ -167,6 +168,7 @@ export class InlineCompletionsModel extends Disposable {
 			preserveCurrentCompletion: false,
 			inlineCompletionTriggerKind: InlineCompletionTriggerKind.Automatic,
 			onlyRequestInlineEdits: false,
+			shouldDebounce: true,
 		}),
 		handleChange: (ctx, changeSummary) => {
 			/** @description fetch inline completions */
@@ -178,10 +180,13 @@ export class InlineCompletionsModel extends Disposable {
 				changeSummary.dontRefetch = true;
 			} else if (ctx.didChange(this._onlyRequestInlineEditsSignal)) {
 				changeSummary.onlyRequestInlineEdits = true;
+			} else if (ctx.didChange(this._noDelaySignal)) {
+				changeSummary.shouldDebounce = false;
 			}
 			return true;
 		},
 	}, (reader, changeSummary) => {
+		this._noDelaySignal.read(reader);
 		this.dontRefetchSignal.read(reader);
 		this._onlyRequestInlineEditsSignal.read(reader);
 		this._forceUpdateExplicitlySignal.read(reader);
@@ -220,14 +225,17 @@ export class InlineCompletionsModel extends Disposable {
 		const itemToPreserveCandidate = this.selectedInlineCompletion.get() ?? this._inlineCompletionItems.get()?.inlineEdit;
 		const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable
 			? itemToPreserveCandidate : undefined;
-		return this._source.fetch(cursorPosition, context, itemToPreserve);
+		return this._source.fetch(cursorPosition, context, itemToPreserve, changeSummary.shouldDebounce);
 	});
 
-	public async trigger(tx?: ITransaction, onlyFetchInlineEdits: boolean = false): Promise<void> {
+	public async trigger(tx?: ITransaction, options?: { onlyFetchInlineEdits?: boolean; noDelay?: boolean }): Promise<void> {
 		subtransaction(tx, tx => {
-			if (onlyFetchInlineEdits) {
+			if (options?.onlyFetchInlineEdits) {
 				this._onlyRequestInlineEditsSignal.trigger(tx);
 			}
+			if (options?.noDelay) {
+				this._noDelaySignal.trigger(tx);
+			}
 			this._isActive.set(true, tx);
 		});
 		await this._fetchInlineCompletionsPromise.get();

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

@@ -78,7 +78,7 @@ export class InlineCompletionsSource extends Disposable {
 
 	public readonly loading = observableValue(this, false);
 
-	public fetch(position: Position, context: InlineCompletionContext, activeInlineCompletion: InlineCompletionWithUpdatedRange | undefined): Promise<boolean> {
+	public fetch(position: Position, context: InlineCompletionContext, activeInlineCompletion: InlineCompletionWithUpdatedRange | undefined, withDebounce: boolean): Promise<boolean> {
 		const request = new UpdateRequest(position, context, this._textModel.getVersionId());
 
 		const target = context.selectedSuggestionInfo ? this.suggestWidgetInlineCompletions : this.inlineCompletions;
@@ -97,7 +97,8 @@ export class InlineCompletionsSource extends Disposable {
 		const source = new CancellationTokenSource();
 
 		const promise = (async () => {
-			const shouldDebounce = updateOngoing || context.triggerKind === InlineCompletionTriggerKind.Automatic;
+			// Debounce in any case if update is ongoing
+			const shouldDebounce = updateOngoing || (withDebounce && context.triggerKind === InlineCompletionTriggerKind.Automatic);
 			if (shouldDebounce) {
 				// This debounces the operation
 				await wait(this._debounceValue.get(this._textModel), source.token);