language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 12:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

functional changes

Browse source
This commit is contained in:
Aidan 2024-07-27 11:40:37 -04:00
parent d5db3137a3
commit 3c78b4fb86
6 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

51
crates/compiler/fmt/src/def.rs
View file

@ -456,11 +456,7 @@ impl<'a> Formattable for ValueDef<'a> {
} => {
fmt_general_def(ann_pattern, buf, indent, ":", &ann_type.value, newlines);
if let Some(comment_str) = comment {
buf.push_str(" #");
buf.spaces(1);
buf.push_str(comment_str.trim());
}
fmt_annotated_body_comment(buf, indent, comment);
buf.newline();
fmt_body(buf, &body_pattern.value, &body_expr.value, indent);
@ -586,6 +582,51 @@ pub fn fmt_defs(buf: &mut Buf, defs: &Defs, indent: u16) {
defs.format(buf, indent);
}
pub fn fmt_annotated_body_comment<'a>(
buf: &mut Buf,
indent: u16,
comment: &'a [roc_parse::ast::CommentOrNewline<'a>],
) {
let mut comment_iter = comment.iter();
if let Some(comment_first) = comment_iter.next() {
match comment_first {
roc_parse::ast::CommentOrNewline::Newline => {
buf.newline();
}
roc_parse::ast::CommentOrNewline::DocComment(comment_str) => {
buf.push_str(" # #");
buf.spaces(1);
buf.push_str(comment_str.trim());
}
roc_parse::ast::CommentOrNewline::LineComment(comment_str) => {
buf.push_str(" #");
buf.spaces(1);
buf.push_str(comment_str.trim());
}
}
for comment_or_newline in comment_iter {
match comment_or_newline {
roc_parse::ast::CommentOrNewline::Newline => {
buf.newline();
}
roc_parse::ast::CommentOrNewline::DocComment(comment_str) => {
buf.indent(indent);
buf.push_str("# #");
buf.spaces(1);
buf.push_str(comment_str.trim());
}
roc_parse::ast::CommentOrNewline::LineComment(comment_str) => {
buf.indent(indent);
buf.push_str("#");
buf.spaces(1);
buf.push_str(comment_str.trim());
}
}
}
}
}
pub fn fmt_body<'a>(buf: &mut Buf, pattern: &'a Pattern<'a>, body: &'a Expr<'a>, indent: u16) {
// Check if this is an assignment into the unit value
let is_unit_assignment = if let Pattern::RecordDestructure(collection) = pattern {

2
crates/compiler/fmt/src/spaces.rs
View file

@ -569,7 +569,7 @@ impl<'a> RemoveSpaces<'a> for ValueDef<'a> {
} => AnnotatedBody {
ann_pattern: arena.alloc(ann_pattern.remove_spaces(arena)),
ann_type: arena.alloc(ann_type.remove_spaces(arena)),
comment: None,
comment: &[],
body_pattern: arena.alloc(body_pattern.remove_spaces(arena)),
body_expr: arena.alloc(body_expr.remove_spaces(arena)),
},