slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: Hledger.Utils.IO: more robust monochrome pretty/debug printing

Browse Source
This commit is contained in:
Simon Michael 2023-05-18 06:24:51 -10:00
parent 83de76b67a
commit 3d2ef21081
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hledger-lib/Hledger/Utils/IO.hs
View File

@ -119,7 +119,7 @@ import System.IO.Unsafe (unsafePerformIO)
import System.Pager (printOrPage) import System.Pager (printOrPage)
#endif #endif
import Text.Pretty.Simple import Text.Pretty.Simple
(CheckColorTty(CheckColorTty), OutputOptions(..), (CheckColorTty(..), OutputOptions(..),
defaultOutputOptionsDarkBg, defaultOutputOptionsNoColor, pShowOpt, pPrintOpt) defaultOutputOptionsDarkBg, defaultOutputOptionsNoColor, pShowOpt, pPrintOpt)
import Hledger.Utils.Text (WideBuilder(WideBuilder)) import Hledger.Utils.Text (WideBuilder(WideBuilder))
@ -137,26 +137,28 @@ prettyopts =
} }
-- | pretty-simple options with colour disabled. -- | pretty-simple options with colour disabled.
prettyopts' = prettyoptsNoColor =
defaultOutputOptionsNoColor defaultOutputOptionsNoColor
{ outputOptionsIndentAmount=2 { outputOptionsIndentAmount=2
} }
-- | Pretty show. Easier alias for pretty-simple's pShow. -- | Pretty show. An easier alias for pretty-simple's pShow.
-- This will probably show in colour if useColorOnStderr is true.
pshow :: Show a => a -> String pshow :: Show a => a -> String
pshow = TL.unpack . pShowOpt prettyopts pshow = TL.unpack . pShowOpt prettyopts
-- | Monochrome version of pshow. -- | Monochrome version of pshow. This will never show in colour.
pshow' :: Show a => a -> String pshow' :: Show a => a -> String
pshow' = TL.unpack . pShowOpt prettyopts' pshow' = TL.unpack . pShowOpt prettyoptsNoColor
-- | Pretty print. Easier alias for pretty-simple's pPrint. -- | Pretty print a showable value. An easier alias for pretty-simple's pPrint.
-- This will print in colour if useColorOnStderr is true.
pprint :: Show a => a -> IO () pprint :: Show a => a -> IO ()
pprint = pPrintOpt CheckColorTty prettyopts pprint = pPrintOpt (if useColorOnStderr then CheckColorTty else NoCheckColorTty) prettyopts
-- | Monochrome version of pprint. -- | Monochrome version of pprint. This will never print in colour.
pprint' :: Show a => a -> IO () pprint' :: Show a => a -> IO ()
pprint' = pPrintOpt CheckColorTty prettyopts' pprint' = pPrintOpt NoCheckColorTty prettyoptsNoColor
-- "Avoid using pshow, pprint, dbg* in the code below to prevent infinite loops." (?) -- "Avoid using pshow, pprint, dbg* in the code below to prevent infinite loops." (?)