Skip to content

Commit 7ce3ca5

Browse files
committed
Auto merge of #11993 - jonas-schievink:adt-completions-in-block, r=jonas-schievink
fix: enable ADT keyword completions in block expressions fixes #11576
2 parents ae68b68 + 1fd232c commit 7ce3ca5

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

crates/ide_completion/src/completions/keyword.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
8686
add_keyword("mod", "mod $0");
8787
}
8888

89-
if expects_item {
89+
if expects_item || has_block_expr_parent {
9090
add_keyword("enum", "enum $1 {\n $0\n}");
9191
add_keyword("struct", "struct $0");
9292
add_keyword("union", "union $1 {\n $0\n}");

crates/ide_completion/src/tests/expression.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ impl Unit {
137137
kw trait
138138
kw static
139139
kw mod
140+
kw enum
141+
kw struct
142+
kw union
140143
kw match
141144
kw while
142145
kw while let
@@ -227,6 +230,9 @@ fn complete_in_block() {
227230
kw trait
228231
kw static
229232
kw mod
233+
kw enum
234+
kw struct
235+
kw union
230236
kw match
231237
kw while
232238
kw while let
@@ -269,6 +275,9 @@ fn complete_after_if_expr() {
269275
kw trait
270276
kw static
271277
kw mod
278+
kw enum
279+
kw struct
280+
kw union
272281
kw match
273282
kw while
274283
kw while let
@@ -339,6 +348,9 @@ fn completes_in_loop_ctx() {
339348
kw trait
340349
kw static
341350
kw mod
351+
kw enum
352+
kw struct
353+
kw union
342354
kw match
343355
kw while
344356
kw while let

0 commit comments

Comments
 (0)