Skip to content

Fix showRange field regression in InlineCompletionItem #279269

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −3
Open

Fix showRange field regression in InlineCompletionItem #279269

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
7 changes: 7 additions & 0 deletions src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,15 @@ export class InlineCompletionsModel extends Disposable {
let edit = inlineEditResult.getSingleTextEdit();
edit = singleTextRemoveCommonPrefix(edit, model);

const cursorPos = this.primaryPosition.read(reader);
const cursorAtInlineEdit = this.primaryPosition.map(cursorPos => LineRange.fromRangeInclusive(inlineEditResult.targetRange).addMargin(1, 1).contains(cursorPos.lineNumber));

// Check if cursor is within showRange (if specified)
const cursorInsideShowRange = cursorAtInlineEdit.get() || (inlineEditResult.showRange?.containsPosition(cursorPos) ?? true);
if (!cursorInsideShowRange && !this._inAcceptFlow.read(reader)) {
return undefined;
}

const commands = inlineEditResult.source.inlineSuggestions.commands;
const inlineEdit = new InlineEdit(edit, commands ?? [], inlineEditResult);

Expand Down
10 changes: 8 additions & 2 deletions src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ abstract class InlineSuggestionItemBase {
public get renameCommand(): Command | undefined { return this._data.renameCommand; }
public get warning(): InlineCompletionWarning | undefined { return this._sourceInlineCompletion.warning; }
public get showInlineEditMenu(): boolean { return !!this._sourceInlineCompletion.showInlineEditMenu; }
public get showRange(): Range | undefined { return this._data.showRange; }
public get hash() {
return JSON.stringify([
this.getSingleTextEdit().text,
Expand Down Expand Up @@ -307,11 +308,16 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {

public isVisible(model: ITextModel, cursorPosition: Position): boolean {
const singleTextEdit = this.getSingleTextEdit();
return inlineCompletionIsVisible(singleTextEdit, this._originalRange, model, cursorPosition);
return inlineCompletionIsVisible(singleTextEdit, this._originalRange, model, cursorPosition, this.showRange);
}
}

export function inlineCompletionIsVisible(singleTextEdit: TextReplacement, originalRange: Range | undefined, model: ITextModel, cursorPosition: Position): boolean {
export function inlineCompletionIsVisible(singleTextEdit: TextReplacement, originalRange: Range | undefined, model: ITextModel, cursorPosition: Position, showRange?: Range): boolean {
// Check if cursor is within showRange (if specified)
if (showRange && !showRange.containsPosition(cursorPosition)) {
return false;
}

const minimizedReplacement = singleTextRemoveCommonPrefix(singleTextEdit, model);
const editRange = singleTextEdit.range;
if (!editRange
Expand Down
5 changes: 4 additions & 1 deletion src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export function provideInlineCompletions(
}
if (item.insertText !== undefined) {
const t = new TextReplacement(Range.lift(item.range) ?? defaultReplaceRange, item.insertText);
if (inlineCompletionIsVisible(t, undefined, model, position)) {
if (inlineCompletionIsVisible(t, undefined, model, position, Range.lift(item.showRange) ?? undefined)) {
return undefined;
}
}
Expand Down Expand Up @@ -248,6 +248,7 @@ function toInlineSuggestData(
inlineCompletion.isInlineEdit ?? false,
inlineCompletion.supportsRename ?? false,
undefined,
Range.lift(inlineCompletion.showRange) ?? undefined,
requestInfo,
providerRequestInfo,
inlineCompletion.correlationId,
Expand Down Expand Up @@ -318,6 +319,7 @@ export class InlineSuggestData {
public readonly isInlineEdit: boolean,
public readonly supportsRename: boolean,
public readonly renameCommand: Command | undefined,
public readonly showRange: Range | undefined,

private readonly _requestInfo: InlineSuggestRequestInfo,
private readonly _providerRequestInfo: InlineSuggestProviderRequestInfo,
Expand Down Expand Up @@ -493,6 +495,7 @@ export class InlineSuggestData {
this.isInlineEdit,
this.supportsRename,
command,
this.showRange,
this._requestInfo,
this._providerRequestInfo,
this._correlationId,
Expand Down