waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: formatter weirdness relates to #542

This commit is contained in:
rvcas 2023-05-25 17:19:02 -04:00
parent a124a16a61
commit 151db8d4ae
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/aiken-lang/src/format.rs
View File

@ -286,8 +286,9 @@ impl<'comments> Formatter<'comments> {
None => head, None => head,
Some(t) => head.append(": ").append(self.annotation(t)), Some(t) => head.append(": ").append(self.annotation(t)),
}; };
head.append(" =") head.append(" =")
.append(line()) .append(break_("", " "))
.append(self.const_expr(value)) .append(self.const_expr(value))
.nest(INDENT) .nest(INDENT)
.group() .group()
@ -1452,12 +1453,13 @@ impl<'comments> Formatter<'comments> {
UntypedExpr::When { .. } => line().append(self.expr(expr)).nest(INDENT).group(), UntypedExpr::When { .. } => line().append(self.expr(expr)).nest(INDENT).group(),
_ => line().append(self.expr(expr)).nest(INDENT).group(), _ => break_("", " ").append(self.expr(expr)).nest(INDENT).group(),
} }
} }
fn clause<'a>(&mut self, clause: &'a UntypedClause, index: u32) -> Document<'a> { fn clause<'a>(&mut self, clause: &'a UntypedClause, index: u32) -> Document<'a> {
let space_before = self.pop_empty_lines(clause.location.start); let space_before = self.pop_empty_lines(clause.location.start);
let after_position = clause.location.end;
let clause_doc = join( let clause_doc = join(
clause.patterns.iter().map(|p| self.pattern(p)), clause.patterns.iter().map(|p| self.pattern(p)),
" | ".to_doc(), " | ".to_doc(),
@ -1467,6 +1469,9 @@ impl<'comments> Formatter<'comments> {
Some(guard) => clause_doc.append(" if ").append(self.clause_guard(guard)), Some(guard) => clause_doc.append(" if ").append(self.clause_guard(guard)),
}; };
// Remove any unused empty lines within the clause
self.pop_empty_lines(after_position);
if index == 0 { if index == 0 {
clause_doc clause_doc
} else if space_before { } else if space_before {