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

refactor fmt_final_comments to be more generic

Browse source
This commit is contained in:
Sébastien Besnier 2020-11-15 09:57:29 +01:00
parent 74dde77003
commit bc203371be
2 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,8 @@ use crate::annotation::{Formattable, Newlines, Parens};
use crate::def::fmt_def;
use crate::pattern::fmt_pattern;
use crate::spaces::{
add_spaces, fmt_comments_only, fmt_condition_spaces, fmt_final_comments_spaces, fmt_spaces,
newline, INDENT,
add_spaces, fmt_comments_only, fmt_condition_spaces, fmt_comments_only_bis, fmt_spaces,
newline, INDENT, NewlineAt
};
use bumpalo::collections::String;
use roc_module::operator::{self, BinOp};
@ -814,11 +814,11 @@ pub fn fmt_record<'a>(
format_field_multiline(buf, &field.value, field_indent, "");
}
fmt_final_comments_spaces(buf, final_comments.iter(), field_indent);
fmt_comments_only_bis(buf, final_comments.iter(), NewlineAt::Top, field_indent);
newline(buf, indent);
} else {
// is_multiline == false
} else {
// is_multiline == false */
buf.push(' ');
let field_indent = indent;
let mut iter = loc_fields.iter().peekable();
@ -882,12 +882,12 @@ fn format_field_multiline<'a, T>(
buf.push(',');
}
AssignedField::SpaceBefore(sub_field, spaces) => {
fmt_final_comments_spaces(buf, spaces.iter(), indent);
fmt_comments_only_bis(buf, spaces.iter(),NewlineAt::Top, indent);
format_field_multiline(buf, sub_field, indent, separator_prefix);
}
AssignedField::SpaceAfter(sub_field, spaces) => {
format_field_multiline(buf, sub_field, indent, separator_prefix);
fmt_final_comments_spaces(buf, spaces.iter(), indent);
fmt_comments_only_bis(buf, spaces.iter(), NewlineAt::Top,indent);
}
Malformed(raw) => {
buf.push_str(raw);