JointInlineCompletionProvider fixes (#2291)

* JointInlineCompletionProvider fixes

* careful to not error if nes provider is undefined

---------

Co-authored-by: ulugbekna <[email protected]>

Author: hediet

src/extension/completions-core/vscode-node/extension/src/inlineCompletion.ts

@@ -58,7 +58,7 @@ export class CopilotInlineCompletionItemProvider extends Disposable implements I
 	pendingRequests: Set<Promise<unknown>> = new Set();
 
 	public onDidChange = undefined;
-	public handleListEndOfLifetime = undefined;
+	public handleListEndOfLifetime: InlineCompletionItemProvider['handleListEndOfLifetime'] = undefined;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,

src/extension/inlineEdits/vscode-node/inlineCompletionProvider.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, Command, EndOfLine, InlineCompletionContext, InlineCompletionDisplayLocation, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletionItem, InlineCompletionItemProvider, InlineCompletionList, InlineCompletionsDisposeReason, InlineCompletionsDisposeReasonKind, NotebookCell, NotebookCellKind, Position, Range, TextDocument, TextDocumentShowOptions, Event as vscodeEvent, window, workspace } from 'vscode';
 import * as l10n from '@vscode/l10n';
+import { CancellationToken, Command, EndOfLine, InlineCompletionContext, InlineCompletionDisplayLocation, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletionItem, InlineCompletionItemProvider, InlineCompletionList, InlineCompletionsDisposeReason, InlineCompletionsDisposeReasonKind, NotebookCell, NotebookCellKind, Position, Range, TextDocument, TextDocumentShowOptions, Event as vscodeEvent, window, workspace } from 'vscode';
 import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { IDiffService } from '../../../platform/diff/common/diffService';
 import { stringEditFromDiff } from '../../../platform/editing/common/edit';

src/extension/inlineEdits/vscode-node/jointInlineCompletionProvider.ts

@@ -17,7 +17,6 @@ import { ILogService } from '../../../platform/log/common/logService';
 import { isNotebookCell } from '../../../util/common/notebooks';
 import { createTracer } from '../../../util/common/tracing';
 import { assertNever, softAssert } from '../../../util/vs/base/common/assert';
-import { StatefulPromise } from '../../../util/vs/base/common/async';
 import { CancellationTokenSource } from '../../../util/vs/base/common/cancellation';
 import { Disposable, DisposableStore } from '../../../util/vs/base/common/lifecycle';
 import { autorun, derived, derivedDisposable, observableFromEvent } from '../../../util/vs/base/common/observable';
@@ -192,9 +191,9 @@ export class JointCompletionsProviderContribution extends Disposable implements
 				'*',
 				singularProvider,
 				{
-					displayName: 'completions+nes',
+					displayName: inlineEditProvider?.displayName,
 					debounceDelayMs: 0, // set 0 debounce to ensure consistent delays/timings
-					groupId: 'completions+nes', // FIXME@ulugbekna: is this ok?
+					groupId: 'nes',
 					excludes,
 				})
 			);
@@ -275,29 +274,46 @@ class JointCompletionsProvider extends Disposable implements vscode.InlineComple
 				completionsP = this._completionsProvider.provideInlineCompletionItems(document, position, context, token);
 			}
 
-			let nesP: StatefulPromise<NesCompletionList | undefined> | undefined;
+			let nesEndOfLifeReason: vscode.InlineCompletionsDisposeReason | undefined = undefined;
+			let nesP: Promise<NesCompletionList | undefined> | undefined;
 			if (this._inlineEditProvider === undefined) {
 				tracer.trace(`- no NES provider`);
 				nesP = undefined;
 			} else {
 				tracer.trace(`- requesting NES provideInlineCompletionItems`);
-				nesP = new StatefulPromise(this._inlineEditProvider.provideInlineCompletionItems(document, position, context, nesCts.token));
+				nesP = this._inlineEditProvider.provideInlineCompletionItems(document, position, context, nesCts.token).then(v => {
+					if (nesEndOfLifeReason !== undefined) {
+						for (const item of (v?.items as NesCompletionItem[]) ?? []) {
+							this._inlineEditProvider?.handleEndOfLifetime?.(item, { kind: vscode.InlineCompletionEndOfLifeReasonKind.Ignored, userTypingDisagreed: false });
+						}
+						this._inlineEditProvider?.handleListEndOfLifetime?.(v!, nesEndOfLifeReason);
+						return undefined;
+					}
+					return v;
+				});
 			}
 
 			tracer.trace(`waiting for completions response`);
 
 			const completionsR = completionsP ? await completionsP : undefined;
 			tracer.trace(`got completions response in ${sw.elapsed()}ms -- ${completionsR === undefined ? 'undefined' : `with ${completionsR.items.length} items`}`);
 
-			if (completionsR && completionsR.items.length > 0) {
-				tracer.trace(`using completions response, cancelling NES provider`);
-				nesCts.cancel(); // cancel NES request if completions are available
-				const list: SingularCompletionList = toCompletionsList(completionsR);
-				tracer.returns(`use completions response in ${sw.elapsed()}ms`);
-				return list;
+			if (completionsR) {
+				if (completionsR.items.length === 0) {
+					this._completionsProvider?.handleListEndOfLifetime?.(completionsR, { kind: vscode.InlineCompletionsDisposeReasonKind.NotTaken });
+				} else {
+					tracer.trace(`using completions response, cancelling NES provider`);
+					nesCts.cancel(); // cancel NES request if completions are available
+					const list: SingularCompletionList = toCompletionsList(completionsR);
+					tracer.returns(`use completions response in ${sw.elapsed()}ms`);
+
+					nesEndOfLifeReason = { kind: vscode.InlineCompletionsDisposeReasonKind.LostRace };
+
+					return list;
+				}
 			}
 
-			const nesR = nesP ? await nesP.promise : undefined;
+			const nesR = nesP ? await nesP : undefined;
 			tracer.trace(`got NES response in ${sw.elapsed()}ms -- ${nesR === undefined ? 'undefined' : `with ${nesR.items.length} items`}`);
 
 			if (nesR && nesR.items.length > 0) {