From 711825340125dfd3de83c2495fa869458d2ac6dd Mon Sep 17 00:00:00 2001
From: rvcas <x@rvcas.dev>
Date: Sat, 18 Nov 2023 17:15:58 -0500
Subject: [PATCH] fix: if branches, final_else, and anon fns should all be "top
 level"

---
 crates/aiken-lang/src/format.rs        | 10 +++++-----
 examples/gift_card/validators/multi.ak |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/aiken-lang/src/format.rs b/crates/aiken-lang/src/format.rs
index c163d34b..726914c2 100644
--- a/crates/aiken-lang/src/format.rs
+++ b/crates/aiken-lang/src/format.rs
@@ -610,9 +610,9 @@ impl<'comments> Formatter<'comments> {
         let args = wrap_args(args.iter().map(|e| (self.fn_arg(e), false))).group();
         let body = match body {
             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);
@@ -1071,7 +1071,7 @@ impl<'comments> Formatter<'comments> {
 
         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("}");
 
@@ -1092,7 +1092,7 @@ impl<'comments> Formatter<'comments> {
             .append(break_("{", " {"))
             .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)
     }
@@ -1146,7 +1146,7 @@ impl<'comments> Formatter<'comments> {
         let precedence = name.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 right = self.expr(right, false);
diff --git a/examples/gift_card/validators/multi.ak b/examples/gift_card/validators/multi.ak
index d998eb58..c267513f 100644
--- a/examples/gift_card/validators/multi.ak
+++ b/examples/gift_card/validators/multi.ak
@@ -119,12 +119,12 @@ fn check_mint_and_outputs(
   when minted_assets is {
     [] -> True
     [(minted_asset_name, quantity), ..rest_assets] -> {
-      expect True =
+      expect
         list.any(
           expected_assets,
           fn(expected_asset) { expected_asset == minted_asset_name },
         )
-      expect True =
+      expect
         list.any(
           outputs,
           fn(output) {