Stop using single-line layout for records defs with comms
parent
d3d3b90558
commit
b6da307ecc
|
@ -61,7 +61,6 @@ data
|
|||
}
|
||||
|
||||
#test record single line layout
|
||||
#pending config flag is disabled for now
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
-- brittany { lconfig_allowSinglelineRecord: true }
|
||||
data MyRecord = forall a . Show a => MyCons { foo :: a -> a, i :: Int }
|
||||
|
@ -73,6 +72,15 @@ data MyRecord = forall a . Show a => Bar
|
|||
{ foo :: abittoolongbutnotvery -> abittoolongbutnotvery
|
||||
}
|
||||
|
||||
#test avoid single-line record if there are comments
|
||||
-- brittany { lconfig_allowSinglelineRecord: true }
|
||||
data MyRecord = MyRecord
|
||||
{ a :: Int
|
||||
-- ^ comment 1
|
||||
, b :: Int
|
||||
-- ^ comment 2
|
||||
}
|
||||
|
||||
#test record forall constraint multiline
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
data MyRecord
|
||||
|
|
|
@ -455,7 +455,9 @@ createDetailsDoc consNameStr details = case details of
|
|||
let ((fName1, fType1), fDocR) = case mkFieldDocs fields of
|
||||
(doc1:docR) -> (doc1, docR)
|
||||
_ -> error "cannot happen (TM)"
|
||||
allowSingleline <- mAsk <&> _conf_layout .> _lconfig_allowSinglelineRecord .> confUnpack
|
||||
allowSingleline <- do
|
||||
allowViaConf <- mAsk <&> _conf_layout .> _lconfig_allowSinglelineRecord .> confUnpack
|
||||
pure (allowViaConf && not (hasAnyCommentsBelow epAnn))
|
||||
docAddBaseY BrIndentRegular $ runFilteredAlternative $ do
|
||||
-- single-line: { i :: Int, b :: Bool }
|
||||
addAlternativeCond allowSingleline $ docSeq
|
||||
|
|
Loading…
Reference in New Issue