Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #883

Browse source 
883: Fix fill_match_arms not working with references r=matklad a=vipentti

This fixes #881 

Co-authored-by: Ville Penttinen <villem.penttinen@gmail.com>
This commit is contained in:
bors[bot] 2019-02-23 13:16:41 +00:00
commit 460ceb4cf2
1 changed files with 79 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
crates/ra_assists/src/fill_match_arms.rs
View file

@ -28,6 +28,10 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
let match_expr_ty = infer_result[node_expr].clone();
let enum_def = match match_expr_ty {
Ty::Adt { def_id: AdtDef::Enum(e), .. } => e,
Ty::Ref(adt, _) => match *adt {
Ty::Adt { def_id: AdtDef::Enum(e), .. } => e,
_ => return None,
},
_ => return None,
};
let enum_name = enum_def.name(ctx.db)?;
@ -119,6 +123,81 @@ mod tests {
"#,
);
}
#[test]
fn test_fill_match_arm_refs() {
check_assist(
fill_match_arms,
r#"
enum A {
As,
}
fn foo(a: &A) {
match a<|> {
}
}
"#,
r#"
enum A {
As,
}
fn foo(a: &A) {
match <|>a {
A::As => (),
}
}
"#,
);
check_assist(
fill_match_arms,
r#"
enum A {
Es{x: usize, y: usize}
}
fn foo(a: &mut A) {
match a<|> {
}
}
"#,
r#"
enum A {
Es{x: usize, y: usize}
}
fn foo(a: &mut A) {
match <|>a {
A::Es{x, y} => (),
}
}
"#,
);
check_assist(
fill_match_arms,
r#"
enum E { X, Y}
fn main() {
match &E::X<|>
}
"#,
r#"
enum E { X, Y}
fn main() {
match <|>&E::X {
E::X => (),
E::Y => (),
}
}
"#,
);
}
#[test]
fn fill_match_arms_no_body() {
check_assist(