Merge pull request #164 from avh4/format-infix-order

format: (kernel modules) keep infix operators in the original order
gren-lang · Dec 3, 2022 · ec311b7 · ec311b7
2 parents 2e163e0 + ac5aceb
commit ec311b7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/compiler/src/Gren/Format.hs b/compiler/src/Gren/Format.hs
@@ -228,7 +228,7 @@ formatModule (Src.Module moduleName exports docs imports values unions aliases b
                   ],
           formatCommentBlock (commentsAfterLine <> commentsAfterDocComment),
           Just $ Block.stack $ Block.blankLine :| fmap formatImport imports,
-          infixDefs,
+          Block.stack . (Block.blankLine :|) . pure <$> infixDefs,
           let defs =
                 fmap snd $
                   List.sortOn fst $

diff --git a/compiler/src/Parse/Module.hs b/compiler/src/Parse/Module.hs
@@ -210,7 +210,7 @@ chompInfixes infixes =
         binop <- Decl.infix_
         chompInfixes (binop : infixes)
     ]
-    infixes
+    (reverse infixes)
 
 -- MODULE DOC COMMENT
 

diff --git a/tests/Integration/FormatSpec.hs b/tests/Integration/FormatSpec.hs
@@ -11,6 +11,7 @@ import Data.Text.Encoding qualified as TE
 import Data.Text.Lazy qualified as LazyText
 import Data.Text.Lazy.Encoding qualified as LTE
 import Format qualified
+import Gren.Package qualified
 import Parse.Module qualified as Parse
 import Test.Hspec
 
@@ -318,6 +319,19 @@ spec = do
                                        "f =",
                                        "    0"
                                      ]
+    describe "operator declarations" $ do
+      it "formats" $
+        [ "infix left 0 (|>) = apR",
+          "infix right 0 (<|) = apL",
+          "f = {}"
+        ]
+          `shouldFormatKernelModuleBodyAs` [ "infix left  0 (|>) = apR",
+                                             "infix right 0 (<|) = apL",
+                                             "",
+                                             "",
+                                             "f =",
+                                             "    {}"
+                                           ]
 
   describe "expressions" $ do
     describe "array literals" $ do
@@ -686,10 +700,18 @@ assertFormattedModuleBody lines_ =
   lines_ `shouldFormatModuleBodyAs` lines_
 
 shouldFormatModuleBodyAs :: [Text] -> [Text] -> IO ()
-shouldFormatModuleBodyAs inputLines expectedOutputLines =
+shouldFormatModuleBodyAs =
+  shouldFormatModuleBodyAs_ Parse.Application
+
+shouldFormatKernelModuleBodyAs :: [Text] -> [Text] -> IO ()
+shouldFormatKernelModuleBodyAs =
+  shouldFormatModuleBodyAs_ (Parse.Package Gren.Package.kernel)
+
+shouldFormatModuleBodyAs_ :: Parse.ProjectType -> [Text] -> [Text] -> IO ()
+shouldFormatModuleBodyAs_ projectType inputLines expectedOutputLines =
   let input = TE.encodeUtf8 $ Text.unlines inputLines
       expectedOutput = LazyText.unlines $ fmap LazyText.fromStrict expectedOutputLines
-      actualOutput = LTE.decodeUtf8 . Builder.toLazyByteString <$> Format.formatByteString Parse.Application input
+      actualOutput = LTE.decodeUtf8 . Builder.toLazyByteString <$> Format.formatByteString projectType input
    in case LazyText.stripPrefix "module Main exposing (..)\n\n\n\n" <$> actualOutput of
         Left err ->
           expectationFailure ("shouldFormatModuleBodyAs: failed to format" <> show err)