import+module: Refactor and Simplify slightly

src-literatetests/10-tests.blt

@@ -544,9 +544,14 @@ func =
        ]
     ++ [ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc]
 
-###
+
+###############################################################################
+###############################################################################
+###############################################################################
 #group module
-###
+###############################################################################
+###############################################################################
+###############################################################################
 
 #test simple
 module Main where
@@ -603,9 +608,13 @@ module Main (Test()) where
 #test empty-with-comment
 -- Intentionally left empty
 
-###
+###############################################################################
-#group import
+###############################################################################
-###
+###############################################################################
+#group module.import
+###############################################################################
+###############################################################################
+###############################################################################
 
 #test simple-import
 import Data.List

src-literatetests/tests-context-free.blt

@@ -593,9 +593,13 @@ func =
       ]
     ++ [ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc]
 
-###
+###############################################################################
+###############################################################################
+###############################################################################
 #group module
-###
+###############################################################################
+###############################################################################
+###############################################################################
 
 #test simple
 module Main where
@@ -652,9 +656,13 @@ module Main (Test()) where
 #test empty-with-comment
 -- Intentionally left empty
 
-###
+###############################################################################
+###############################################################################
+###############################################################################
 #group import
-###
+###############################################################################
+###############################################################################
+###############################################################################
 
 #test simple-import
 import Data.List

src/Language/Haskell/Brittany/Internal/LayouterBasics.hs

@@ -42,6 +42,7 @@ module Language.Haskell.Brittany.Internal.LayouterBasics
   , appSep
   , docCommaSep
   , docParenLSep
+  , docParenR
   , docTick
   , spacifyDocs
   , briDocMToPPM
@@ -465,6 +466,9 @@ docCommaSep = appSep $ docLit $ Text.pack ","
 docParenLSep :: ToBriDocM BriDocNumbered
 docParenLSep = appSep $ docLit $ Text.pack "("
 
+docParenR :: ToBriDocM BriDocNumbered
+docParenR = docLit $ Text.pack ")"
+
 docTick :: ToBriDocM BriDocNumbered
 docTick = docLit $ Text.pack "'"
 

src/Language/Haskell/Brittany/Internal/Layouters/IE.hs

@@ -11,7 +11,13 @@ import           Language.Haskell.Brittany.Internal.LayouterBasics
 import           Language.Haskell.Brittany.Internal.Config.Types
 
 import           RdrName (RdrName(..))
-import GHC (unLoc, runGhc, GenLocated(L), moduleNameString, AnnKeywordId(..))
+import           GHC     ( unLoc
+                         , runGhc
+                         , GenLocated(L)
+                         , moduleNameString
+                         , AnnKeywordId(..)
+                         , Located
+                         )
 import           HsSyn
 import           Name
 import           HsImpExp
@@ -22,53 +28,53 @@ import           BasicTypes
 import           Language.Haskell.Brittany.Internal.Utils
 
 
+
+#if MIN_VERSION_ghc(8,2,0)
+prepareName :: LIEWrappedName name -> Located name
+prepareName = ieLWrappedName
+#else
+prepareName :: Located name -> Located name
+prepareName = id
+#endif
+
 layoutIE :: ToBriDoc IE
-layoutIE lie@(L _ _ie) =
+layoutIE lie@(L _ ie) = docWrapNode lie $ case ie of
-  docWrapNode lie
-    $ let
-        ien = docLit $ rdrNameToText $ ieName _ie
-      in
-        case _ie of
   IEVar      _                     -> ien
   IEThingAbs _                     -> ien
   IEThingAll _                     -> docSeq [ien, docLit $ Text.pack "(..)"]
-          IEThingWith _ (IEWildcard _) _ _ ->
+  IEThingWith _ (IEWildcard _) _ _ -> docSeq [ien, docLit $ Text.pack "(..)"]
-            docSeq [ien, docLit $ Text.pack "(..)"]
   IEThingWith _ _ ns fs ->
