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

Fix comments!! 🎉

pull/83/head
sniperrifle2004 2017-12-19 14:28:22 +01:00
parent 7c51a181c8
commit a59df1f391
3 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,6 +709,29 @@ import qualified Data.List as L
-- Test
import Test ( test )
#test import-with-comments-2
import Test ( abc
, def
-- comment
)
#test import-with-comments-3
import Test ( abc
-- comment
)
#test import-with-comments-4
import Test ( abc
-- comment
, def
, ghi
{- comment -}
, jkl
-- comment
)
#test preamble full-preamble
{-# LANGUAGE BangPatterns #-}

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

@ -741,6 +741,29 @@ import Data.List ( nub ) -- Test
import qualified Data.List as L
( foldl' ) {- Test -}
#test import-with-comments-2
import Test ( abc
, def
-- comment
)
#test import-with-comments-3
import Test ( abc
-- comment
)
#test import-with-comments-4
import Test ( abc
-- comment
, def
, ghi
{- comment -}
, jkl
-- comment
)
-- Test
import Test ( test )

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

@ -76,25 +76,50 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
docEnsureIndent (BrIndentSpecial qLength) $ appSep $ docLit modNameT
hidDoc =
if hiding then appSep $ docLit $ Text.pack "hiding" else docEmpty
importHead = docSeq [importQualifiers, modNameD]
Just lies = mlies
importHead = docSeq [importQualifiers, modNameD]
Just lies = mlies
Just (_, llies) = mllies
(ieH:ieT) = map layoutIE lies
(ieH:ieT) = map layoutIE lies
makeIENode ie = docSeq [docCommaSep, ie]
bindings@(bindingsH:bindingsT) =
docSeq [docParenLSep, ieH]
: map makeIENode ieT
: bindingsT'
++ [docSeq [docSeparator, docParenR]]
where
-- Handle the last element with docWrapNode llies
bindingsT' =
case ieT of
[] -> []
[ie] -> [makeIENode $ docWrapNode llies $ ie]
_ -> map makeIENode (List.init ieT) ++ [makeIENode $ docWrapNode llies $ List.last ieT]
bindingsD = case mlies of
Nothing -> docSeq [docEmpty]
Nothing -> docSeq [docEmpty]
-- ..[hiding].( )
Just [] -> docSeq [hidDoc, docParenLSep, docParenR]
Just [] -> do
hasComments <- hasAnyCommentsBelow llies
if hasComments
then
docWrapNodeRest llies
$ docPar
(docSeq [hidDoc, docParenLSep, docWrapNode llies docEmpty])
$ docLines [docParenR]
else
docWrapNodeRest llies $ docSeq [hidDoc, docParenLSep, docParenR]
-- ..[hiding].( b )
Just [_] -> docSeq $ hidDoc : bindings
Just [_] -> do
hasComments <- hasAnyCommentsBelow llies
if hasComments
then
docWrapNodeRest llies $ docPar (docSeq [hidDoc, docWrapNode llies $ bindingsH]) $ docLines
bindingsT
else
docWrapNodeRest llies $ docSeq $ hidDoc : bindings
-- ..[hiding].( b
-- , b'
-- )
Just _ -> docWrapNode llies $ docPar (docSeq [hidDoc, docSetBaseY $ bindingsH]) $ docLines bindingsT
Just _ ->
docWrapNodeRest llies $ docPar (docSeq [hidDoc, docSetBaseY $ bindingsH])
$ docLines bindingsT
bindingLine =
docEnsureIndent (BrIndentSpecial (importCol - bindingCost)) bindingsD
case asT of