Merge #7353

7353: Add LifetimeParam and ConstParam to CompletionItemKind r=matklad a=Veykril

Adds `LifetimeParam` and `ConstParam` to `CompletionItemKind` and maps them both to `TypeParam` in the protocol conversion as there are no equivalents, so nothing really changes there.
`ConstParam` could be mapped to `Const` I guess but I'm split on whether that would be better?

Additions were solely inspired by (the single) test output for const params.

Also sorts the variants of `CompletionItemKind` and its to_proto match.



Co-authored-by: Lukas Wirth <[email protected]>

1 files changed, 19 insertions, 19 deletions

diff --git a/crates/completion/src/completions/unqualified_path.rs b/crates/completion/src/completions/unqualified_path.rs
index 809e1645a..a289efc34 100644
--- a/crates/completion/src/completions/unqualified_path.rs
+++ b/crates/completion/src/completions/unqualified_path.rs
@@ -165,8 +165,8 @@ fn quux(x: i32) {
 }
 "#,
             expect![[r#"
-                bn y       i32
-                bn x       i32
+                lc y       i32
+                lc x       i32
                 fn quux(…) fn quux(x: i32)
             "#]],
         );
@@ -187,8 +187,8 @@ fn quux() {
 }
 "#,
             expect![[r#"
-                bn b      i32
-                bn a
+                lc b      i32
+                lc a
                 fn quux() fn quux()
             "#]],
         );
@@ -203,7 +203,7 @@ fn quux() {
 }
 "#,
             expect![[r#"
-                bn x
+                lc x
                 fn quux() fn quux()
             "#]],
         );
@@ -241,7 +241,7 @@ fn main() {
         check(
             r#"fn quux<const C: usize>() { $0 }"#,
             expect![[r#"
-                tp C
+                cp C
                 fn quux() fn quux<const C: usize>()
             "#]],
         );
@@ -263,7 +263,7 @@ fn main() {
         check(
             r#"struct S<T> { x: $0}"#,
             expect![[r#"
-                tp Self
+                sp Self
                 tp T
                 st S<…>
             "#]],
@@ -275,7 +275,7 @@ fn main() {
         check(
             r#"enum X { Y($0) }"#,
             expect![[r#"
-                tp Self
+                sp Self
                 en X
             "#]],
         );
@@ -378,8 +378,8 @@ fn foo() {
 "#,
             // FIXME: should be only one bar here
             expect![[r#"
-                bn bar   i32
-                bn bar   i32
+                lc bar   i32
+                lc bar   i32
                 fn foo() fn foo()
             "#]],
         );
@@ -390,8 +390,8 @@ fn foo() {
         check(
             r#"impl S { fn foo(&self) { $0 } }"#,
             expect![[r#"
-                bn self &{unknown}
-                tp Self
+                lc self &{unknown}
+                sp Self
             "#]],
         );
     }
@@ -575,8 +575,8 @@ fn quux(x: i32) {
 }
 "#,
             expect![[r#"
-                bn y       i32
-                bn x       i32
+                lc y       i32
+                lc x       i32
                 fn quux(…) fn quux(x: i32)
                 ma m!(…)   macro_rules! m
             "#]],
@@ -594,8 +594,8 @@ fn quux(x: i32) {
 }
 ",
             expect![[r#"
-                bn y       i32
-                bn x       i32
+                lc y       i32
+                lc x       i32
                 fn quux(…) fn quux(x: i32)
                 ma m!(…)   macro_rules! m
             "#]],
@@ -613,8 +613,8 @@ fn quux(x: i32) {
 }
 "#,
             expect![[r#"
-                bn y       i32
-                bn x       i32
+                lc y       i32
+                lc x       i32
                 fn quux(…) fn quux(x: i32)
                 ma m!(…)   macro_rules! m
             "#]],
@@ -750,7 +750,7 @@ struct MyStruct {}
 impl My$0
 "#,
             expect![[r#"
-                tp Self
+                sp Self
                 tt MyTrait
                 st MyStruct
             "#]],