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

add trailing comma in formatter for records

Browse source
This commit is contained in:
Sébastien Besnier 2020-11-11 11:58:21 +01:00
parent 6ad1bb233a
commit 7ec161c415
2 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -803,39 +803,29 @@ pub fn fmt_record<'a>(
let is_multiline = loc_fields.iter().any(|loc_field| loc_field.is_multiline())
|| trailing_comma.is_multiline();
let mut iter = loc_fields.iter().peekable();
let field_indent = if is_multiline {
indent + INDENT
} else {
buf.push(' ');
indent
};
// we abuse the `Newlines` type to decide between multiline or single-line layout
let newlines = if is_multiline {
Newlines::Yes
} else {
Newlines::No
};
while let Some(field) = iter.next() {
field.format_with_options(buf, Parens::NotNeeded, newlines, field_indent);
if iter.peek().is_some() {
buf.push(',');
if !is_multiline {
buf.push(' ');
}
}
}
if is_multiline {
newline(buf, indent)
} else {
let field_indent = indent + INDENT;
for field in loc_fields.iter() {
field.format_with_options(buf, Parens::NotNeeded, Newlines::Yes, field_indent);
buf.push(',');
}
newline(buf, indent);
} else { // is_multiline == false
buf.push(' ');
}
let field_indent = indent;
let mut iter = loc_fields.iter().peekable();
while let Some(field) = iter.next() {
field.format_with_options(buf, Parens::NotNeeded, Newlines::No, field_indent);
if iter.peek().is_some() {
buf.push_str(", ");
}
}
buf.push(' ');
};
buf.push('}');
}
}