Merge pull request #219 from NixOS/fix-idempotency-attribute-par-comm…

…ents Fix non-idempotent comments in attribute parameters
NixOS · Jul 12, 2024 · 278b7ee · 278b7ee
2 parents a98ea65 + 6cb8544
commit 278b7ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Nixfmt/Pretty.hs b/src/Nixfmt/Pretty.hs
@@ -269,11 +269,11 @@ moveParamsComments
   -- # comment
   -- , name2
   ( (ParamAttr name maybeDefault (Just (Ann trivia comma Nothing)))
-      : (ParamAttr (Ann trivia' name' Nothing) maybeDefault' maybeComma')
+      : (ParamAttr (Ann trivia' name' trailing') maybeDefault' maybeComma')
       : xs
     ) =
     ParamAttr name maybeDefault (Just (Ann [] comma Nothing))
-      : moveParamsComments (ParamAttr (Ann (trivia ++ trivia') name' Nothing) maybeDefault' maybeComma' : xs)
+      : moveParamsComments (ParamAttr (Ann (trivia ++ trivia') name' trailing') maybeDefault' maybeComma' : xs)
 -- This may seem like a nonsensical case, but keep in mind that blank lines also count as comments (trivia)
 moveParamsComments
   -- , name

diff --git a/test/diff/regression-218/in.nix b/test/diff/regression-218/in.nix
@@ -0,0 +1,6 @@
+{
+  foo
+  # bar
+  , baz # qux
+}:
+null
diff --git a/test/diff/regression-218/out.nix b/test/diff/regression-218/out.nix
@@ -0,0 +1,6 @@
+{
+  foo,
+  # bar
+  baz, # qux
+}:
+null