From 143bbe1908464779c6c5874cbbd23316fd47fb47 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 22 Aug 2017 14:20:56 -0400 Subject: [PATCH] Define Pretty1 for markup without orphans. --- src/Data/Syntax/Markup.hs | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Data/Syntax/Markup.hs b/src/Data/Syntax/Markup.hs index 563ce9df0..9894ba687 100644 --- a/src/Data/Syntax/Markup.hs +++ b/src/Data/Syntax/Markup.hs @@ -5,8 +5,9 @@ import Algorithm import Data.Align.Generic import Data.ByteString (ByteString) import Data.Functor.Classes.Eq.Generic -import Data.Functor.Classes.Pretty.Orphans +import Data.Functor.Classes.Pretty import Data.Functor.Classes.Show.Generic +import Data.Text.Encoding (decodeUtf8With) import GHC.Generics @@ -62,11 +63,14 @@ instance Eq1 ThematicBreak where liftEq = genericLiftEq instance Show1 ThematicBreak where liftShowsPrec = genericLiftShowsPrec data HTMLBlock a = HTMLBlock ByteString - deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Pretty1, Show, Traversable) + deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable) instance Eq1 HTMLBlock where liftEq = genericLiftEq instance Show1 HTMLBlock where liftShowsPrec = genericLiftShowsPrec +instance Pretty1 HTMLBlock where + liftPretty _ _ (HTMLBlock s) = pretty ("HTMLBlock" :: String) <+> prettyBytes s + newtype Table a = Table [a] deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Pretty1, Show, Traversable) @@ -101,25 +105,34 @@ instance Eq1 Emphasis where liftEq = genericLiftEq instance Show1 Emphasis where liftShowsPrec = genericLiftShowsPrec newtype Text a = Text ByteString - deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Pretty1, Show, Traversable) + deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable) instance Eq1 Text where liftEq = genericLiftEq instance Show1 Text where liftShowsPrec = genericLiftShowsPrec +instance Pretty1 Text where + liftPretty _ _ (Text s) = pretty ("Text" :: String) <+> prettyBytes s + data Link a = Link { linkURL :: ByteString, linkTitle :: Maybe ByteString } - deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Pretty1, Show, Traversable) + deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable) instance Eq1 Link where liftEq = genericLiftEq instance Show1 Link where liftShowsPrec = genericLiftShowsPrec +instance Pretty1 Link where + liftPretty _ _ (Link u t) = pretty ("Link" :: String) <+> prettyBytes u <+> liftPretty prettyBytes (list . map prettyBytes) t + data Image a = Image { imageURL :: ByteString, imageTitle :: Maybe ByteString } - deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Pretty1, Show, Traversable) + deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable) instance Eq1 Image where liftEq = genericLiftEq instance Show1 Image where liftShowsPrec = genericLiftShowsPrec +instance Pretty1 Image where + liftPretty _ _ (Image u t) = pretty ("Image" :: String) <+> prettyBytes u <+> liftPretty prettyBytes (list . map prettyBytes) t + data Code a = Code { codeLanguage :: Maybe ByteString, codeContent :: ByteString } - deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Pretty1, Show, Traversable) + deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable) instance Eq1 Code where liftEq = genericLiftEq instance Show1 Code where liftShowsPrec = genericLiftShowsPrec @@ -135,3 +148,6 @@ newtype Strikethrough a = Strikethrough [a] instance Eq1 Strikethrough where liftEq = genericLiftEq instance Show1 Strikethrough where liftShowsPrec = genericLiftShowsPrec + +prettyBytes :: ByteString -> Doc ann +prettyBytes = pretty . decodeUtf8With (\ _ -> ('\xfffd' <$))