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

Also render comments on the binding list

pull/83/head
sniperrifle2004 2017-12-19 01:11:25 +01:00
parent 8c3a9bec25
commit eac17b1bf2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Language/Haskell/Brittany/Internal/Layouters/Import.hs
View File

@ -44,13 +44,13 @@ prepModName = id
layoutImport :: ToBriDoc ImportDecl layoutImport :: ToBriDoc ImportDecl
layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
ImportDecl _ (L _ modName) pkg src safe q False as llies -> do ImportDecl _ (L _ modName) pkg src safe q False as mllies -> do
importCol <- mAsk <&> _conf_layout .> _lconfig_importColumn .> confUnpack importCol <- mAsk <&> _conf_layout .> _lconfig_importColumn .> confUnpack
let let
modNameT = Text.pack $ moduleNameString modName modNameT = Text.pack $ moduleNameString modName
pkgNameT = Text.pack . prepPkg . sl_st <$> pkg pkgNameT = Text.pack . prepPkg . sl_st <$> pkg
asT = Text.pack . moduleNameString . prepModName <$> as asT = Text.pack . moduleNameString . prepModName <$> as
(hiding, mlies) = case llies of (hiding, mlies) = case mllies of
Just (h, L _ lies') -> (h, Just lies') Just (h, L _ lies') -> (h, Just lies')
Nothing -> (False, Nothing) Nothing -> (False, Nothing)
minQLength = length "import qualified " minQLength = length "import qualified "
@ -78,6 +78,7 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
if hiding then appSep $ docLit $ Text.pack "hiding" else docEmpty if hiding then appSep $ docLit $ Text.pack "hiding" else docEmpty
importHead = docSeq [importQualifiers, modNameD] importHead = docSeq [importQualifiers, modNameD]
Just lies = mlies Just lies = mlies
Just (_, llies) = mllies
(ieH:ieT) = map layoutIE lies (ieH:ieT) = map layoutIE lies
makeIENode ie = docSeq [docCommaSep, ie] makeIENode ie = docSeq [docCommaSep, ie]
bindings@(bindingsH:bindingsT) = bindings@(bindingsH:bindingsT) =
@ -93,8 +94,7 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
-- ..[hiding].( b -- ..[hiding].( b
-- , b' -- , b'
-- ) -- )
Just _ -> Just _ -> docWrapNode llies $ docPar (docSeq [hidDoc, docSetBaseY $ bindingsH]) $ docLines bindingsT
docPar (docSeq [hidDoc, docSetBaseY $ bindingsH]) $ docLines bindingsT
bindingLine = bindingLine =
docEnsureIndent (BrIndentSpecial (importCol - bindingCost)) bindingsD docEnsureIndent (BrIndentSpecial (importCol - bindingCost)) bindingsD
case asT of case asT of