github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-19 12:51:52 +03:00
Code Issues Projects Releases Wiki Activity

Revert JSONSyntaxTerm back to ToJSON instance

Browse Source
This commit is contained in:
Rick Winfrey 2016-11-01 16:39:33 -05:00
parent 4128798b34
commit f1b92d9a9e
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Renderer/JSON.hs
View File

@ -59,15 +59,11 @@ instance (ToJSON leaf, ToJSON (Record fields), HasField fields Category, HasFiel
(Free (info :< syntax)) -> pairs $ mconcat (termFields info syntax)
(Pure patch) -> pairs $ mconcat (patchFields patch)
newtype JSONSyntaxTerm leaf fields = JSONSyntaxTerm { unJSONSyntaxTerm :: SyntaxTerm leaf fields }
instance (ToJSON (Record fields), ToJSON leaf, HasField fields Category, HasField fields Range) => ToJSON (JSONSyntaxTerm leaf fields) where
instance (ToJSON (Record fields), ToJSON leaf, HasField fields Category, HasField fields Range) => ToJSON (SyntaxTerm leaf fields) where
toJSON term |
term' <- unJSONSyntaxTerm term,
(info :< syntax) <- runCofree term' = object (termFields info syntax)
(info :< syntax) <- runCofree term = object (termFields info syntax)
toEncoding term |
term' <- unJSONSyntaxTerm term,
(info :< syntax) <- runCofree term' = pairs $ mconcat (termFields info syntax)
(info :< syntax) <- runCofree term = pairs $ mconcat (termFields info syntax)
lineFields :: (ToJSON leaf, ToJSON (Record fields), HasField fields Category, HasField fields Range) => KeyValue kv => Int -> SplitSyntaxDiff leaf fields -> Range -> [kv]
lineFields n term range = [ "number" .= n
@ -84,13 +80,12 @@ termFields info syntax = "range" .= characterRange info : "category" .= category
patchFields :: (ToJSON (Record fields), ToJSON leaf, KeyValue kv, HasField fields Category, HasField fields Range) => SplitPatch (SyntaxTerm leaf fields) -> [kv]
patchFields patch = case patch of
SplitInsert term -> fields "insert" (JSONSyntaxTerm term)
SplitDelete term -> fields "delete" (JSONSyntaxTerm term)
SplitReplace term -> fields "replace" (JSONSyntaxTerm term)
SplitInsert term -> fields "insert" term
SplitDelete term -> fields "delete" term
SplitReplace term -> fields "replace" term
where
fields kind term |
term' <- unJSONSyntaxTerm term,
(info :< syntax) <- runCofree term' = "patch" .= T.pack kind : termFields info syntax
(info :< syntax) <- runCofree term = "patch" .= T.pack kind : termFields info syntax
syntaxToTermField :: (ToJSON recur, KeyValue kv) => Syntax leaf recur -> [kv]
syntaxToTermField syntax = case syntax of