diff options
| author | bors <bors@rust-lang.org> | 2024-06-19 18:20:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-19 18:20:20 +0000 |
| commit | e95043cf6f4e005ea1446520aa200551ec25982d (patch) | |
| tree | b1da3cc2087f7a59f2438e9ff8b225e6a28f9498 /src | |
| parent | c1fed6a11c1199e933736298fb8e6a6687154c45 (diff) | |
| parent | b4952b20f421247e19ebc1b20d4e8759ca1059ea (diff) | |
| download | rust-e95043cf6f4e005ea1446520aa200551ec25982d.tar.gz rust-e95043cf6f4e005ea1446520aa200551ec25982d.zip | |
Auto merge of #17459 - MariaSolOs:async-compl, r=Veykril
fix(completion): complete async keyword Fixes #17452 Not entirely confident of the fix here, but my logic is that `async` should in general be offered in similar semantic scenarios as other keywords like `static` or `pub`.
Diffstat (limited to 'src')
4 files changed, 21 insertions, 0 deletions
diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/completions/item_list.rs b/src/tools/rust-analyzer/crates/ide-completion/src/completions/item_list.rs index 44c6199def4..02298b1e9b0 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/completions/item_list.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/completions/item_list.rs @@ -100,6 +100,7 @@ fn add_keywords(acc: &mut Completions, ctx: &CompletionContext<'_>, kind: Option add_keyword("enum", "enum $1 {\n $0\n}"); add_keyword("mod", "mod $0"); add_keyword("static", "static $0"); + add_keyword("async", "async $0"); add_keyword("struct", "struct $0"); add_keyword("trait", "trait $1 {\n $0\n}"); add_keyword("union", "union $1 {\n $0\n}"); diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/tests/expression.rs b/src/tools/rust-analyzer/crates/ide-completion/src/tests/expression.rs index a653314233d..545c2a2a8a0 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/tests/expression.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/tests/expression.rs @@ -141,6 +141,7 @@ impl Unit { un Union Union ev TupleV(…) TupleV(u32) bt u32 u32 + kw async kw const kw crate:: kw enum @@ -217,6 +218,7 @@ fn complete_in_block() { expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw enum @@ -264,6 +266,7 @@ fn complete_after_if_expr() { expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw else @@ -336,6 +339,7 @@ fn completes_in_loop_ctx() { expect![[r#" fn my() fn() bt u32 u32 + kw async kw break kw const kw continue @@ -799,6 +803,7 @@ fn foo() { if foo {} $0 } expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw else @@ -839,6 +844,7 @@ fn foo() { if foo {} el$0 } expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw else @@ -927,6 +933,7 @@ fn foo() { if foo {} $0 let x = 92; } expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw else @@ -967,6 +974,7 @@ fn foo() { if foo {} el$0 let x = 92; } expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw else @@ -1007,6 +1015,7 @@ fn foo() { if foo {} el$0 { let x = 92; } } expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw else @@ -1059,6 +1068,7 @@ pub struct UnstableThisShouldNotBeListed; fn main() fn() md std bt u32 u32 + kw async kw const kw crate:: kw enum @@ -1111,6 +1121,7 @@ pub struct UnstableButWeAreOnNightlyAnyway; md std st UnstableButWeAreOnNightlyAnyway UnstableButWeAreOnNightlyAnyway bt u32 u32 + kw async kw const kw crate:: kw enum diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/tests/item_list.rs b/src/tools/rust-analyzer/crates/ide-completion/src/tests/item_list.rs index 2b5b4dd773c..c37900478e1 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/tests/item_list.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/tests/item_list.rs @@ -14,6 +14,7 @@ fn in_mod_item_list() { r#"mod tests { $0 }"#, expect![[r#" ma makro!(…) macro_rules! makro + kw async kw const kw crate:: kw enum @@ -47,6 +48,7 @@ fn in_source_file_item_list() { expect![[r#" ma makro!(…) macro_rules! makro md module + kw async kw const kw crate:: kw enum @@ -79,6 +81,7 @@ fn in_item_list_after_attr() { expect![[r#" ma makro!(…) macro_rules! makro md module + kw async kw const kw crate:: kw enum @@ -132,6 +135,7 @@ fn after_visibility() { check( r#"pub $0"#, expect![[r#" + kw async kw const kw enum kw extern @@ -356,6 +360,7 @@ fn after_unit_struct() { expect![[r#" ma makro!(…) macro_rules! makro md module + kw async kw const kw crate:: kw enum diff --git a/src/tools/rust-analyzer/crates/ide-completion/src/tests/special.rs b/src/tools/rust-analyzer/crates/ide-completion/src/tests/special.rs index 69d8fe91040..2ae7d37889e 100644 --- a/src/tools/rust-analyzer/crates/ide-completion/src/tests/special.rs +++ b/src/tools/rust-analyzer/crates/ide-completion/src/tests/special.rs @@ -1017,6 +1017,7 @@ fn here_we_go() { fn here_we_go() fn() st Foo (alias Bar) Foo bt u32 u32 + kw async kw const kw crate:: kw enum @@ -1066,6 +1067,7 @@ fn here_we_go() { fn here_we_go() fn() st Foo (alias Bar, Qux, Baz) Foo bt u32 u32 + kw async kw const kw crate:: kw enum @@ -1188,6 +1190,7 @@ fn bar() { qu$0 } fn bar() fn() fn foo() (alias qux) fn() bt u32 u32 + kw async kw const kw crate:: kw enum @@ -1443,6 +1446,7 @@ fn foo() { expect![[r#" fn foo() fn() bt u32 u32 + kw async kw const kw crate:: kw enum |