isSimple: Mark numbers and other tokens as simple

Identifiers already were, that the others weren't was a mere oversight. Fixes NixOS#203
piegamesde · Dec 2, 2024 · 64d3540 · 64d3540
1 parent 4200d2e
commit 64d3540
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/src/Nixfmt/Pretty.hs b/src/Nixfmt/Pretty.hs
@@ -776,6 +776,9 @@ isSimple (Term (SimpleString (LoneAnn _))) = True
 isSimple (Term (IndentedString (LoneAnn _))) = True
 isSimple (Term (Path (LoneAnn _))) = True
 isSimple (Term (Token (LoneAnn (Identifier _)))) = True
+isSimple (Term (Token (LoneAnn (Integer _)))) = True
+isSimple (Term (Token (LoneAnn (Float _)))) = True
+isSimple (Term (Token (LoneAnn (EnvPath _)))) = True
 isSimple (Term (Selection t selectors def)) =
   isSimple (Term t) && all isSimpleSelector selectors && isNothing def
 isSimple (Term (Parenthesized (LoneAnn _) e (LoneAnn _))) = isSimple e

diff --git a/test/diff/apply_with_lists/out-pure.nix b/test/diff/apply_with_lists/out-pure.nix
@@ -19,18 +19,9 @@
     name
   )
   (replaceStrings [ "@" ":" "\\" "[" "]" ] [ "-" "-" "-" "" "" ])
-  (lists.removePrefix
-    [
-      1
-      2
-    ]
-    [ ]
-  )
+  (lists.removePrefix [ 1 2 ] [ ])
   (lists.removePrefix aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    [
-      1
-      2
-    ]
+    [ 1 2 ]
     [ ]
   )
   (builtins.replaceStrings [ "@NIX_STORE_VERITY@" ] [ partitionTypes.usr-verity ]

diff --git a/test/diff/apply_with_lists/out.nix b/test/diff/apply_with_lists/out.nix
@@ -19,18 +19,9 @@
     name
   )
   (replaceStrings [ "@" ":" "\\" "[" "]" ] [ "-" "-" "-" "" "" ])
-  (lists.removePrefix
-    [
-      1
-      2
-    ]
-    [ ]
-  )
+  (lists.removePrefix [ 1 2 ] [ ])
   (lists.removePrefix aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    [
-      1
-      2
-    ]
+    [ 1 2 ]
     [ ]
   )
   (builtins.replaceStrings [ "@NIX_STORE_VERITY@" ] [ partitionTypes.usr-verity ]