language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix when branches to use lifting as well

Browse source
This commit is contained in:
Joshua Warner 2024-12-16 18:43:14 -08:00
parent e068ae6b5a
commit c4077dc971
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 62 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1605,27 +1605,25 @@ fn fmt_when<'a>(
let inner_indent = line_indent + INDENT;
match expr.value {
Expr::SpaceBefore(nested, spaces) => {
fmt_spaces_no_blank_lines(buf, spaces.iter(), inner_indent);
let expr = expr_lift_spaces(Parens::NotNeeded, buf.text.bump(), &expr.value);
fmt_spaces_no_blank_lines(buf, expr.before.iter(), inner_indent);
if is_multiline_expr {
buf.ensure_ends_with_newline();
} else {
buf.spaces(1);
}
if is_multiline_expr {
buf.ensure_ends_with_newline();
} else {
buf.spaces(1);
}
// expr.format_with_options(buf, Parens::NotNeeded, Newlines::Yes, inner_indent);
format_expr_only(
&expr.item,
buf,
Parens::NotNeeded,
Newlines::Yes,
inner_indent,
);
nested.format_with_options(buf, Parens::NotNeeded, Newlines::Yes, inner_indent);
}
_ => {
if is_multiline_expr {
buf.ensure_ends_with_newline();
} else {
buf.spaces(1);
}
expr.format_with_options(buf, Parens::NotNeeded, Newlines::Yes, inner_indent);
}
if !expr.after.is_empty() {
format_spaces(buf, expr.after, Newlines::Yes, inner_indent);
}
prev_branch_was_multiline = is_multiline_expr || is_multiline_patterns;