Fix import-hiding-paragraph with policy/=free (fixes #150)
parent
6725d0e119
commit
5816704658
|
@ -734,6 +734,21 @@ import Test hiding ( )
|
||||||
import Test as T
|
import Test as T
|
||||||
hiding ( )
|
hiding ( )
|
||||||
|
|
||||||
|
#test import-hiding-many
|
||||||
|
import Prelude as X
|
||||||
|
hiding ( head
|
||||||
|
, init
|
||||||
|
, last
|
||||||
|
, maximum
|
||||||
|
, minimum
|
||||||
|
, pred
|
||||||
|
, read
|
||||||
|
, readFile
|
||||||
|
, succ
|
||||||
|
, tail
|
||||||
|
, undefined
|
||||||
|
)
|
||||||
|
|
||||||
#test long-module-name-simple
|
#test long-module-name-simple
|
||||||
import TestJustShortEnoughModuleNameLikeThisOne ( )
|
import TestJustShortEnoughModuleNameLikeThisOne ( )
|
||||||
import TestJustAbitToLongModuleNameLikeThisOneIs
|
import TestJustAbitToLongModuleNameLikeThisOneIs
|
||||||
|
|
|
@ -736,6 +736,22 @@ import Test (T, T2(), T3(..), T4(T4), T5(T5, t5), T6((<|>)), (+))
|
||||||
import Test hiding ()
|
import Test hiding ()
|
||||||
import Test as T hiding ()
|
import Test as T hiding ()
|
||||||
|
|
||||||
|
#test import-hiding-many
|
||||||
|
import Prelude as X
|
||||||
|
hiding
|
||||||
|
( head
|
||||||
|
, init
|
||||||
|
, last
|
||||||
|
, maximum
|
||||||
|
, minimum
|
||||||
|
, pred
|
||||||
|
, read
|
||||||
|
, readFile
|
||||||
|
, succ
|
||||||
|
, tail
|
||||||
|
, undefined
|
||||||
|
)
|
||||||
|
|
||||||
#test long-module-name-simple
|
#test long-module-name-simple
|
||||||
import TestJustShortEnoughModuleNameLikeThisOne ()
|
import TestJustShortEnoughModuleNameLikeThisOne ()
|
||||||
import TestJustAbitToLongModuleNameLikeThisOneIs ()
|
import TestJustAbitToLongModuleNameLikeThisOneIs ()
|
||||||
|
|
|
@ -87,7 +87,10 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
|
||||||
Just (_, llies) -> do
|
Just (_, llies) -> do
|
||||||
hasComments <- hasAnyCommentsBelow llies
|
hasComments <- hasAnyCommentsBelow llies
|
||||||
if compact
|
if compact
|
||||||
then docSeq [hidDoc, layoutLLIEs True llies]
|
then docAlt
|
||||||
|
[ docSeq [hidDoc, docForceSingleline $ layoutLLIEs True llies]
|
||||||
|
, docPar hidDoc (layoutLLIEs True llies)
|
||||||
|
]
|
||||||
else do
|
else do
|
||||||
ieDs <- layoutAnnAndSepLLIEs llies
|
ieDs <- layoutAnnAndSepLLIEs llies
|
||||||
docWrapNodeRest llies
|
docWrapNodeRest llies
|
||||||
|
@ -99,7 +102,7 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
|
||||||
(docSeq [hidDoc, docParenLSep, docWrapNode llies docEmpty])
|
(docSeq [hidDoc, docParenLSep, docWrapNode llies docEmpty])
|
||||||
(docEnsureIndent (BrIndentSpecial hidDocColDiff) docParenR)
|
(docEnsureIndent (BrIndentSpecial hidDocColDiff) docParenR)
|
||||||
else docSeq [hidDoc, docParenLSep, docSeparator, docParenR]
|
else docSeq [hidDoc, docParenLSep, docSeparator, docParenR]
|
||||||
-- ..[hiding].( b )
|
-- ..[hiding].( b )
|
||||||
[ieD] -> runFilteredAlternative $ do
|
[ieD] -> runFilteredAlternative $ do
|
||||||
addAlternativeCond (not hasComments)
|
addAlternativeCond (not hasComments)
|
||||||
$ docSeq
|
$ docSeq
|
||||||
|
@ -112,9 +115,9 @@ layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of
|
||||||
addAlternative $ docPar
|
addAlternative $ docPar
|
||||||
(docSeq [hidDoc, docParenLSep, docNonBottomSpacing ieD])
|
(docSeq [hidDoc, docParenLSep, docNonBottomSpacing ieD])
|
||||||
(docEnsureIndent (BrIndentSpecial hidDocColDiff) docParenR)
|
(docEnsureIndent (BrIndentSpecial hidDocColDiff) docParenR)
|
||||||
-- ..[hiding].( b
|
-- ..[hiding].( b
|
||||||
-- , b'
|
-- , b'
|
||||||
-- )
|
-- )
|
||||||
(ieD:ieDs') ->
|
(ieD:ieDs') ->
|
||||||
docPar
|
docPar
|
||||||
(docSeq [hidDoc, docSetBaseY $ docSeq [docParenLSep, ieD]])
|
(docSeq [hidDoc, docSetBaseY $ docSeq [docParenLSep, ieD]])
|
||||||
|
|
Loading…
Reference in New Issue