Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22408 from A4-Tacks/no-semi-match-expr
fix: do not complete semicolon in match-expr place
| -rw-r--r-- | crates/ide-completion/src/context.rs | 8 | ||||
| -rw-r--r-- | crates/ide-completion/src/render/function.rs | 19 |
2 files changed, 26 insertions, 1 deletions
diff --git a/crates/ide-completion/src/context.rs b/crates/ide-completion/src/context.rs index f7fced3f06..e4d599742d 100644 --- a/crates/ide-completion/src/context.rs +++ b/crates/ide-completion/src/context.rs @@ -858,7 +858,13 @@ impl<'a, 'db> CompletionContext<'a, 'db> { sema.token_ancestors_with_macros(token.clone()).find(|node| { matches!( node.kind(), - BLOCK_EXPR | MATCH_ARM | CLOSURE_EXPR | ARG_LIST | PAREN_EXPR | ARRAY_EXPR + BLOCK_EXPR + | MATCH_ARM + | CLOSURE_EXPR + | ARG_LIST + | PAREN_EXPR + | ARRAY_EXPR + | MATCH_EXPR ) }) { diff --git a/crates/ide-completion/src/render/function.rs b/crates/ide-completion/src/render/function.rs index c690ccfdc5..ea228fdd60 100644 --- a/crates/ide-completion/src/render/function.rs +++ b/crates/ide-completion/src/render/function.rs @@ -952,4 +952,23 @@ fn bar() { "#, ); } + + #[test] + fn no_semicolon_in_match() { + check_edit( + r#"foo"#, + r#" +fn foo() {} +fn bar() { + match fo$0 {} +} +"#, + r#" +fn foo() {} +fn bar() { + match foo()$0 {} +} +"#, + ); + } } |