bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
ParenPat
Browse Source
Jeroen Vannevel 2022-01-14
parent c955ea1 · commit 82d3238
Diffstat
-rw-r--r--crates/ide_assists/src/handlers/merge_match_arms.rs20
1 files changed, 20 insertions, 0 deletions
diff --git a/crates/ide_assists/src/handlers/merge_match_arms.rs b/crates/ide_assists/src/handlers/merge_match_arms.rs
index ff1804fe95..ecb7d4bf07 100644
--- a/crates/ide_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ide_assists/src/handlers/merge_match_arms.rs
@@ -143,6 +143,9 @@ fn get_arm_types(context: &AssistContext, arm: &MatchArm) -> HashMap<String, Opt
}
}
}
+ Some(ast::Pat::ParenPat(parentheses)) => {
+ recurse(&parentheses.pat(), map, ctx);
+ }
Some(ast::Pat::IdentPat(ident_pat)) => {
if let Some(name) = ident_pat.name() {
let pat_type = ctx.sema.type_of_pat(local_pat);
@@ -731,4 +734,21 @@ fn func() {
"#,
)
}
+
+ #[test]
+ fn merge_match_arms_parentheses() {
+ check_assist_not_applicable(
+ merge_match_arms,
+ r#"
+fn func(x: i32) {
+ let variable = 2;
+ match x {
+ 1 => $0"",
+ ((((variable)))) => "",
+ _ => "other"
+ };
+}
+ "#,
+ )
+ }
}