Skip to content
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

fix: Sort completion items that skip await and iter() behind those that don't #18988

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix: Sort completion items that skip await and iter() behind those that don't #18988

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
9 changes: 9 additions & 0 deletions crates/ide-completion/src/item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ pub struct CompletionRelevance {
pub postfix_match: Option<CompletionRelevancePostfixMatch>,
/// This is set for items that are function (associated or method)
pub function: Option<CompletionRelevanceFn>,
/// true when there is an `await.method()` or `iter().method()` completion.
pub is_skipping_completion: bool,
}
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
pub struct CompletionRelevanceTraitInfo {
Expand Down Expand Up @@ -269,6 +271,7 @@ impl CompletionRelevance {
postfix_match,
trait_,
function,
is_skipping_completion,
} = self;

// only applicable for completions within use items
Expand Down Expand Up @@ -296,6 +299,12 @@ impl CompletionRelevance {
score -= 5;
}
}

// Lower rank for completions that skip `await` and `iter()`.
if is_skipping_completion {
score -= 7;
}

// lower rank for items that need an import
if requires_import {
score -= 1;
Expand Down
16 changes: 16 additions & 0 deletions crates/ide-completion/src/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ pub(crate) fn render_field(
item.set_relevance(CompletionRelevance {
type_match: compute_type_match(ctx.completion, ty),
exact_name_match: compute_exact_name_match(ctx.completion, &name),
is_skipping_completion: receiver.is_some(),
..CompletionRelevance::default()
});
item.detail(ty.display(db, ctx.completion.edition).to_string())
Expand Down Expand Up @@ -213,6 +214,10 @@ pub(crate) fn render_tuple_field(
);
item.detail(ty.display(ctx.db(), ctx.completion.edition).to_string())
.lookup_by(field.to_string());
item.set_relevance(CompletionRelevance {
is_skipping_completion: receiver.is_some(),
..ctx.completion_relevance()
});
item.build(ctx.db())
}

Expand Down Expand Up @@ -1333,6 +1338,7 @@ fn main() { let _: m::Spam = S$0 }
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
trigger_call_info: true,
},
Expand Down Expand Up @@ -1362,6 +1368,7 @@ fn main() { let _: m::Spam = S$0 }
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
trigger_call_info: true,
},
Expand Down Expand Up @@ -1451,6 +1458,7 @@ fn foo() { A { the$0 } }
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
},
]
Expand Down Expand Up @@ -1509,6 +1517,7 @@ impl S {
return_type: Other,
},
),
is_skipping_completion: false,
},
},
CompletionItem {
Expand Down Expand Up @@ -1651,6 +1660,7 @@ fn foo(s: S) { s.$0 }
return_type: Other,
},
),
is_skipping_completion: false,
},
},
]
Expand Down Expand Up @@ -1862,6 +1872,7 @@ fn f() -> i32 {
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
},
]
Expand Down Expand Up @@ -2622,6 +2633,7 @@ fn foo(f: Foo) { let _: &u32 = f.b$0 }
return_type: Other,
},
),
is_skipping_completion: false,
},
ref_match: "&@107",
},
Expand Down Expand Up @@ -2707,6 +2719,7 @@ fn foo() {
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
},
]
Expand Down Expand Up @@ -2764,6 +2777,7 @@ fn main() {
return_type: Other,
},
),
is_skipping_completion: false,
},
ref_match: "&@92",
},
Expand Down Expand Up @@ -3138,6 +3152,7 @@ fn main() {
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
},
CompletionItem {
Expand Down Expand Up @@ -3171,6 +3186,7 @@ fn main() {
is_private_editable: false,
postfix_match: None,
function: None,
is_skipping_completion: false,
},
},
]
Expand Down
1 change: 1 addition & 0 deletions crates/ide-completion/src/render/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ fn render(
exact_name_match: compute_exact_name_match(completion, &call),
function,
trait_: trait_info,
is_skipping_completion: matches!(func_kind, FuncKind::Method(_, Some(_))),
..ctx.completion_relevance()
});

Expand Down
Loading