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

Fix formatting bug with multline function type alias

Browse source
This commit is contained in:
Joshua Warner 2024-12-31 19:52:23 -05:00
parent 275b2afb55
commit 835c246c56
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
12 changed files with 129 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/compiler/fmt/src/node.rs
View file

@ -123,8 +123,13 @@ pub struct Item<'a> {
}
impl<'a> Item<'a> {
fn is_multiline(&self) -> bool {
self.newline || !self.before.is_empty() || self.node.is_multiline()
fn is_multiline(&self, allow_newlines: bool) -> bool {
let has_newlines = if allow_newlines {
!self.before.is_empty()
} else {
self.before.iter().any(|c| c.is_comment())
};
self.newline || has_newlines || self.node.is_multiline()
}
}
@ -336,11 +341,11 @@ impl<'a> Formattable for Node<'a> {
} => after.is_multiline() || items.iter().any(|item| item.is_multiline()),
Node::CommaSequence {
allow_blank_lines: _,
allow_newlines: _,
allow_newlines,
indent_rest: _,
first,
rest,
} => first.is_multiline() || rest.iter().any(|item| item.is_multiline()),
} => first.is_multiline() || rest.iter().any(|item| item.is_multiline(*allow_newlines)),
Node::Literal(_) => false,
Node::TypeAnnotation(type_annotation) => type_annotation.is_multiline(),
Node::Pattern(pat) => pat.is_multiline(),