Rework bindings

src/Nixfmt/Pretty.hs

@@ -83,9 +83,21 @@ instance Pretty Binder where
 
     -- `foo = bar`
     pretty (Assignment selectors assign expr semicolon)
-        = base $ group (hcat selectors <> hardspace
-                 <> nest 2 (pretty assign <> softline <> pretty expr))
-          <> pretty semicolon
+        = base $ group $ hcat selectors <> hardspace
+                 <> nest 2 (pretty assign <> absorbInner expr)
+        where
+          -- Function declaration / If statement / Let binding
+          -- If it is multi-line, force it into a new line with indentation, semicolon on separate line
+          absorbInner expr@(Abstraction _ _ _) = line <> pretty expr <> line' <> pretty semicolon
+          absorbInner expr@(If _ _ _ _ _ _)    = line <> pretty expr <> line' <> pretty semicolon
+          absorbInner expr@(Let _ _ _ _)       = line <> pretty expr <> line' <> pretty semicolon
+          -- Absorbable term (list/attrset)
+          -- force-absorb the term and then the semicolon
+          absorbInner expr@(Term t) | isAbsorbable t = hardspace <> group expr <> softline' <> pretty semicolon
+          -- `foo = bar`, otherwise
+          -- Try to absorb and keep the semicolon attached, spread otherwise
+          absorbInner expr = softline <> group (pretty expr <> softline' <> pretty semicolon)
+
 
 -- | Pretty print a term without wrapping it in a group.
 prettyTerm :: Term -> Doc

test/diff/apply/out.nix

@@ -57,10 +57,12 @@
   }
   # https://github.com/kamadorueda/alejandra/issues/372#issuecomment-1435083516
   {
-    outputs = {
+    outputs =
+      {
         utils,
       }:
       # For each supported platform,
-      utils.lib.eachDefaultSystem (system: { });
+      utils.lib.eachDefaultSystem (system: { })
+      ;
   }
 ]

test/diff/attr_set/out.nix

@@ -71,11 +71,11 @@
 
     c = 1;
 
-    # d
+      # d
 
     e = 1;
 
-    # f
+      # f
 
   }
 ]

test/diff/comment/out.nix

@@ -52,25 +52,25 @@
     a = 1; # 3
     b = 1;
     c = 1; # 4
-    #5
+      #5
 
-    #6
+      #6
 
     d = 1;
-    #7
+      #7
   }
 
   (let # 1
     #2
     a = 1; # 3
     b = 1;
     c = 1; # 4
-    #5
+      #5
 
-    #6
+      #6
 
     d = 1;
-    #7
+      #7
   in
   d
   )

test/diff/idioms_lib_1/out.nix

@@ -9,5 +9,6 @@
     if pred then
       trace msg x
     else
-      x;
+      x
+    ;
 }