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

Fix spaces in the middle of where branches

Browse source
This commit is contained in:
Joshua Warner 2025-01-01 14:26:55 -05:00
parent 6fcc367af4
commit 14d6f7c92a
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 144 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1614,6 +1614,8 @@ fn fmt_when<'a>(
buf.push_str("is");
buf.newline();
let mut last_after: &[CommentOrNewline] = &[];
let mut prev_branch_was_multiline = false;
for (branch_index, branch) in branches.iter().enumerate() {
@ -1624,52 +1626,82 @@ fn fmt_when<'a>(
for (pattern_index, pattern) in patterns.iter().enumerate() {
if pattern_index == 0 {
match &pattern.value {
Pattern::SpaceBefore(sub_pattern, spaces) => {
let added_blank_line;
let pattern_lifted = pattern_lift_spaces(buf.text.bump(), &pattern.value);
if branch_index > 0 // Never render newlines before the first branch.
&& matches!(spaces.first(), Some(CommentOrNewline::Newline))
{
if prev_branch_was_multiline {
// Multiline branches always get a full blank line after them.
buf.ensure_ends_with_blank_line();
added_blank_line = true;
} else {
buf.ensure_ends_with_newline();
added_blank_line = false;
}
let before = merge_spaces(buf.text.bump(), last_after, pattern_lifted.before);
if !before.is_empty() {
let added_blank_line;
if branch_index > 0 // Never render newlines before the first branch.
&& matches!(before.first(), Some(CommentOrNewline::Newline))
{
if prev_branch_was_multiline {
// Multiline branches always get a full blank line after them.
buf.ensure_ends_with_blank_line();
added_blank_line = true;
} else {
buf.ensure_ends_with_newline();
added_blank_line = false;
}
// Write comments (which may have been attached to the previous
// branch's expr, if there was a previous branch).
fmt_comments_only(buf, spaces.iter(), NewlineAt::Bottom, indent + INDENT);
if branch_index > 0 {
if prev_branch_was_multiline && !added_blank_line {
// Multiline branches always get a full blank line after them
// (which we may already have added before a comment).
buf.ensure_ends_with_blank_line();
} else {
buf.ensure_ends_with_newline();
}
}
fmt_pattern(buf, sub_pattern, indent + INDENT, Parens::NotNeeded);
} else {
added_blank_line = false;
}
other => {
if branch_index > 0 {
if prev_branch_was_multiline {
// Multiline branches always get a full blank line after them.
buf.ensure_ends_with_blank_line();
} else {
buf.ensure_ends_with_newline();
}
}
fmt_pattern(buf, other, indent + INDENT, Parens::NotNeeded);
// Write comments (which may have been attached to the previous
// branch's expr, if there was a previous branch).
fmt_comments_only(buf, before.iter(), NewlineAt::Bottom, indent + INDENT);
if branch_index > 0 {
if prev_branch_was_multiline && !added_blank_line {
// Multiline branches always get a full blank line after them
// (which we may already have added before a comment).
buf.ensure_ends_with_blank_line();
} else {
buf.ensure_ends_with_newline();
}
}
fmt_pattern(
buf,
&pattern_lifted.item,
indent + INDENT,
Parens::NotNeeded,
);
} else {
if branch_index > 0 {
if prev_branch_was_multiline {
// Multiline branches always get a full blank line after them.
buf.ensure_ends_with_blank_line();
} else {
buf.ensure_ends_with_newline();
}
}
fmt_pattern(
buf,
&pattern_lifted.item,
indent + INDENT,
Parens::NotNeeded,
);
}
if !pattern_lifted.after.is_empty() {
if starts_with_inline_comment(pattern_lifted.after.iter()) {
buf.spaces(1);
}
if !pattern_lifted.item.is_multiline()
&& pattern_lifted.after.iter().all(|s| s.is_newline())
{
fmt_comments_only(
buf,
pattern_lifted.after.iter(),
NewlineAt::Bottom,
indent,
)
} else {
fmt_spaces(buf, pattern_lifted.after.iter(), indent);
}
}
} else {
@ -1717,12 +1749,14 @@ fn fmt_when<'a>(
inner_indent,
);
if !expr.after.is_empty() {
format_spaces(buf, expr.after, Newlines::Yes, inner_indent);
}
last_after = expr.after;
prev_branch_was_multiline = is_multiline_expr || is_multiline_patterns;
}
if !last_after.is_empty() {
format_spaces(buf, last_after, Newlines::Yes, indent);
}
}
fn fmt_dbg_stmt<'a>(