Merge pull request rust-lang#20571 from A4-Tacks/type-kw-comp

Add type keywords completions

Author: ChayimFriedman2

src/tools/rust-analyzer/crates/ide-completion/src/completions.rs

@@ -111,6 +111,13 @@ impl Completions {
         }
     }
 
+    pub(crate) fn add_type_keywords(&mut self, ctx: &CompletionContext<'_>) {
+        self.add_keyword_snippet(ctx, "fn", "fn($1)");
+        self.add_keyword_snippet(ctx, "dyn", "dyn $0");
+        self.add_keyword_snippet(ctx, "impl", "impl $0");
+        self.add_keyword_snippet(ctx, "for", "for<$1>");
+    }
+
     pub(crate) fn add_super_keyword(
         &mut self,
         ctx: &CompletionContext<'_>,

src/tools/rust-analyzer/crates/ide-completion/src/completions/type.rs

@@ -205,6 +205,7 @@ pub(crate) fn complete_type_path(
             };
 
             acc.add_nameref_keywords_with_colon(ctx);
+            acc.add_type_keywords(ctx);
             ctx.process_all_names(&mut |name, def, doc_aliases| {
                 if scope_def_applicable(def) {
                     acc.add_path_resolution(ctx, path_ctx, name, def, doc_aliases);

src/tools/rust-analyzer/crates/ide-completion/src/tests/item.rs

@@ -23,6 +23,10 @@ impl Tra$0
             un Union                  Union
             bt u32                      u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     )
@@ -45,6 +49,10 @@ impl Trait for Str$0
             un Union                  Union
             bt u32                      u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     )

src/tools/rust-analyzer/crates/ide-completion/src/tests/predicate.rs

@@ -22,6 +22,10 @@ struct Foo<'lt, T, const C: usize> where $0 {}
             un Union                  Union
             bt u32                      u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     );
@@ -95,6 +99,10 @@ struct Foo<'lt, T, const C: usize> where for<'a> $0 {}
             un Union                  Union
             bt u32                      u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     );
@@ -120,6 +128,10 @@ impl Record {
             un Union                  Union
             bt u32                      u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     );

src/tools/rust-analyzer/crates/ide-completion/src/tests/special.rs

@@ -1492,6 +1492,10 @@ fn foo(_: a_$0) { }
         expect![[r#"
             bt u32 u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     );
@@ -1506,6 +1510,10 @@ fn foo<T>() {
             tp T
             bt u32 u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     );
@@ -1531,6 +1539,10 @@ fn foo<const N: $0>() {}
         expect![[r#"
             bt u32 u32
             kw crate::
+            kw dyn
+            kw fn
+            kw for
+            kw impl
             kw self::
         "#]],
     );