Lists: Fix absorbtion rules

For some reasons instead of one condition it was split into two conditions, which covered everything necessery minus one edge case
piegamesde · Jan 8, 2024 · a273e5a · a273e5a
1 parent 35da232
commit a273e5a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/src/Nixfmt/Pretty.hs b/src/Nixfmt/Pretty.hs
@@ -409,10 +409,10 @@ isAbstractionWithAbsorbableTerm _ = False
 isAbsorbable :: Term -> Bool
 isAbsorbable (String (Ann _ parts@(_:_:_) _))
     = not $ isSimpleString parts
+-- Non-empty sets and lists
 isAbsorbable (Set _ _ (Items (_:_)) _)                                   = True
-isAbsorbable (List (Ann [] _ Nothing) (Items [CommentedItem [] _]) _)    = True
+isAbsorbable (List _ (Items (_:_)) _)                                    = True
 isAbsorbable (Parenthesized (Ann [] _ Nothing) (Term t) _)               = isAbsorbable t
-isAbsorbable (List _ (Items (_:_:_)) _)                                  = True
 isAbsorbable _                                                           = False
 
 absorb :: Doc -> Doc -> Maybe Int -> Expression -> Doc

diff --git a/test/diff/idioms_nixos_1/out.nix b/test/diff/idioms_nixos_1/out.nix
@@ -276,12 +276,10 @@ in
             ]
           );
 
-      boot.initrd.kernelModules =
-        optionals config.boot.initrd.includeDefaultModules
-          [
-            # For LVM.
-            "dm_mod"
-          ];
+      boot.initrd.kernelModules = optionals config.boot.initrd.includeDefaultModules [
+        # For LVM.
+        "dm_mod"
+      ];
     })
 
     (mkIf (!config.boot.isContainer) {

diff --git a/test/diff/lists/in.nix b/test/diff/lists/in.nix
@@ -4,6 +4,20 @@
     foo = "bar";
     foo2 = "barbar";
   } ]
+  { # List in attrset with comment
+
+    imports0 = [];
+
+    imports2 = [
+      # ./disko.nix
+      ./hardware-configuration.nix
+    ];
+    imports3 = [
+      # comment
+      ./disko.nix
+      ./hardware-configuration.nix
+    ];
+  }
   [ (if foo then
     bar #multiline too
     else

diff --git a/test/diff/lists/out.nix b/test/diff/lists/out.nix
@@ -6,6 +6,21 @@
       foo2 = "barbar";
     }
   ]
+  {
+    # List in attrset with comment
+
+    imports0 = [ ];
+
+    imports2 = [
+      # ./disko.nix
+      ./hardware-configuration.nix
+    ];
+    imports3 = [
+      # comment
+      ./disko.nix
+      ./hardware-configuration.nix
+    ];
+  }
   [
     (
       if foo then