language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 19:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix indentation of single-line ifs

Browse source
This commit is contained in:
Joshua Warner 2025-01-01 10:45:51 -05:00
parent 7fd97dec72
commit d9ad34592c
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
7 changed files with 87 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/compiler/parse/src/expr.rs
View file

@ -2765,7 +2765,7 @@ fn if_expr_help<'a>(options: ExprParseOptions) -> impl Parser<'a, Expr<'a>, EIf<
let (state_final_else, then_indent) = loop {
let (_, ((cond, then_indent), then_branch), state) = if_branch()
.parse(arena, loop_state, min_indent)
.parse(arena, loop_state, if_indent)
.map_err(|(_p, err)| (MadeProgress, err))?;
branches.push((cond, then_branch));
@ -2794,7 +2794,7 @@ fn if_expr_help<'a>(options: ExprParseOptions) -> impl Parser<'a, Expr<'a>, EIf<
let indented_else = else_indent > then_indent && has_newline_next;
let min_indent = if indented_else {
std::cmp::min(then_indent, else_indent)
std::cmp::min(if_indent, std::cmp::min(then_indent, else_indent))
} else {
else_indent + 1
};