hexagoxel
/
brittany
1
0
Fork 0
Code Issues 117 Pull Requests 5 Packages Projects Releases 5 Wiki Activity

Fix up layouter basics

pull/356/head
Taylor Fausak 2021-10-29 00:38:29 +00:00 committed by GitHub
parent dc9e515b79
commit b12f8982ac
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Language/Haskell/Brittany/Internal/LayouterBasics.hs
View File

@ -99,6 +99,15 @@ import Language.Haskell.Brittany.Internal.Types
import Language.Haskell.Brittany.Internal.Utils import Language.Haskell.Brittany.Internal.Utils
import Language.Haskell.Brittany.Internal.ExactPrintUtils import Language.Haskell.Brittany.Internal.ExactPrintUtils
#if MIN_VERSION_ghc(9,0,0)
import GHC.Types.Name.Reader ( RdrName(..) )
import GHC ( Located, runGhc, GenLocated(L), moduleNameString )
import qualified GHC.Types.SrcLoc as GHC
import GHC.Types.Name.Occurrence ( occNameString )
import GHC.Types.Name ( getOccString )
import GHC ( moduleName )
import GHC.Parser.Annotation ( AnnKeywordId(..) )
#else
import RdrName ( RdrName(..) ) import RdrName ( RdrName(..) )
import GHC ( Located, runGhc, GenLocated(L), moduleNameString ) import GHC ( Located, runGhc, GenLocated(L), moduleNameString )
import qualified SrcLoc as GHC import qualified SrcLoc as GHC
@ -106,6 +115,7 @@ import OccName ( occNameString )
import Name ( getOccString ) import Name ( getOccString )
import Module ( moduleName ) import Module ( moduleName )
import ApiAnnotation ( AnnKeywordId(..) ) import ApiAnnotation ( AnnKeywordId(..) )
#endif
import Data.Data import Data.Data
import Data.Generics.Schemes import Data.Generics.Schemes
@ -299,7 +309,13 @@ filterAnns ast =
-- b) after (in source code order) the node. -- b) after (in source code order) the node.
hasAnyCommentsBelow :: Data ast => GHC.Located ast -> ToBriDocM Bool hasAnyCommentsBelow :: Data ast => GHC.Located ast -> ToBriDocM Bool
hasAnyCommentsBelow ast@(L l _) = hasAnyCommentsBelow ast@(L l _) =
#if MIN_VERSION_ghc(9,0,0)
case l of
GHC.RealSrcSpan rss _ -> List.any (\(c, _) -> ExactPrint.commentIdentifier c > rss)
GHC.UnhelpfulSpan _ -> const False
#else
List.any (\(c, _) -> ExactPrint.commentIdentifier c > l) List.any (\(c, _) -> ExactPrint.commentIdentifier c > l)
#endif
<$> astConnectedComments ast <$> astConnectedComments ast
hasCommentsBetween hasCommentsBetween