language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add completion relevance score

Browse source
This commit is contained in:
Josh Mcguigan 2021-03-11 19:11:14 -08:00
parent c0e9530fd0
commit 3679821eea
5 changed files with 82 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/ide_completion/src/render.rs
View file

@ -20,7 +20,7 @@ use ide_db::{
use syntax::TextRange;
use crate::{
item::{ImportEdit, Relevance},
item::{CompletionRelevance, ImportEdit},
CompletionContext, CompletionItem, CompletionItemKind, CompletionKind,
};
@ -322,9 +322,9 @@ impl<'a> Render<'a> {
}
}
fn compute_relevance(ctx: &RenderContext, ty: &Type, name: &str) -> Option<Relevance> {
fn compute_relevance(ctx: &RenderContext, ty: &Type, name: &str) -> Option<CompletionRelevance> {
let (expected_name, expected_type) = ctx.expected_name_and_type()?;
let mut res = Relevance::default();
let mut res = CompletionRelevance::default();
res.exact_type_match = ty == &expected_type;
res.exact_name_match = name == &expected_name;
Some(res)
@ -338,7 +338,7 @@ mod tests {
use crate::{
test_utils::{check_edit, do_completion, get_all_items, TEST_CONFIG},
CompletionKind, Relevance,
CompletionKind, CompletionRelevance,
};
fn check(ra_fixture: &str, expect: Expect) {
@ -347,12 +347,14 @@ mod tests {
}
fn check_relevance(ra_fixture: &str, expect: Expect) {
fn display_relevance(relevance: Relevance) -> &'static str {
fn display_relevance(relevance: CompletionRelevance) -> &'static str {
match relevance {
Relevance { exact_type_match: true, exact_name_match: true } => "[type+name]",
Relevance { exact_type_match: true, exact_name_match: false } => "[type]",
Relevance { exact_type_match: false, exact_name_match: true } => "[name]",
Relevance { exact_type_match: false, exact_name_match: false } => "[]",
CompletionRelevance { exact_type_match: true, exact_name_match: true } => {
"[type+name]"
}
CompletionRelevance { exact_type_match: true, exact_name_match: false } => "[type]",
CompletionRelevance { exact_type_match: false, exact_name_match: true } => "[name]",
CompletionRelevance { exact_type_match: false, exact_name_match: false } => "[]",
}
}
@ -975,7 +977,7 @@ fn main() {
Local,
),
detail: "S",
relevance: Relevance {
relevance: CompletionRelevance {
exact_name_match: true,
exact_type_match: false,
},