refpat & slicepat

This commit is contained in:
Jeroen Vannevel 2022-01-14 01:18:03 +00:00
parent 82d3238da8
commit 8deadb18ae
No known key found for this signature in database
GPG key ID: 78EF5F52F38C49BD

View file

@ -146,6 +146,11 @@ fn get_arm_types(context: &AssistContext, arm: &MatchArm) -> HashMap<String, Opt
Some(ast::Pat::ParenPat(parentheses)) => { Some(ast::Pat::ParenPat(parentheses)) => {
recurse(&parentheses.pat(), map, ctx); recurse(&parentheses.pat(), map, ctx);
} }
Some(ast::Pat::SlicePat(slice)) => {
for slice_pat in slice.pats() {
recurse(&Some(slice_pat), map, ctx);
}
}
Some(ast::Pat::IdentPat(ident_pat)) => { Some(ast::Pat::IdentPat(ident_pat)) => {
if let Some(name) = ident_pat.name() { if let Some(name) = ident_pat.name() {
let pat_type = ctx.sema.type_of_pat(local_pat); let pat_type = ctx.sema.type_of_pat(local_pat);
@ -747,6 +752,41 @@ fn func(x: i32) {
((((variable)))) => "", ((((variable)))) => "",
_ => "other" _ => "other"
}; };
}
"#,
)
}
#[test]
fn merge_match_arms_refpat() {
check_assist_not_applicable(
merge_match_arms,
r#"
fn func() {
let name = Some(String::from(""));
let n = String::from("");
match name {
Some(ref n) => $0"",
Some(n) => "",
_ => "other",
};
}
"#,
)
}
#[test]
fn merge_match_arms_slice() {
check_assist_not_applicable(
merge_match_arms,
r#"
fn func(binary: &[u8]) {
let space = b' ';
match binary {
[0x7f, b'E', b'L', b'F', ..] => $0"",
[space] => "",
_ => "other",
};
} }
"#, "#,
) )