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

Merge pull request #737 from github/change-summary-errors

Browse Source 
Change summary errors
This commit is contained in:
Rick Winfrey 2016-08-22 14:25:19 -05:00 committed by GitHub
commit 43b70b0d3e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DiffSummary.hs
View File

@ -51,14 +51,20 @@ diffSummaries sources = para $ \diff ->
summaries :: Patch DiffInfo -> [P.Doc]
summaries (Insert info) = (("Added" <+> "the") <+>) <$> toLeafInfos info
summaries (Delete info) = (("Deleted" <+> "the") <+>) <$> toLeafInfos info
summaries (Replace i1 i2) = zipWith (\a b -> "Replaced" <+> "the" <+> a <+> "with the" <+> b) (toLeafInfos i1) (toLeafInfos i2)
summaries (Insert info) = uncurry (prefixOrErrorDoc "Added") <$> toLeafInfos info
summaries (Delete info) = uncurry (prefixOrErrorDoc "Deleted") <$> toLeafInfos info
summaries (Replace i1 i2) = zipWith (\a b -> uncurry (prefixOrErrorDoc "Replaced") a <+> "with the" <+> snd b) (toLeafInfos i1) (toLeafInfos i2)
toLeafInfos :: DiffInfo -> [Doc]
toLeafInfos LeafInfo{..} = pure $ squotes (toDoc termName) <+> (toDoc categoryName)
prefixOrErrorDoc :: Text -> DiffInfo -> Doc -> Doc
prefixOrErrorDoc prefix info doc = message <+> string (toSL prefix) <+> "the" <+> doc
where message = case info of
ErrorInfo{} -> "Diff Summary Error:"
_ -> mempty
toLeafInfos :: DiffInfo -> [(DiffInfo, Doc)]
toLeafInfos info@LeafInfo{..} = pure (info, squotes (toDoc termName) <+> (toDoc categoryName))
toLeafInfos BranchInfo{..} = toLeafInfos =<< branches
toLeafInfos err@ErrorInfo{} = pure $ pretty err
toLeafInfos err@ErrorInfo{} = pure (err, pretty err)
toTermName :: (HasCategory leaf, HasField fields Category, HasField fields Range) => Source Char -> Term leaf (Record fields) -> Text
toTermName source term = case unwrap term of