bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/diagnostics/expr.rs')
-rw-r--r--crates/hir-ty/src/diagnostics/expr.rs19
1 files changed, 17 insertions, 2 deletions
diff --git a/crates/hir-ty/src/diagnostics/expr.rs b/crates/hir-ty/src/diagnostics/expr.rs
index 571f01dde2..ff70618ca1 100644
--- a/crates/hir-ty/src/diagnostics/expr.rs
+++ b/crates/hir-ty/src/diagnostics/expr.rs
@@ -341,8 +341,23 @@ impl ExprValidator {
if let Some(else_branch) = else_branch {
// If else branch has a tail, it is an "expression" that produces a value,
// e.g. `let a = if { ... } else { ... };` and this `else` is not unnecessary
- if let Expr::Block { tail: Some(_), .. } = body.exprs[*else_branch] {
- return;
+ let mut branch = *else_branch;
+ loop {
+ match body.exprs[branch] {
+ Expr::Block { tail: Some(_), .. } => return,
+ Expr::If { then_branch, else_branch, .. } => {
+ if let Expr::Block { tail: Some(_), .. } = body.exprs[then_branch] {
+ return;
+ }
+ if let Some(else_branch) = else_branch {
+ // Continue checking for branches like `if { ... } else if { ... } else...`
+ branch = else_branch;
+ continue;
+ }
+ }
+ _ => break,
+ }
+ break;
}
} else {
return;