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

Correctly nest multiline pipeline expressions.

Browse Source
This commit is contained in:
KtorZ
2023-03-30 12:48:15 +02:00
parent cb5dc75326
commit 17431daaa4
4 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1030,18 +1030,20 @@ impl<'comments> Formatter<'comments> {
_ => self.wrap_expr(expr),
};
let expr = self.operator_side(doc, 4, expr.binop_precedence());
let expr = self
.operator_side(doc, 4, expr.binop_precedence())
.nest(2 * INDENT + 1);
match printed_comments(comments, true) {
None => {
let pipe = prebreak("|> ", " |> ").nest(2);
let pipe = prebreak("|> ", " |> ").nest(INDENT);
docs.push(pipe.append(expr));
}
Some(comments) => {
let pipe = prebreak("|> ", "|> ");
docs.push(
" ".to_doc()
.append(comments.nest(2).append(pipe.append(expr).group())),
.append(comments.nest(INDENT).append(pipe.append(expr).group())),
);
}
}

25
crates/aiken-lang/src/tests/format.rs
View File

@@ -723,3 +723,28 @@ fn format_trace_callback() {
assert_fmt(src, expected);
}
#[test]
fn format_pipe_fn() {
let src = indoc! { r#"
fn foo() {
outputs
|> list.any(
fn(output) { value.quantity_of(output.value, policy_id, asset_name) == 1 },
)
}
"#};
let expected = indoc! { r#"
fn foo() {
outputs
|> list.any(
fn(output) {
value.quantity_of(output.value, policy_id, asset_name) == 1
},
)
}
"#};
assert_fmt(src, expected);
}