language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor if lowering

Browse source
This commit is contained in:
Aleksey Kladov 2019-08-07 12:32:32 +02:00
parent a2966944a8
commit 4d6475ada0
1 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/ra_hir/src/expr.rs
View file

@ -558,35 +558,32 @@ where
let syntax_ptr = SyntaxNodePtr::new(expr.syntax()); let syntax_ptr = SyntaxNodePtr::new(expr.syntax());
match expr.kind() { match expr.kind() {
ast::ExprKind::IfExpr(e) => { ast::ExprKind::IfExpr(e) => {
let then_branch = self.collect_block_opt(e.then_branch());
let else_branch = e.else_branch().map(|b| match b {
ast::ElseBranch::Block(it) => self.collect_block(it),
ast::ElseBranch::IfExpr(elif) => {
let expr: ast::Expr = ast::Expr::cast(elif.syntax().clone()).unwrap();
self.collect_expr(expr)
}
});
if let Some(pat) = e.condition().and_then(|c| c.pat()) { if let Some(pat) = e.condition().and_then(|c| c.pat()) {
// if let -- desugar to match // if let -- desugar to match
let pat = self.collect_pat(pat); let pat = self.collect_pat(pat);
let match_expr = let match_expr =
self.collect_expr_opt(e.condition().expect("checked above").expr()); self.collect_expr_opt(e.condition().expect("checked above").expr());
let then_branch = self.collect_block_opt(e.then_branch());
let else_branch = e
.else_branch()
.map(|b| match b {
ast::ElseBranch::Block(it) => self.collect_block(it),
ast::ElseBranch::IfExpr(elif) => self.collect_expr(elif.into()),
})
.unwrap_or_else(|| self.empty_block());
let placeholder_pat = self.pats.alloc(Pat::Missing); let placeholder_pat = self.pats.alloc(Pat::Missing);
let arms = vec![ let arms = vec![
MatchArm { pats: vec![pat], expr: then_branch, guard: None }, MatchArm { pats: vec![pat], expr: then_branch, guard: None },
MatchArm { pats: vec![placeholder_pat], expr: else_branch, guard: None }, MatchArm {
pats: vec![placeholder_pat],
expr: else_branch.unwrap_or_else(|| self.empty_block()),
guard: None,
},
]; ];
self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr) self.alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr)
} else { } else {
let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr())); let condition = self.collect_expr_opt(e.condition().and_then(|c| c.expr()));
let then_branch = self.collect_block_opt(e.then_branch());
let else_branch = e.else_branch().map(|b| match b {
ast::ElseBranch::Block(it) => self.collect_block(it),
ast::ElseBranch::IfExpr(elif) => {
let expr: ast::Expr = ast::Expr::cast(elif.syntax().clone()).unwrap();
self.collect_expr(expr)
}
});
self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr) self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr)
} }
} }