Skip to content

nes: don't trigger completions if there's cached NES available #2403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ulugbekna wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −17
Draft

nes: don't trigger completions if there's cached NES available #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/extension/inlineEdits/vscode-node/jointInlineCompletionProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { coalesce } from '../../../util/vs/base/common/arrays';
import { assertNever, softAssert } from '../../../util/vs/base/common/assert';
import { raceCancellation, raceTimeout } from '../../../util/vs/base/common/async';
import { CancellationToken, CancellationTokenSource } from '../../../util/vs/base/common/cancellation';
import { Emitter } from '../../../util/vs/base/common/event';
import { Disposable, DisposableStore } from '../../../util/vs/base/common/lifecycle';
import { autorun, derived, derivedDisposable, observableFromEvent } from '../../../util/vs/base/common/observable';
import { StopWatch } from '../../../util/vs/base/common/stopwatch';
Expand Down Expand Up @@ -251,7 +252,8 @@ type LastNesSuggestion = {

class JointCompletionsProvider extends Disposable implements vscode.InlineCompletionItemProvider {

public onDidChange?: vscode.Event<void> | undefined;
private _onDidChange = this._register(new Emitter<void>());
public readonly onDidChange = this._onDidChange.event;

constructor(
private readonly _completionsProvider: CopilotInlineCompletionItemProvider | undefined,
Expand All @@ -261,7 +263,14 @@ class JointCompletionsProvider extends Disposable implements vscode.InlineComple
@ILogService private readonly _logService: ILogService,
) {
super();
this.onDidChange = _inlineEditProvider?.onDidChange;
if (this._inlineEditProvider && this._inlineEditProvider.onDidChange) {
this._register(this._inlineEditProvider.onDidChange(() => {
this._onDidChange.fire();
// if (this._isDoingCompletionsRequest === 0) {
// // Never report a change event which would cause an interruption to the completions request.
// }
}));
}
softAssert(
_completionsProvider?.onDidChange === undefined,
'CompletionsProvider does not implement onDidChange'
Expand All @@ -282,6 +291,7 @@ class JointCompletionsProvider extends Disposable implements vscode.InlineComple
}

private lastNesSuggestion: null | LastNesSuggestion = null;
// private _isDoingCompletionsRequest = 0;
private provideInlineCompletionItemsInvocationCount = 0;

private async provideInlineCompletionItemsRegular(document: vscode.TextDocument, position: vscode.Position, context: vscode.InlineCompletionContext, token: vscode.CancellationToken, tracer: ITracer): Promise<SingularCompletionList | undefined> {
Expand Down Expand Up @@ -369,13 +379,14 @@ class JointCompletionsProvider extends Disposable implements vscode.InlineComple
// prefer completions unless there are none
tracer.trace(`no last NES suggestion to consider`);
const completionsP = this._invokeCompletionsProvider(tracer, document, position, context, tokens, sw);
const nesP = this._invokeNESProvider(tracer, document, position, context, tokens, sw);
const nesP = this._invokeNESProvider(tracer, document, position, false, context, tokens, sw);
return this._returnCompletionsOrOtherwiseNES(completionsP, nesP, sw, tracer, tokens);
}

tracer.trace(`last NES suggestion is for the current document, checking if it agrees with the current suggestion`);

const nesP = this._invokeNESProvider(tracer, document, position, context, tokens, sw);
const eliminateDebouncing = (lastNesSuggestion.docVersionId === document.version);
const nesP = this._invokeNESProvider(tracer, document, position, eliminateDebouncing, context, tokens, sw);
if (!nesP) {
tracer.trace(`no NES provider`);
const completionsP = this._invokeCompletionsProvider(tracer, document, position, context, tokens, sw);
Expand Down Expand Up @@ -443,7 +454,7 @@ class JointCompletionsProvider extends Disposable implements vscode.InlineComple
return this._returnCompletionsOrOtherwiseNES(completionsP, nesP, sw, tracer, tokens);
}

private _invokeNESProvider(tracer: ITracer, document: vscode.TextDocument, position: vscode.Position, context: vscode.InlineCompletionContext, tokens: { coreToken: CancellationToken; completionsCts: CancellationTokenSource; nesCts: CancellationTokenSource }, sw: StopWatch) {
private _invokeNESProvider(tracer: ITracer, document: vscode.TextDocument, position: vscode.Position, eliminateDebouncing: boolean, context: vscode.InlineCompletionContext, tokens: { coreToken: CancellationToken; completionsCts: CancellationTokenSource; nesCts: CancellationTokenSource }, sw: StopWatch) {
let nesP: Promise<NesCompletionList | undefined> | undefined;
if (this._inlineEditProvider) {
tracer.trace(`- requesting NES provideInlineCompletionItems`);
Expand Down
40 changes: 28 additions & 12 deletions src/util/vs/editor/common/core/text/positionToOffsetImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,43 @@ export function _setPositionOffsetTransformerDependencies(deps: IDeps): void {
}

export class PositionOffsetTransformer extends PositionOffsetTransformerBase {
private readonly lineStartOffsetByLineIdx: number[];
private readonly lineEndOffsetByLineIdx: number[];
private _lineStartOffsetByLineIdx: number[] | undefined;
private _lineEndOffsetByLineIdx: number[] | undefined;

constructor(public readonly text: string) {
super();
}

private get lineStartOffsetByLineIdx(): number[] {
if (!this._lineStartOffsetByLineIdx) {
this._computeLineOffsets();
}
return this._lineStartOffsetByLineIdx!;
}

private get lineEndOffsetByLineIdx(): number[] {
if (!this._lineEndOffsetByLineIdx) {
this._computeLineOffsets();
}
return this._lineEndOffsetByLineIdx!;
}

this.lineStartOffsetByLineIdx = [];
this.lineEndOffsetByLineIdx = [];
private _computeLineOffsets(): void {
this._lineStartOffsetByLineIdx = [];
this._lineEndOffsetByLineIdx = [];

this.lineStartOffsetByLineIdx.push(0);
for (let i = 0; i < text.length; i++) {
if (text.charAt(i) === '\n') {
this.lineStartOffsetByLineIdx.push(i + 1);
if (i > 0 && text.charAt(i - 1) === '\r') {
this.lineEndOffsetByLineIdx.push(i - 1);
this._lineStartOffsetByLineIdx.push(0);
for (let i = 0; i < this.text.length; i++) {
if (this.text.charAt(i) === '\n') {
this._lineStartOffsetByLineIdx.push(i + 1);
if (i > 0 && this.text.charAt(i - 1) === '\r') {
this._lineEndOffsetByLineIdx.push(i - 1);
} else {
this.lineEndOffsetByLineIdx.push(i);
this._lineEndOffsetByLineIdx.push(i);
}
}
}
this.lineEndOffsetByLineIdx.push(text.length);
this._lineEndOffsetByLineIdx.push(this.text.length);
}

override getOffset(position: Position): number {
Expand Down