language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Properly implement lifting for if and when

Browse source
This commit is contained in:
Joshua Warner 2025-01-01 12:03:26 -05:00
parent 2918e26b38
commit 14b18f4213
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 93 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/compiler/fmt/src/expr.rs
View file

@ -1136,7 +1136,11 @@ pub fn expr_lift_spaces<'a, 'b: 'a>(
after: body_lifted.after,
}
}
Expr::If { .. } | Expr::When(_, _) => {
Expr::If {
if_thens,
final_else,
indented_else,
} => {
if parens == Parens::InApply || parens == Parens::InApplyLastArg {
Spaces {
before: &[],
@ -1144,11 +1148,53 @@ pub fn expr_lift_spaces<'a, 'b: 'a>(
after: &[],
}
} else {
let else_lifted =
expr_lift_spaces_after(Parens::NotNeeded, arena, &final_else.value);
Spaces {
before: &[],
item: *expr,
item: Expr::If {
if_thens,
final_else: arena.alloc(Loc::at(final_else.region, else_lifted.item)),
indented_else: *indented_else,
},
after: else_lifted.after,
}
}
}
Expr::When(cond, branches) => {
if parens == Parens::InApply || parens == Parens::InApplyLastArg {
Spaces {
before: &[],
item: Expr::ParensAround(arena.alloc(*expr)),
after: &[],
}
} else {
let new_branches = arena.alloc_slice_copy(branches);
if let Some(last) = new_branches.last_mut() {
let last_value_lifted =
expr_lift_spaces_after(Parens::NotNeeded, arena, &last.value.value);
*last = arena.alloc(WhenBranch {
patterns: last.patterns,
value: Loc::at(last.value.region, last_value_lifted.item),
guard: last.guard,
});
Spaces {
before: &[],
item: Expr::When(
arena.alloc(Loc::at(cond.region, cond.value)),
new_branches,
),
after: last_value_lifted.after,
}
} else {
Spaces {
before: &[],
item: *expr,
after: &[],
}
}
}
}
Expr::Return(val, opt_after) => {