Merge pull request #227 from rhendric/rhendric/pipe-operators

Support pipe operators
NixOS · Aug 6, 2024 · 08144b4 · 08144b4
2 parents e819b2d + 55feeb5
commit 08144b4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/src/Nixfmt/Parser.hs b/src/Nixfmt/Parser.hs
@@ -17,7 +17,7 @@ import Data.Maybe (fromMaybe, mapMaybe, maybeToList)
 import Data.Text (Text)
 import qualified Data.Text as Text
 import Data.Void (Void)
-import Nixfmt.Lexer (lexeme, pushTrivia, takeTrivia, whole)
+import Nixfmt.Lexer (lexeme, takeTrivia, whole)
 import Nixfmt.Parser.Float (floatParse)
 import Nixfmt.Types (
   Ann (..),
@@ -38,7 +38,6 @@ import Nixfmt.Types (
   StringPart (..),
   Term (..),
   Token (..),
-  Trivium (..),
   Whole (..),
   operators,
   tokenText,
@@ -470,7 +469,7 @@ operator t =
                     TMinus -> ">"
                     TMul -> "/"
                     TDiv -> "/*"
-                    TLess -> "="
+                    TLess -> "=|"
                     TGreater -> "="
                     TNot -> "="
                     _ -> ""

diff --git a/src/Nixfmt/Types.hs b/src/Nixfmt/Types.hs
@@ -424,6 +424,8 @@ data Token
   | TLessEqual
   | TNot
   | TUnequal
+  | TPipeForward
+  | TPipeBackward
   | SOF
   deriving (Eq, Show)
 
@@ -466,7 +468,9 @@ operators =
     ],
     [Op InfixL TAnd],
     [Op InfixL TOr],
-    [Op InfixL TImplies]
+    [Op InfixL TImplies],
+    [Op InfixL TPipeForward],
+    [Op InfixR TPipeBackward]
   ]
 
 tokenText :: Token -> Text
@@ -519,4 +523,6 @@ tokenText TLess = "<"
 tokenText TLessEqual = "<="
 tokenText TNot = "!"
 tokenText TUnequal = "!="
+tokenText TPipeForward = "|>"
+tokenText TPipeBackward = "<|"
 tokenText SOF = ""
diff --git a/test/diff/operation/in.nix b/test/diff/operation/in.nix
@@ -156,4 +156,17 @@
       z = 30;
     }
 )
+
+  # Experimental pipe operators
+  (
+  a // b
+  |> f "very long argument should justify splitting this over multiple lines"
+  |> g { }
+  )
+
+  (
+  g { } <|
+    f "very long argument should justify splitting this over multiple lines" <|
+    a // b
+  )
 ]
diff --git a/test/diff/operation/out.nix b/test/diff/operation/out.nix
@@ -273,4 +273,17 @@
         z = 30;
       }
   )
+
+  # Experimental pipe operators
+  (
+    a // b
+    |> f "very long argument should justify splitting this over multiple lines"
+    |> g { }
+  )
+
+  (
+    g { }
+    <| f "very long argument should justify splitting this over multiple lines"
+    <| a // b
+  )
 ]