fixup! application: Special case list arguments 2/2

src/Nixfmt/Pretty.hs

@@ -469,13 +469,18 @@ prettyApp indentFunction pre hasPost f a =
 
       post = if hasPost then line' else mempty
   in pretty comment'
-      <> case (f, a) of
-        -- When the two last arguments are lists, don't absorb the last one (absorbLast)
-        (Application _ (Term List{}), Term List{}) ->
-          renderSimple
-            (absorbApp (Application fWithoutComment a))
-            (\fRendered -> group' RegularG fRendered)
-            (\fRendered -> group' RegularG $ fRendered <> post)
+      <> case (fWithoutComment, a) of
+        -- When the two last arguments are lists, render these specially (same as above)
+        -- Also no need to wrap in renderSimple here, because we know that these kinds of arguments
+        -- are never "simple" by definition.
+        (Application fWithoutCommandAndWithoutArg l1@(Term List{}), l2@(Term List{})) ->
+          group' RegularG $
+            (pre <> group' Transparent (absorbApp fWithoutCommandAndWithoutArg))
+              <> line
+              <> nest (group (absorbInner l1))
+              <> line
+              <> nest (group (absorbInner l2))
+              <> post
         _ ->
           renderSimple
             (absorbApp fWithoutComment)

test/diff/apply_with_lists/out-pure.nix

@@ -62,7 +62,9 @@
   )
   (lib.mkRenamedOptionModule [ "boot" "extraTTYs" ] [ "console" "extraTTYs" ])
   # This line is engineered to exactly hit the line length limit
-  (lib.mkRenamedOptionModule [ "hardware" "package234" ] [ "hardware" "graphics" ]
+  (lib.mkRenamedOptionModule
+    [ "hardware" "package234" ]
+    [ "hardware" "graphics" ]
   )
   (mkRenamedOptionModule
     [
@@ -102,7 +104,9 @@
     [ "Blue" "Flamingo" "Green" ]
     [ accent ]
     lib.checkListOfEnum
-    "${pname}: color variant" [ "Latte" "Frappe" "Macchiato" "Mocha" ] [ variant ]
+    "${pname}: color variant"
+    [ "Latte" "Frappe" "Macchiato" "Mocha" ]
+    [ variant ]
   )
   (lib.switch
     [ coq.coq-version ssreflect.version ]

test/diff/apply_with_lists/out.nix

@@ -62,7 +62,9 @@
   )
   (lib.mkRenamedOptionModule [ "boot" "extraTTYs" ] [ "console" "extraTTYs" ])
   # This line is engineered to exactly hit the line length limit
-  (lib.mkRenamedOptionModule [ "hardware" "package234" ] [ "hardware" "graphics" ]
+  (lib.mkRenamedOptionModule
+    [ "hardware" "package234" ]
+    [ "hardware" "graphics" ]
   )
   (mkRenamedOptionModule
     [
@@ -106,7 +108,9 @@
     ]
     [ accent ]
     lib.checkListOfEnum
-    "${pname}: color variant" [ "Latte" "Frappe" "Macchiato" "Mocha" ] [ variant ]
+    "${pname}: color variant"
+    [ "Latte" "Frappe" "Macchiato" "Mocha" ]
+    [ variant ]
   )
   (lib.switch
     [ coq.coq-version ssreflect.version ]