rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

fix: Add type_match score for struct_pat

Example --- ```rust struct Foo(Bar); struct Bar { field: i32 } fn go(Foo($0): Foo) {} ``` **Before this PR** ```text st Bar [] bn Bar {…} Bar { field$1 }$0 [] st Foo [] bn Foo(…) Foo($1)$0 [] ``` **After this PR** ```text bn Bar {…} Bar { field$1 }$0 [type] st Bar [] st Foo [] bn Foo(…) Foo($1)$0 [] ```

Browse Source

A4-Tacks 11 days ago

parent de5824b · commit 6a73599

Diffstat

-rw-r--r--

crates/ide-completion/src/item.rs

-rw-r--r--

crates/ide-completion/src/render.rs

-rw-r--r--

crates/ide-completion/src/render/pattern.rs

3 files changed, 71 insertions, 3 deletions

diff --git a/crates/ide-completion/src/item.rs b/crates/ide-completion/src/item.rs
index cfadec6287..f54c8dd8b0 100644
--- a/crates/ide-completion/src/item.rs
+++ b/crates/ide-completion/src/item.rs

@@ -181,6 +181,9 @@ pub struct CompletionRelevance {

/// }

/// ```

pub is_local: bool,

+ /// This is missing variant in the patterns.

+ /// Maybe this can also be used for struct fields.

+ pub is_missing: bool,

/// Populated when the completion item comes from a trait (impl).

pub trait_: Option<CompletionRelevanceTraitInfo>,

/// This is set when an import is suggested in a use item whose name is already imported.

@@ -286,6 +289,7 @@ impl CompletionRelevance {

exact_name_match,

type_match,

is_local,

+ is_missing,

is_name_already_imported,

requires_import,

is_private_editable,

@@ -306,6 +310,9 @@ impl CompletionRelevance {

if is_local {

score += 1;

}

+ if is_missing {

+ score += 1;

+ }

// lower rank private things

if !is_private_editable {

diff --git a/crates/ide-completion/src/render.rs b/crates/ide-completion/src/render.rs
index f559aae789..f213951ddf 100644
--- a/crates/ide-completion/src/render.rs
+++ b/crates/ide-completion/src/render.rs

@@ -874,6 +874,7 @@ mod tests {

exact_name_match,

type_match,

is_local,

+ is_missing,

trait_,

is_name_already_imported: _,

requires_import,

@@ -889,6 +890,7 @@ mod tests {

(type_match == Some(CompletionRelevanceTypeMatch::CouldUnify), "type_could_unify"),

(exact_name_match, "name"),

(is_local, "local"),

+ (is_missing, "missing"),

(postfix_match == Some(CompletionRelevancePostfixMatch::Exact), "snippet"),

(trait_.is_some_and(|it| it.is_op_method), "op_method"),

(requires_import, "requires_import"),

@@ -1292,6 +1294,7 @@ fn main() { Foo::Fo$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1344,6 +1347,7 @@ fn main() { Foo::Fo$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1489,6 +1493,7 @@ fn main() { Foo::Fo$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1575,6 +1580,7 @@ fn main() { let _: m::Spam = S$0 }

Exact,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1613,6 +1619,7 @@ fn main() { let _: m::Spam = S$0 }

Exact,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1664,6 +1671,7 @@ fn main() { som$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1723,6 +1731,7 @@ fn main() { som$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1766,6 +1775,7 @@ fn main() { A$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1809,6 +1819,7 @@ fn main() { A$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1854,6 +1865,7 @@ fn main() { A::$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1890,6 +1902,7 @@ fn main() { A::$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1940,6 +1953,7 @@ fn main() { A$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -1983,6 +1997,7 @@ fn main() { A$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2023,6 +2038,7 @@ impl A$0

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2063,6 +2079,7 @@ fn main() { A$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2107,6 +2124,7 @@ fn main() { a$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2151,6 +2169,7 @@ fn main() { A { the$0 } }

CouldUnify,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2206,6 +2225,7 @@ impl S {

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2299,6 +2319,7 @@ use self::E::*;

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2371,6 +2392,7 @@ fn foo(s: S) { s.$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2591,6 +2613,7 @@ fn f() -> i32 {

Exact,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2697,6 +2720,7 @@ fn main() {

exact_name_match: false,

type_match: None,

is_local: true,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2745,6 +2769,7 @@ fn main() {

exact_name_match: false,

type_match: None,

is_local: true,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -2856,6 +2881,7 @@ fn main() {

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -3031,6 +3057,37 @@ mod b {

}

#[test]

+ fn score_patterns() {

+ check_relevance(

+ r#"

+struct Foo(Bar);

+struct Bar { field: i32 }

+fn go(Foo($0): Foo) {}

+"#,

+ expect![[r#"

+ bn Bar {…} Bar { field$1 }$0 [type]

+ st Bar []

+ st Foo []

+ bn Foo(…) Foo($1)$0 []

+ "#]],

+ );

+ check_relevance(

+ r#"

+struct Foo(Bar);

+enum Bar { Variant { field: i32 } }

+fn go(foo: Foo) { match foo { Foo($0) } }

+"#,

+ expect![[r#"

+ bn Bar::Variant {…} Bar::Variant { field$1 }$0 [type]

+ en Bar []

+ st Foo []

+ bn Foo(…) Foo($1)$0 []

+ "#]],

+ );

+ }

+ #[test]

fn test_avoid_redundant_suggestion() {

check_relevance(

r#"

@@ -3721,6 +3778,7 @@ fn foo(f: Foo) { let _: &u32 = f.b$0 }

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -3816,6 +3874,7 @@ fn foo() {

Exact,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -3870,6 +3929,7 @@ fn main() {

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: None,

is_name_already_imported: false,

requires_import: false,

@@ -4362,6 +4422,7 @@ fn main() {

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: Some(

CompletionRelevanceTraitInfo {

notable_trait: true,

@@ -4398,6 +4459,7 @@ fn main() {

exact_name_match: false,

type_match: None,

is_local: false,

+ is_missing: false,

trait_: Some(

CompletionRelevanceTraitInfo {

notable_trait: true,

diff --git a/crates/ide-completion/src/render/pattern.rs b/crates/ide-completion/src/render/pattern.rs
index 7e70aa13d4..13a83eb216 100644
--- a/crates/ide-completion/src/render/pattern.rs
+++ b/crates/ide-completion/src/render/pattern.rs

@@ -116,9 +116,8 @@ fn build_completion<'db>(

let mut relevance = ctx.completion_relevance();

let adt_ty = ctx.completion.rebase_ty(&adt_ty);

- if is_variant_missing {

- relevance.type_match = super::compute_type_match(ctx.completion, &adt_ty);

- }

+ relevance.type_match = super::compute_type_match(ctx.completion, &adt_ty);

+ relevance.is_missing = is_variant_missing;

let mut item = CompletionItem::new(

CompletionItemKind::Binding,