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

cleanup and comments

Browse source
This commit is contained in:
Folkert 2020-07-11 01:51:38 +02:00
parent 72ae30eafc
commit 46639c5081
2 changed files with 49 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

21
compiler/fmt/src/expr.rs
View file

@ -560,9 +560,9 @@ fn fmt_if<'a>(
loc_else: &'a Located<Expr<'a>>,
indent: u16,
) {
let is_multiline_then = (&loc_then.value).is_multiline();
let is_multiline_else = (&loc_else.value).is_multiline();
let is_multiline_condition = (&loc_condition.value).is_multiline();
let is_multiline_then = loc_then.is_multiline();
let is_multiline_else = loc_else.is_multiline();
let is_multiline_condition = loc_condition.is_multiline();
let is_multiline = is_multiline_then || is_multiline_else || is_multiline_condition;
let return_indent = if is_multiline {
@ -616,17 +616,9 @@ fn fmt_if<'a>(
if is_multiline {
match &loc_then.value {
Expr::SpaceBefore(expr_below, spaces_below) => {
let any_comments_below = spaces_below.iter().any(is_comment);
if !any_comments_below {
newline(buf, return_indent);
}
fmt_condition_spaces(buf, spaces_below.iter(), return_indent);
if any_comments_below {
newline(buf, return_indent);
}
// we want exactly one newline, user-inserted extra newlines are ignored.
newline(buf, return_indent);
fmt_comments_only(buf, spaces_below.iter(), return_indent);
match &expr_below {
Expr::SpaceAfter(expr_above, spaces_above) => {
@ -764,6 +756,7 @@ pub fn fmt_record<'a>(
indent
};
// we abuse the `Newlines` type to decide between multiline or single-line layout
let newlines = if is_multiline {
Newlines::Yes
} else {