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

Fix Import

mxxun/ghc-9.2
mrkun 2022-01-30 23:21:52 +03:00
parent 05bcc7571a
commit a0157b6cfc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/library/Language/Haskell/Brittany/Internal/Layouters/Import.hs
View File

@ -7,6 +7,7 @@ import qualified Data.Text as Text
import GHC (GenLocated(L), Located, moduleNameString, unLoc) import GHC (GenLocated(L), Located, moduleNameString, unLoc)
import GHC.Hs import GHC.Hs
import GHC.Types.Basic import GHC.Types.Basic
import qualified GHC.Types.SourceText
import GHC.Unit.Types (IsBootInterface(..)) import GHC.Unit.Types (IsBootInterface(..))
import Language.Haskell.Brittany.Internal.Config.Types import Language.Haskell.Brittany.Internal.Config.Types
import Language.Haskell.Brittany.Internal.LayouterBasics import Language.Haskell.Brittany.Internal.LayouterBasics
@ -17,13 +18,13 @@ import Language.Haskell.Brittany.Internal.Types
prepPkg :: SourceText -> String prepPkg :: GHC.Types.SourceText.SourceText -> String
prepPkg rawN = case rawN of prepPkg rawN = case rawN of
SourceText n -> n GHC.Types.SourceText.SourceText n -> n
-- This would be odd to encounter and the -- This would be odd to encounter and the
-- result will most certainly be wrong -- result will most certainly be wrong
NoSourceText -> "" GHC.Types.SourceText.NoSourceText -> ""
prepModName :: Located e -> e prepModName :: LocatedAn an e -> e
prepModName = unLoc prepModName = unLoc
layoutImport :: ImportDecl GhcPs -> ToBriDocM BriDocNumbered layoutImport :: ImportDecl GhcPs -> ToBriDocM BriDocNumbered
@ -36,7 +37,7 @@ layoutImport importD = case importD of
let let
compact = indentPolicy /= IndentPolicyFree compact = indentPolicy /= IndentPolicyFree
modNameT = Text.pack $ moduleNameString modName modNameT = Text.pack $ moduleNameString modName
pkgNameT = Text.pack . prepPkg . sl_st <$> pkg pkgNameT = Text.pack . prepPkg . GHC.Types.SourceText.sl_st <$> pkg
masT = Text.pack . moduleNameString . prepModName <$> mas masT = Text.pack . moduleNameString . prepModName <$> mas
hiding = maybe False fst mllies hiding = maybe False fst mllies
minQLength = length "import qualified " minQLength = length "import qualified "