Merge pull request #247 from NixOS/strip-trailing-space

Always strip trailing space
NixOS · Sep 3, 2024 · 2efce29 · 2efce29
2 parents 2a1100d + 0baa6da
commit 2efce29
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/src/Nixfmt/Lexer.hs b/src/Nixfmt/Lexer.hs
@@ -71,7 +71,7 @@ lineComment :: Parser ParseTrivium
 lineComment = preLexeme $ do
   SourcePos{sourceColumn = col} <- getSourcePos
   _ <- chunk "#"
-  text <- manyP (\x -> x /= '\n' && x /= '\r')
+  text <- stripEnd <$> manyP (\x -> x /= '\n' && x /= '\r')
   return (PTLineComment text col)
 
 blockComment :: Parser ParseTrivium

diff --git a/test/diff/strip_space/in.nix b/test/diff/strip_space/in.nix
@@ -0,0 +1,10 @@
+/*
+  a 
+  b	
+*/
+# a 
+# b	
+{
+  a = 1; 
+  b = 2;	
+}
diff --git a/test/diff/strip_space/out-pure.nix b/test/diff/strip_space/out-pure.nix
@@ -0,0 +1,10 @@
+/*
+  a
+  b
+*/
+# a
+# b
+{
+  a = 1;
+  b = 2;
+}
diff --git a/test/diff/strip_space/out.nix b/test/diff/strip_space/out.nix
@@ -0,0 +1,10 @@
+/*
+  a
+  b
+*/
+# a
+# b
+{
+  a = 1;
+  b = 2;
+}