Move LocatedL into p_hsmodExports

tweag · Nov 15, 2022 · 317a0fc · 317a0fc
1 parent 3189dd0
commit 317a0fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/Ormolu/Printer/Meat/ImportExport.hs b/src/Ormolu/Printer/Meat/ImportExport.hs
@@ -19,14 +19,15 @@ import Ormolu.Printer.Combinators
 import Ormolu.Printer.Meat.Common
 import Ormolu.Utils (RelativePos (..), attachRelativePos)
 
-p_hsmodExports :: [LIE GhcPs] -> R ()
-p_hsmodExports xs =
-  parens N $ do
-    layout <- getLayout
-    sep
-      breakpoint
-      (\(p, l) -> sitcc (located l (p_lie layout p)))
-      (attachRelativePos xs)
+p_hsmodExports :: LocatedL [LIE GhcPs] -> R ()
+p_hsmodExports lexports =
+  located lexports $ \exports ->
+    inci . parens N $ do
+      layout <- getLayout
+      sep
+        breakpoint
+        (\(p, l) -> sitcc (located l (p_lie layout p)))
+        (attachRelativePos exports)
 
 p_hsmodImport :: ImportDecl GhcPs -> R ()
 p_hsmodImport ImportDecl {..} = do

diff --git a/src/Ormolu/Printer/Meat/Module.hs b/src/Ormolu/Printer/Meat/Module.hs
@@ -53,10 +53,7 @@ p_hsModule mstackHeader pragmas HsModule {..} = do
           breakpoint
         case hsmodExports of
           Nothing -> return ()
-          Just l -> do
-            located l $ \exports -> do
-              inci (p_hsmodExports exports)
-            breakpoint
+          Just exports -> p_hsmodExports exports >> breakpoint
         txt "where"
         newline
     newline