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

feat(fmt): better validator formatting with double supported

This commit is contained in:
rvcas 2023-03-16 19:34:16 -04:00
parent ed92869fb9
commit 15bdb6972d
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
2 changed files with 73 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,10 +240,11 @@ impl<'comments> Formatter<'comments> {
Definition::Validator(Validator {
end_position,
fun: function,
fun,
other_fun,
params,
..
}) => self.definition_validator(params, function, *end_position),
}) => self.definition_validator(params, fun, other_fun, *end_position),
Definition::Test(Function {
name,
@ -507,53 +508,59 @@ impl<'comments> Formatter<'comments> {
other_fun: &'a Option<UntypedFunction>,
end_position: usize,
) -> Document<'a> {
// Fn and args
let head = "fn"
.to_doc()
.append(" ")
.append(fun.name.to_doc())
.append(wrap_args(
fun.arguments.iter().map(|e| (self.fn_arg(e), false)),
));
// Add return annotation
let head = match &fun.return_annotation {
Some(anno) => head.append(" -> ").append(self.annotation(anno)),
None => head,
}
.group();
// Format body
let body = self.expr(&fun.body);
// Add any trailing comments
let body = match printed_comments(self.pop_comments(fun.end_position), false) {
Some(comments) => body.append(line()).append(comments),
None => body,
};
// validator name(params)
let v_head = "validator".to_doc().append(if !params.is_empty() {
wrap_args(params.iter().map(|e| (self.fn_arg(e), false)))
} else {
"".to_doc()
});
// Stick it all together
let inner_fn = head
.append(" {")
.append(line().append(body).nest(INDENT).group())
.append(line())
.append("}");
let inner_fn = line()
.append(self.definition_fn(
&false,
"fn",
&fun.name,
&fun.arguments,
&fun.return_annotation,
&fun.body,
fun.end_position,
))
.nest(INDENT)
.group()
.append(if other_fun.is_some() {
docvec![line()]
} else {
nil()
})
.append(
other_fun
.as_ref()
.map(|other| {
line()
.append(self.definition_fn(
&false,
"fn",
&other.name,
&other.arguments,
&other.return_annotation,
&other.body,
other.end_position,
))
.nest(INDENT)
.group()
})
.unwrap_or_else(nil),
);
let inner_fn = match printed_comments(self.pop_comments(end_position), false) {
Some(comments) => inner_fn.append(line()).append(comments),
None => inner_fn,
};
// validator(params)
let v_head = "validator".to_doc().append(if !params.is_empty() {
wrap_args(params.iter().map(|e| (self.fn_arg(e), false)))
} else {
nil()
});
v_head
.append(" {")
.append(line().append(inner_fn).nest(INDENT).group())
.append(inner_fn)
.append(line())
.append("}")
}

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

@ -76,6 +76,32 @@ fn test_format_validator() {
assert_fmt(src, expected)
}
#[test]
fn test_format_double_validator() {
let src = indoc! {r#"
validator ( param1 : ByteArray ) {
fn foo (d: Datum, r: Redeemer, ctx: ScriptContext) -> Bool {
True
}
fn bar(r: Redeemer, ctx : ScriptContext ) -> Bool { True }
}
"#};
let expected = indoc! {r#"
validator(param1: ByteArray) {
fn foo(d: Datum, r: Redeemer, ctx: ScriptContext) -> Bool {
True
}
fn bar(r: Redeemer, ctx: ScriptContext) -> Bool {
True
}
}
"#};
assert_fmt(src, expected)
}
#[test]
fn test_format_when() {
let src = indoc! {r#"