itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Lukas Wirth 2021-07-02 19:50:37 +02:00
parent a7d61ddba4
commit f1819525f5
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
crates/ide_assists/src/handlers/replace_if_let_with_match.rs
View File

@ -86,53 +86,21 @@ pub(crate) fn replace_if_let_with_match(acc: &mut Assists, ctx: &AssistContext)
target, target,
move |edit| { move |edit| {
let match_expr = { let match_expr = {
let else_arm = { let else_arm = make_else_arm(else_block, &cond_bodies, ctx);
match else_block { let make_match_arm = |(pat, body): (_, ast::BlockExpr)| {
Some(else_block) => { let body = body.reset_indent().indent(IndentLevel(1));
let pattern = match &*cond_bodies { match pat {
[(Either::Left(pat), _)] => ctx Either::Left(pat) => {
.sema make::match_arm(iter::once(pat), None, unwrap_trivial_block(body))
.type_of_pat(&pat)
.and_then(|ty| TryEnum::from_ty(&ctx.sema, &ty))
.map(|it| {
if does_pat_match_variant(&pat, &it.sad_pattern()) {
it.happy_pattern()
} else {
it.sad_pattern()
}
}),
_ => None,
}
.unwrap_or_else(|| make::wildcard_pat().into());
make::match_arm(
iter::once(pattern),
None,
unwrap_trivial_block(else_block),
)
} }
None => make::match_arm( Either::Right(expr) => make::match_arm(
iter::once(make::wildcard_pat().into()), iter::once(make::wildcard_pat().into()),
None, Some(expr),
make::expr_unit().into(), unwrap_trivial_block(body),
), ),
} }
}; };
let arms = cond_bodies let arms = cond_bodies.into_iter().map(make_match_arm).chain(iter::once(else_arm));
.into_iter()
.map(|(pat, body)| {
let body = body.reset_indent().indent(IndentLevel(1));
match pat {
Either::Left(pat) => {
make::match_arm(iter::once(pat), None, unwrap_trivial_block(body))
}
Either::Right(expr) => make::match_arm(
iter::once(make::wildcard_pat().into()),
Some(expr),
unwrap_trivial_block(body),
),
}
})
.chain(iter::once(else_arm));
let match_expr = make::expr_match(scrutinee_to_be_expr, make::match_arm_list(arms)); let match_expr = make::expr_match(scrutinee_to_be_expr, make::match_arm_list(arms));
match_expr.indent(IndentLevel::from_node(if_expr.syntax())) match_expr.indent(IndentLevel::from_node(if_expr.syntax()))
}; };
@ -150,6 +118,36 @@ pub(crate) fn replace_if_let_with_match(acc: &mut Assists, ctx: &AssistContext)
) )
} }
fn make_else_arm(
else_block: Option<ast::BlockExpr>,
cond_bodies: &Vec<(Either<ast::Pat, ast::Expr>, ast::BlockExpr)>,
ctx: &AssistContext,
) -> ast::MatchArm {
if let Some(else_block) = else_block {
let pattern = if let [(Either::Left(pat), _)] = &**cond_bodies {
ctx.sema
.type_of_pat(&pat)
.and_then(|ty| TryEnum::from_ty(&ctx.sema, &ty))
.zip(Some(pat))
} else {
None
};
let pattern = match pattern {
Some((it, pat)) => {
if does_pat_match_variant(&pat, &it.sad_pattern()) {
it.happy_pattern()
} else {
it.sad_pattern()
}
}
None => make::wildcard_pat().into(),
};
make::match_arm(iter::once(pattern), None, unwrap_trivial_block(else_block))
} else {
make::match_arm(iter::once(make::wildcard_pat().into()), None, make::expr_unit().into())
}
}
// Assist: replace_match_with_if_let // Assist: replace_match_with_if_let
// //
// Replaces a binary `match` with a wildcard pattern and no guards with an `if let` expression. // Replaces a binary `match` with a wildcard pattern and no guards with an `if let` expression.