Comment the single-line record decl config flag out
parent
5a49277eba
commit
6c3d9c57c5
|
@ -378,6 +378,7 @@ data
|
||||||
}
|
}
|
||||||
|
|
||||||
#test record single line layout
|
#test record single line layout
|
||||||
|
#pending config flag is disabled for now
|
||||||
{-# LANGUAGE ScopedTypeVariables #-}
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
-- brittany { lconfig_allowSinglelineRecord: true }
|
-- brittany { lconfig_allowSinglelineRecord: true }
|
||||||
data MyRecord = forall a . Show a => MyCons { foo :: a -> a, i :: Int }
|
data MyRecord = forall a . Show a => MyCons { foo :: a -> a, i :: Int }
|
||||||
|
|
|
@ -214,7 +214,7 @@ defaultTestConfig = Config
|
||||||
, _lconfig_allowSingleLineExportList = coerce True
|
, _lconfig_allowSingleLineExportList = coerce True
|
||||||
, _lconfig_allowHangingQuasiQuotes = coerce True
|
, _lconfig_allowHangingQuasiQuotes = coerce True
|
||||||
, _lconfig_experimentalSemicolonNewlines = coerce False
|
, _lconfig_experimentalSemicolonNewlines = coerce False
|
||||||
, _lconfig_allowSinglelineRecord = coerce False
|
-- , _lconfig_allowSinglelineRecord = coerce False
|
||||||
}
|
}
|
||||||
, _conf_errorHandling = (_conf_errorHandling staticDefaultConfig) { _econf_omit_output_valid_check = coerce True }
|
, _conf_errorHandling = (_conf_errorHandling staticDefaultConfig) { _econf_omit_output_valid_check = coerce True }
|
||||||
, _conf_preprocessor = _conf_preprocessor staticDefaultConfig
|
, _conf_preprocessor = _conf_preprocessor staticDefaultConfig
|
||||||
|
|
|
@ -61,7 +61,7 @@ defaultTestConfig = Config
|
||||||
, _lconfig_allowSingleLineExportList = coerce True
|
, _lconfig_allowSingleLineExportList = coerce True
|
||||||
, _lconfig_allowHangingQuasiQuotes = coerce True
|
, _lconfig_allowHangingQuasiQuotes = coerce True
|
||||||
, _lconfig_experimentalSemicolonNewlines = coerce False
|
, _lconfig_experimentalSemicolonNewlines = coerce False
|
||||||
, _lconfig_allowSinglelineRecord = coerce False
|
-- , _lconfig_allowSinglelineRecord = coerce False
|
||||||
}
|
}
|
||||||
, _conf_errorHandling = (_conf_errorHandling staticDefaultConfig)
|
, _conf_errorHandling = (_conf_errorHandling staticDefaultConfig)
|
||||||
{ _econf_ExactPrintFallback = coerce ExactPrintFallbackModeNever
|
{ _econf_ExactPrintFallback = coerce ExactPrintFallbackModeNever
|
||||||
|
|
|
@ -77,7 +77,7 @@ staticDefaultConfig = Config
|
||||||
, _lconfig_allowSingleLineExportList = coerce False
|
, _lconfig_allowSingleLineExportList = coerce False
|
||||||
, _lconfig_allowHangingQuasiQuotes = coerce True
|
, _lconfig_allowHangingQuasiQuotes = coerce True
|
||||||
, _lconfig_experimentalSemicolonNewlines = coerce False
|
, _lconfig_experimentalSemicolonNewlines = coerce False
|
||||||
, _lconfig_allowSinglelineRecord = coerce False
|
-- , _lconfig_allowSinglelineRecord = coerce False
|
||||||
}
|
}
|
||||||
, _conf_errorHandling = ErrorHandlingConfig
|
, _conf_errorHandling = ErrorHandlingConfig
|
||||||
{ _econf_produceOutputOnErrors = coerce False
|
{ _econf_produceOutputOnErrors = coerce False
|
||||||
|
@ -182,7 +182,7 @@ cmdlineConfigParser = do
|
||||||
, _lconfig_allowSingleLineExportList = mempty
|
, _lconfig_allowSingleLineExportList = mempty
|
||||||
, _lconfig_allowHangingQuasiQuotes = mempty
|
, _lconfig_allowHangingQuasiQuotes = mempty
|
||||||
, _lconfig_experimentalSemicolonNewlines = mempty
|
, _lconfig_experimentalSemicolonNewlines = mempty
|
||||||
, _lconfig_allowSinglelineRecord = mempty
|
-- , _lconfig_allowSinglelineRecord = mempty
|
||||||
}
|
}
|
||||||
, _conf_errorHandling = ErrorHandlingConfig
|
, _conf_errorHandling = ErrorHandlingConfig
|
||||||
{ _econf_produceOutputOnErrors = wrapLast $ falseToNothing outputOnErrors
|
{ _econf_produceOutputOnErrors = wrapLast $ falseToNothing outputOnErrors
|
||||||
|
|
|
@ -142,14 +142,14 @@ data CLayoutConfig f = LayoutConfig
|
||||||
-- The implementation for this is a bit hacky and not tested; it might
|
-- The implementation for this is a bit hacky and not tested; it might
|
||||||
-- break output syntax or not work properly for every kind of brace. So
|
-- break output syntax or not work properly for every kind of brace. So
|
||||||
-- far I have considered `do` and `case-of`.
|
-- far I have considered `do` and `case-of`.
|
||||||
, _lconfig_allowSinglelineRecord :: f (Last Bool)
|
-- , _lconfig_allowSinglelineRecord :: f (Last Bool)
|
||||||
-- if true, layouts record data decls as a single line when possible, e.g.
|
-- -- if true, layouts record data decls as a single line when possible, e.g.
|
||||||
-- > MyPoint { x :: Double, y :: Double }
|
-- -- > MyPoint { x :: Double, y :: Double }
|
||||||
-- if false, always use the multi-line layout
|
-- -- if false, always use the multi-line layout
|
||||||
-- > MyPoint
|
-- -- > MyPoint
|
||||||
-- > { x :: Double
|
-- -- > { x :: Double
|
||||||
-- > , y :: Double
|
-- -- > , y :: Double
|
||||||
-- > }
|
-- -- > }
|
||||||
}
|
}
|
||||||
deriving (Generic)
|
deriving (Generic)
|
||||||
|
|
||||||
|
|
|
@ -403,7 +403,8 @@ createDetailsDoc consNameStr details = case details of
|
||||||
RecCon (L _ []) -> docSeq [docLit consNameStr, docSeparator, docLit $ Text.pack "{}"]
|
RecCon (L _ []) -> docSeq [docLit consNameStr, docSeparator, docLit $ Text.pack "{}"]
|
||||||
RecCon lRec@(L _ fields@(_:_)) -> do
|
RecCon lRec@(L _ fields@(_:_)) -> do
|
||||||
let ((fName1, fType1) : fDocR) = mkFieldDocs fields
|
let ((fName1, fType1) : fDocR) = mkFieldDocs fields
|
||||||
allowSingleline <- mAsk <&> _conf_layout .> _lconfig_allowSinglelineRecord .> confUnpack
|
-- allowSingleline <- mAsk <&> _conf_layout .> _lconfig_allowSinglelineRecord .> confUnpack
|
||||||
|
let allowSingleline = False
|
||||||
docAddBaseY BrIndentRegular
|
docAddBaseY BrIndentRegular
|
||||||
$ docSetIndentLevel
|
$ docSetIndentLevel
|
||||||
$ runFilteredAlternative
|
$ runFilteredAlternative
|
||||||
|
|
Loading…
Reference in New Issue