fix: if branches, final_else, and anon fns should all be "top level"
This commit is contained in:
parent
7680d33663
commit
7118253401
|
@ -610,9 +610,9 @@ impl<'comments> Formatter<'comments> {
|
||||||
let args = wrap_args(args.iter().map(|e| (self.fn_arg(e), false))).group();
|
let args = wrap_args(args.iter().map(|e| (self.fn_arg(e), false))).group();
|
||||||
let body = match body {
|
let body = match body {
|
||||||
UntypedExpr::Trace { .. } | UntypedExpr::When { .. } => {
|
UntypedExpr::Trace { .. } | UntypedExpr::When { .. } => {
|
||||||
self.expr(body, false).force_break()
|
self.expr(body, true).force_break()
|
||||||
}
|
}
|
||||||
_ => self.expr(body, false),
|
_ => self.expr(body, true),
|
||||||
};
|
};
|
||||||
|
|
||||||
let header = "fn".to_doc().append(args);
|
let header = "fn".to_doc().append(args);
|
||||||
|
@ -1071,7 +1071,7 @@ impl<'comments> Formatter<'comments> {
|
||||||
|
|
||||||
let else_begin = line().append("} else {");
|
let else_begin = line().append("} else {");
|
||||||
|
|
||||||
let else_body = line().append(self.expr(final_else, false)).nest(INDENT);
|
let else_body = line().append(self.expr(final_else, true)).nest(INDENT);
|
||||||
|
|
||||||
let else_end = line().append("}");
|
let else_end = line().append("}");
|
||||||
|
|
||||||
|
@ -1092,7 +1092,7 @@ impl<'comments> Formatter<'comments> {
|
||||||
.append(break_("{", " {"))
|
.append(break_("{", " {"))
|
||||||
.group();
|
.group();
|
||||||
|
|
||||||
let if_body = line().append(self.expr(&branch.body, false)).nest(INDENT);
|
let if_body = line().append(self.expr(&branch.body, true)).nest(INDENT);
|
||||||
|
|
||||||
if_begin.append(if_body)
|
if_begin.append(if_body)
|
||||||
}
|
}
|
||||||
|
@ -1146,7 +1146,7 @@ impl<'comments> Formatter<'comments> {
|
||||||
let precedence = name.precedence();
|
let precedence = name.precedence();
|
||||||
|
|
||||||
let left_precedence = left.binop_precedence();
|
let left_precedence = left.binop_precedence();
|
||||||
let right_precedence = dbg!(right).binop_precedence();
|
let right_precedence = right.binop_precedence();
|
||||||
|
|
||||||
let left = self.expr(left, false);
|
let left = self.expr(left, false);
|
||||||
let right = self.expr(right, false);
|
let right = self.expr(right, false);
|
||||||
|
|
|
@ -119,12 +119,12 @@ fn check_mint_and_outputs(
|
||||||
when minted_assets is {
|
when minted_assets is {
|
||||||
[] -> True
|
[] -> True
|
||||||
[(minted_asset_name, quantity), ..rest_assets] -> {
|
[(minted_asset_name, quantity), ..rest_assets] -> {
|
||||||
expect True =
|
expect
|
||||||
list.any(
|
list.any(
|
||||||
expected_assets,
|
expected_assets,
|
||||||
fn(expected_asset) { expected_asset == minted_asset_name },
|
fn(expected_asset) { expected_asset == minted_asset_name },
|
||||||
)
|
)
|
||||||
expect True =
|
expect
|
||||||
list.any(
|
list.any(
|
||||||
outputs,
|
outputs,
|
||||||
fn(output) {
|
fn(output) {
|
||||||
|
|
Loading…
Reference in New Issue