prettyprinter-combinators 0.1.0.1 → 0.1.1

raw patch · 3 files changed

+17/−17 lines, 3 files

Files

• prettyprinter-combinators.cabal +2/−2
• src/Prettyprinter/Combinators.hs +11/−12
• src/Prettyprinter/Data.hs +4/−3

@@ -3,7 +3,7 @@ name:   prettyprinter-combinators version:-  0.1.0.1+  0.1.1 synopsis:   Some useful combinators for the prettyprinter package description:@@ -65,10 +65,10 @@     Prettyprinter.Combinators     Prettyprinter.Data     Prettyprinter.Generics+    Prettyprinter.MetaDoc     Prettyprinter.Show   other-modules:     Prettyprinter.Combinators.Basic-    Prettyprinter.MetaDoc   hs-source-dirs:     src   build-depends:

@@ -16,8 +16,9 @@   ( Pretty(..)   , PP.Doc   , putDocLn-  , displayDoc-  , displayDocString+  , render+  , renderLazy+  , renderString   , docFromString   , docFromText   , PP.viaShow@@ -63,7 +64,6 @@   , ppByteString   , ppByteStringLazy   , ppShortByteString-  , ppTrace   , ppCallStack   , ppCallStackGHC   ) where@@ -90,7 +90,6 @@ import Data.Set (Set) import Data.Vector (Vector) import Data.Vector qualified as V-import Debug.Trace import GHC.Stack (CallStack, SrcLoc(..), getCallStack, prettySrcLoc)  #if !MIN_VERSION_base(4, 11, 0)@@ -110,17 +109,20 @@   PP.Render.putDoc x   putStrLn "" -displayDoc :: Doc ann -> TL.Text-displayDoc = PP.Render.renderLazy . PP.layoutPretty PP.defaultLayoutOptions+render :: Doc ann -> T.Text+render = TL.toStrict . renderLazy -displayDocString :: Doc ann -> String-displayDocString = TL.unpack . displayDoc+renderLazy :: Doc ann -> TL.Text+renderLazy = PP.Render.renderLazy . PP.layoutPretty PP.defaultLayoutOptions +renderString :: Doc ann -> String+renderString = TL.unpack . renderLazy+ docFromString :: String -> Doc ann docFromString = pretty . TL.pack  docFromText :: T.Text -> Doc ann-docFromText = pretty . TL.fromStrict+docFromText = pretty   infixr 0 :->@@ -277,9 +279,6 @@  ppShortByteString :: ShortBS.ShortByteString -> Doc ann ppShortByteString = mdPayload . shortByteStringMetaDoc--ppTrace :: Doc ann -> a -> a-ppTrace msg = trace (displayDocString msg)  ppCallStack :: CallStack -> Doc ann ppCallStack =

@@ -14,6 +14,7 @@ module Prettyprinter.Data   ( ppData   , ppDataSimple+  , Data   ) where  import Data.Data@@ -130,7 +131,7 @@  gpretty :: forall a ann. Data a => a -> MetaDoc ann gpretty =-  render+  go     `Data.Generics.extQ` stringMetaDoc     `Data.Generics.extQ` strictTextMetaDoc     `Data.Generics.extQ` lazyTextMetaDoc@@ -155,8 +156,8 @@     --   ((atomicMetaDoc . ppMapWith (mdPayload . gpretty) (mdPayload . gpretty)) ::     --     forall k v. (Data k, Data v) => Map k v -> MetaDoc ann)   where-    render :: Data b => b -> MetaDoc ann-    render t+    go :: Data b => b -> MetaDoc ann+    go t       | constructorName == "fromList"       , Just mapItems  <- gmapQi 0 (listElements (isPair gpretty)) t       , Just mapItems' <- sequence mapItems