Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1623,16 +1623,13 @@ instance FromJSON MarkedString where
data HoverContents =
HoverContentsMS (List MarkedString)
| HoverContents MarkupContent
| HoverContentsEmpty
deriving (Read,Show,Eq)

instance ToJSON HoverContents where
toJSON (HoverContentsMS x) = toJSON x
toJSON (HoverContents x) = toJSON x
toJSON (HoverContentsEmpty) = A.Null
instance FromJSON HoverContents where
parseJSON v@(A.String _) = HoverContentsMS <$> parseJSON v
parseJSON (A.Null) = pure HoverContentsEmpty
parseJSON v@(A.Array _) = HoverContentsMS <$> parseJSON v
parseJSON v@(A.Object _) = HoverContents <$> parseJSON v
<|> HoverContentsMS <$> parseJSON v
Expand All @@ -1646,10 +1643,8 @@ instance Semigroup HoverContents where
#endif

instance Monoid HoverContents where
mempty = HoverContentsEmpty
mempty = HoverContentsMS (List [])

HoverContentsEmpty `mappend` hc = hc
hc `mappend` HoverContentsEmpty = hc
HoverContents h1 `mappend` HoverContents h2 = HoverContents (h1 `mappend` h2)
HoverContents h1 `mappend` HoverContentsMS (List h2s) = HoverContents (mconcat (h1: (map toMarkupContent h2s)))
HoverContentsMS (List h1s) `mappend` HoverContents h2 = HoverContents (mconcat ((map toMarkupContent h1s) ++ [h2]))
Expand Down
2 changes: 1 addition & 1 deletion test/JsonSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ instance Arbitrary MarkupKind where
instance Arbitrary HoverContents where
arbitrary = oneof [ HoverContentsMS <$> arbitrary
, HoverContents <$> arbitrary
, pure HoverContentsEmpty]
]

-- | make lists of maximum length 3 for test performance
smallList :: Gen a -> Gen [a]
Expand Down