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

Fix starts_with_newline logic

Browse source
This commit is contained in:
Richard Feldman 2022-07-06 16:07:28 -04:00
parent 824de8bcc9
commit da8a1fb81f
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -405,20 +405,7 @@ fn starts_with_newline(expr: &Expr) -> bool {
match expr {
SpaceBefore(_, comment_or_newline) => {
if !comment_or_newline.is_empty() {
// safe because we check the length before
comment_or_newline.get(0).unwrap().is_newline()
} else {
false
}
}
SpaceAfter(_, comment_or_newline) => {
if !(**comment_or_newline).is_empty() {
// safe because we check the length before
comment_or_newline.get(0).unwrap().is_newline()
} else {
false
}
matches!(comment_or_newline.first(), Some(CommentOrNewline::Newline))
}
_ => false,
}
@ -829,17 +816,22 @@ fn fmt_if<'a, 'buf>(
if is_multiline_condition {
match &loc_condition.value {
Expr::SpaceBefore(expr_below, spaces_above_expr) => {
fmt_comments_only(buf, spaces_above_expr.iter(), NewlineAt::Top, return_indent);
Expr::SpaceBefore(expr_below, spaces_before_expr) => {
fmt_comments_only(
buf,
spaces_before_expr.iter(),
NewlineAt::Top,
return_indent,
);
buf.newline();
match &expr_below {
Expr::SpaceAfter(expr_above, spaces_below_expr) => {
Expr::SpaceAfter(expr_above, spaces_after_expr) => {
expr_above.format(buf, return_indent);
fmt_comments_only(
buf,
spaces_below_expr.iter(),
NewlineAt::Top,
spaces_after_expr.iter(),
NewlineAt::None,
return_indent,
);
buf.newline();