Rework bindings

src/Nixfmt/Pretty.hs

@@ -81,11 +81,26 @@ instance Pretty Binder where
         = base $ group (pretty inherit <> hardspace
                  <> nest 2 ((pretty source) <> line <> sepBy line ids <> line' <> pretty semicolon))
 
-    -- `foo = bar`
+    -- `foo = bar`, where bar is a function declaration
+    pretty (Assignment selectors assign expr@(Abstraction _ _ _) semicolon)
+        = base $ group $ hcat selectors <> hardspace
+                 <> nest 2 (pretty assign <> group (line <> pretty expr <> line' <> pretty semicolon))
+
+    -- `foo = bar`, where bar is a let binding
+    pretty (Assignment selectors assign expr@(Let _ _ _ _) semicolon)
+        = base $ group $ hcat selectors <> hardspace
+                 <> nest 2 (pretty assign <> line <> pretty expr <> line' <> pretty semicolon)
+
+    -- `foo = bar`, where bar is an absorbable expression (list/attrset)
+    pretty (Assignment selectors assign expr@(Term t) semicolon) | isAbsorbable t
+        = base $ group $ hcat selectors <> hardspace
+                 <> nest 2 (pretty assign <> hardspace <> group expr <> softline' <> pretty semicolon)
+
+    -- `foo = bar`, otherwise
     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 <> 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
+    ;
 }