Fix trailing space not being stripped in single-line comments

As per [the standard](https://github.com/NixOS/nixfmt/blob/625158a41cf3e2c420a706af7271bff416a0e661/standard.md#editor-config), trailing spaces should be trimmed
NixOS · Aug 29, 2024 · 0baa6da · 0baa6da
1 parent 783dbd8
commit 0baa6da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
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/out-pure.nix b/test/diff/strip_space/out-pure.nix
@@ -2,8 +2,8 @@
   a
   b
 */
-# a 
-# b	
+# a
+# b
 {
   a = 1;
   b = 2;

diff --git a/test/diff/strip_space/out.nix b/test/diff/strip_space/out.nix
@@ -2,8 +2,8 @@
   a
   b
 */
-# a 
-# b	
+# a
+# b
 {
   a = 1;
   b = 2;