-            let
-              prepareFL =
-                docLit . Text.pack . FastString.unpackFS . flLabel . unLoc
-            in
     docSeq
       $  [ien, docLit $ Text.pack "("]
-#if MIN_VERSION_ghc(8,2,0)
+      ++ (  intersperse docCommaSep
-              ++ (  intersperse docCommaSep (map (docLit . lrdrNameToText . ieLWrappedName) ns)
+                        (map (docLit . lrdrNameToText . prepareName) ns)
-#else
+         ++ intersperse docCommaSep (map prepareFL fs)
-              ++ (  intersperse docCommaSep (map (docLit . lrdrNameToText) ns)
-#endif
-                 ++ intersperse docCommaSep (map (prepareFL) fs)
          )
       ++ [docLit $ Text.pack ")"]
+   where
+    prepareFL = docLit . Text.pack . FastString.unpackFS . flLabel . unLoc
   IEModuleContents n -> docSeq
     [ docLit $ Text.pack "module"
     , docSeparator
     , docLit . Text.pack . moduleNameString $ unLoc n
     ]
   _ -> docEmpty
+  where ien = docLit $ rdrNameToText $ ieName ie
 
 layoutIEList :: [LIE RdrName] -> ToBriDocM BriDocNumbered
 layoutIEList lies = do
   ies <- mapM (docSharedWrapper layoutIE) lies
   case ies of
     []         -> docLit $ Text.pack "()"
-    (x:xs) -> docAlt
+    xs@(x1:xr) -> docAlt
       [ docSeq
-      $  [docLit $ Text.pack "(", x]
+        [ docLit $ Text.pack "("
-      ++ map (\x' -> docSeq [docCommaSep, x']) xs
+        , docSeq $ List.intersperse docCommaSep xs
-      ++ [docLit $ Text.pack ")"]
+        , docLit $ Text.pack ")"
+        ]
       , docLines
-        (  docSeq [docLit $ Text.pack "(", docSeparator, x]
+        (  [docSeq [docParenLSep, x1]]
-        :  map (\x' -> docSeq [docCommaSep, x']) xs
+        ++ [ docSeq [docCommaSep, x] | x <- xr ]
-        ++ [docLit $ Text.pack ")"]
+        ++ [docParenR]
         )
       ]

src/Language/Haskell/Brittany/Internal/Layouters/Import.hs

@@ -8,7 +8,13 @@ import           Language.Haskell.Brittany.Internal.Layouters.IE
 import           Language.Haskell.Brittany.Internal.Config.Types
 
 import           RdrName (RdrName(..))
-import GHC (unLoc, runGhc, GenLocated(L), moduleNameString, AnnKeywordId(..))
+import           GHC     ( unLoc
+                         , runGhc
+                         , GenLocated(L)
+                         , moduleNameString
+                         , AnnKeywordId(..)
+                         , Located
+                         )
 import           HsSyn
 import           Name
 import           HsImpExp
@@ -18,12 +24,10 @@ import           BasicTypes
 
 import           Language.Haskell.Brittany.Internal.Utils
 
-layoutImport :: ToBriDoc ImportDecl
+
-layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
+
-  ImportDecl _ (L _ modName) pkg src safe q False as llies ->
-    let
-      modNameT         = Text.pack $ moduleNameString modName
 #if MIN_VERSION_ghc(8,2,0)
+prepPkg :: SourceText -> String
 prepPkg rawN    =
   case rawN of
     SourceText n -> n
@@ -31,16 +35,25 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
     -- result will most certainly be wrong
     NoSourceText -> ""
 #else
+prepPkg :: String -> String
 prepPkg = id
 #endif
-      pkgNameT         = Text.pack . prepPkg . sl_st <$> pkg
 #if MIN_VERSION_ghc(8,2,0)
+prepModName :: Located e -> e
 prepModName = unLoc
 #else
+prepModName :: e -> e
 prepModName = id
 #endif
+
+layoutImport :: ToBriDoc ImportDecl
+layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
+  ImportDecl _ (L _ modName) pkg src safe q False as llies -> do
+    let
+      modNameT         = Text.pack $ moduleNameString modName
+      pkgNameT         = Text.pack . prepPkg . sl_st <$> pkg
+
       asT              = Text.pack . moduleNameString . prepModName <$> as
-      sig              = ColBindingLine (Just (Text.pack "import"))
       importQualifiers = docSeq
         [ appSep $ docLit $ Text.pack "import"
         , if src then appSep $ docLit $ Text.pack "{-# SOURCE #-}" else docEmpty
@@ -52,8 +65,6 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
         appSep $ docSeq [docLit (Text.pack "as"), docSeparator, docLit asT']
       importIds =
         docSeq $ [appSep $ docLit modNameT, fromMaybe docEmpty (makeAs <$> asT)]
-    in
-      do
     (hiding, ies) <- case llies of
       Just (h, L _ lies) -> do
         sies <- docSharedWrapper layoutIEList lies
@@ -62,10 +73,8 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
     h <- docSharedWrapper
       ( const
         ( docSeq
-              [ docCols sig [importQualifiers, importIds]
+          [ docCols ColImport [importQualifiers, importIds]
-              , if hiding
+          , if hiding then appSep $ docLit $ Text.pack "hiding" else docEmpty
-                then appSep $ docLit $ Text.pack "hiding"
-                else docEmpty
           ]
         )
       )

src/Language/Haskell/Brittany/Internal/Layouters/Module.hs

@@ -21,33 +21,26 @@ import           Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types
 
 import           Language.Haskell.Brittany.Internal.Utils
 
+
+
 layoutModule :: ToBriDoc HsModule
 layoutModule lmod@(L _ mod') = do
   case mod' of
     -- Implicit module Main
     HsModule Nothing  _   imports _ _ _ -> docLines $ map layoutImport imports
-    HsModule (Just n) les imports _ _ _ ->
+    HsModule (Just n) les imports _ _ _ -> do
-      let
+      let tn = Text.pack $ moduleNameString $ unLoc n
-        tn = Text.pack $ moduleNameString $ unLoc n
-      in
-        do
-          cs <- do
-            anns <- mAsk
-            case ExactPrint.Types.mkAnnKey lmod `Map.lookup` anns of
-              Just mAnn -> return $ extractAllComments mAnn
-              Nothing   -> return []
       (hasComments, es) <- case les of
         Nothing               -> return (False, docEmpty)
         Just llies@(L _ lies) -> do
           hasComments <- hasAnyCommentsBelow llies
           return (hasComments, docWrapNode llies $ layoutIEList lies)
       docLines
-            (  [ -- A pseudo node that serves merely to force documentation
+        $ docSeq
+            [ docWrapNode lmod $ docEmpty
+               -- A pseudo node that serves merely to force documentation
                -- before the node
-                 docWrapNode lmod $ docEmpty
+            , docAlt
-               | [] /= cs
-               ]
-            ++ [ docAlt
               (  [ docSeq
                      [ appSep $ docLit $ Text.pack "module"
                      , appSep $ docLit tn
@@ -59,9 +52,7 @@ layoutModule lmod@(L _ mod') = do
               ++ [ docLines
                      [ docAddBaseY BrIndentRegular $ docPar
                        ( docSeq
-                              [ appSep $ docLit $ Text.pack "module"
+                         [appSep $ docLit $ Text.pack "module", docLit tn]
-                              , docLit tn
-                              ]
                        )
                        (docForceMultiline es)
                      , docLit $ Text.pack "where"
@@ -69,5 +60,4 @@ layoutModule lmod@(L _ mod') = do
                  ]
               )
             ]
-            ++ map layoutImport imports
+        : map layoutImport imports
-            )

src/Language/Haskell/Brittany/Internal/Types.hs

@@ -178,6 +178,7 @@ data ColSig
   | ColTuple
   | ColTuples
   | ColOpPrefix -- merge with ColList ? other stuff?
+  | ColImport
 
   -- TODO
   deriving (Eq, Ord, Data.Data.Data, Show)