aelve/guide
1
1
Fork 0
mirror of https://github.com/aelve/guide.git synced 2024-11-23 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Add Show instances to all types

Browse Source
This commit is contained in:
Artyom 2016-04-09 23:34:24 +03:00
parent b29b3b2c7f
commit 8013ebbfb1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Markdown.hs
View File

@ -134,6 +134,12 @@ instance Eq MarkdownInline where
instance Eq MarkdownBlock where instance Eq MarkdownBlock where
(==) = (==) `on` markdownBlockText (==) = (==) `on` markdownBlockText
instance Show MarkdownInline where
show = show . markdownInlineText
instance Show MarkdownBlock where
show = show . markdownBlockText
instance ToHtml MarkdownInline where instance ToHtml MarkdownInline where
toHtml = builderToHtml . markdownInlineHtml toHtml = builderToHtml . markdownInlineHtml
toHtmlRaw = builderToHtml . markdownInlineHtml toHtmlRaw = builderToHtml . markdownInlineHtml

7
src/Types.hs
View File

@ -140,7 +140,7 @@ import Markdown
data Trait = Trait { data Trait = Trait {
_traitUid :: Uid Trait, _traitUid :: Uid Trait,
_traitContent :: MarkdownInline } _traitContent :: MarkdownInline }
deriving (Eq) deriving (Eq, Show)
-- See Note [acid-state] -- See Note [acid-state]
deriveSafeCopy 1 'extension ''Trait deriveSafeCopy 1 'extension ''Trait
@ -192,7 +192,7 @@ data Item = Item {
_itemNotes :: MarkdownBlock, _itemNotes :: MarkdownBlock,
_itemLink :: Maybe Url, _itemLink :: Maybe Url,
_itemKind :: ItemKind } _itemKind :: ItemKind }
deriving (Eq) deriving (Eq, Show)
deriveSafeCopy 7 'extension ''Item deriveSafeCopy 7 'extension ''Item
makeFields ''Item makeFields ''Item
@ -303,7 +303,7 @@ data Category = Category {
_categoryGroups :: Map Text Hue, _categoryGroups :: Map Text Hue,
_categoryItems :: [Item], _categoryItems :: [Item],
_categoryItemsDeleted :: [Item] } _categoryItemsDeleted :: [Item] }
deriving (Eq) deriving (Eq, Show)
deriveSafeCopy 3 'extension ''Category deriveSafeCopy 3 'extension ''Category
makeFields ''Category makeFields ''Category
@ -553,6 +553,7 @@ data GlobalState = GlobalState {
_categoriesDeleted :: [Category], _categoriesDeleted :: [Category],
_pendingEdits :: [(Edit, EditDetails)], _pendingEdits :: [(Edit, EditDetails)],
_editIdCounter :: Int } -- ID of next edit that will be made _editIdCounter :: Int } -- ID of next edit that will be made
deriving (Show)
deriveSafeCopy 2 'extension ''GlobalState deriveSafeCopy 2 'extension ''GlobalState
makeLenses ''GlobalState makeLenses ''GlobalState