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

Also handle comments inside ThingWith

pull/83/head
sniperrifle2004 2017-12-22 06:58:39 +01:00
parent 21c080572b
commit 3708838b6a
3 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src-literatetests/10-tests.blt
View File

@ -765,7 +765,27 @@ import Test ( -- comment
#test long-bindings
import Test ( longbindingNameThatoverflowsColum )
import Test ( Long(List, Of, Things) )
import Test ( Long( List
, Of
, Things
) )
#test things-with-with-comments
import Test ( Thing( -- Comments
)
)
import Test ( Thing( Item
-- and Comment
)
)
import Test ( Thing( With
-- Comments
, and
-- also
, items
-- !
)
)
#test preamble full-preamble
{-# LANGUAGE BangPatterns #-}

22
src-literatetests/tests-context-free.blt
View File

@ -771,6 +771,28 @@ import Test ( -- comment
import Test (longbindingNameThatoverflowsColum)
import Test (Long(List, Of, Things))
#test things-with-with-comments
import Test ( Thing( With
-- Comments
, and
-- also
, items
-- !
)
)
import Test ( Thing( Item
-- and Comment
)
)
import Test ( Thing( With
-- Comments
, and
-- also
, items
-- !
)
)
#test preamble full-preamble
{-# LANGUAGE BangPatterns #-}

32
src/Language/Haskell/Brittany/Internal/Layouters/IE.hs
View File

@ -44,14 +44,32 @@ layoutIE lie@(L _ ie) = docWrapNode lie $ case ie of
IEThingAbs _ -> ien
IEThingAll _ -> docSeq [ien, docLit $ Text.pack "(..)"]
IEThingWith _ (IEWildcard _) _ _ -> docSeq [ien, docLit $ Text.pack "(..)"]
IEThingWith _ _ ns fs ->
docSeq
$ [ien, docLit $ Text.pack "("]
++ intersperse docCommaSep (map nameDoc ns ++ map prepareFL fs)
++ [docLit $ Text.pack ")"]
IEThingWith _ _ ns _ -> do
hasComments <- hasAnyCommentsBelow lie
docAltFilter
[(not hasComments, docSeq $ [ien, docLit $ Text.pack "("]
++ intersperse docCommaSep (map nameDoc ns)
++ [docParenR])
,(otherwise, docSeq [ien, layoutItems (splitFirstLast ns)])
]
where
nameDoc = (docLit =<<) . lrdrNameToTextAnn . prepareName
prepareFL = docLit . Text.pack . FastString.unpackFS . flLabel . unLoc
layoutItem n = docSeq [docCommaSep, docWrapNode n $ nameDoc n]
layoutItems FirstLastEmpty =
docSetBaseY $
docLines [docSeq [docParenLSep, docWrapNodeRest lie docEmpty]
,docParenR
]
layoutItems (FirstLastSingleton n) =
docSetBaseY $ docLines
[docSeq [docParenLSep, docWrapNodeRest lie $ nameDoc n], docParenR]
layoutItems (FirstLast n1 nMs nN) =
docSetBaseY $ docLines $
[docSeq [docParenLSep, docWrapNode n1 $ nameDoc n1]]
++ map layoutItem nMs
++ [ docSeq [docCommaSep, docWrapNodeRest lie $ nameDoc nN]
, docParenR
]
IEModuleContents n -> docSeq
[ docLit $ Text.pack "module"
, docSeparator
@ -101,7 +119,7 @@ layoutLLIEs llies = do
[] -> docAltFilter
[ (not hasComments, docLit $ Text.pack "()")
, (otherwise, docPar (docSeq [docParenLSep, docWrapNode llies docEmpty])
$ docLines [docParenR])
docParenR)
]
(ieDsH:ieDsT) ->
docAltFilter