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

Rename ChangeType to Change.

Browse Source
This commit is contained in:
Rob Rix 2019-10-16 22:25:24 -04:00
parent 05e3944464
commit 27ae91c883
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Rendering/TOC.hs
View File

@ -5,7 +5,7 @@ module Rendering.TOC
, TOCSummary(..) , TOCSummary(..)
, isValidSummary , isValidSummary
, declaration , declaration
, ChangeType(..) , Change(..)
, tableOfContentsBy , tableOfContentsBy
, dedupe , dedupe
) where ) where
@ -50,7 +50,7 @@ instance ToJSON TOCSummary where
toJSON ErrorSummary{..} = object [ "error" .= message, "span" .= span, "language" .= language ] toJSON ErrorSummary{..} = object [ "error" .= message, "span" .= span, "language" .= language ]
-- | An entry in a table of contents. -- | An entry in a table of contents.
data ChangeType data Change
= Changed -- ^ An entry for a node containing changes. = Changed -- ^ An entry for a node containing changes.
| Inserted -- ^ An entry for a change occurring inside an 'Insert' 'Patch'. | Inserted -- ^ An entry for a change occurring inside an 'Insert' 'Patch'.
| Deleted -- ^ An entry for a change occurring inside a 'Delete' 'Patch'. | Deleted -- ^ An entry for a change occurring inside a 'Delete' 'Patch'.
@ -70,7 +70,7 @@ declaration (In annotation _) = annotation
tableOfContentsBy :: (Foldable f, Functor f) tableOfContentsBy :: (Foldable f, Functor f)
=> (forall b. TermF f ann b -> Maybe a) -- ^ A function mapping relevant nodes onto values in Maybe. => (forall b. TermF f ann b -> Maybe a) -- ^ A function mapping relevant nodes onto values in Maybe.
-> Diff f ann ann -- ^ The diff to compute the table of contents for. -> Diff f ann ann -- ^ The diff to compute the table of contents for.
-> [(ChangeType, a)] -- ^ A list of entries for relevant changed nodes in the diff. -> [(Change, a)] -- ^ A list of entries for relevant changed nodes in the diff.
tableOfContentsBy selector = fromMaybe [] . cata (\ r -> case r of tableOfContentsBy selector = fromMaybe [] . cata (\ r -> case r of
Patch patch -> (pure . patchEntry <$> bicrosswalk selector selector patch) <> bifoldMap fold fold patch <> Just [] Patch patch -> (pure . patchEntry <$> bicrosswalk selector selector patch) <> bifoldMap fold fold patch <> Just []
Merge (In (_, ann2) r) -> case (selector (In ann2 r), fold r) of Merge (In (_, ann2) r) -> case (selector (In ann2 r), fold r) of
@ -84,7 +84,7 @@ data DedupeKey = DedupeKey {-# UNPACK #-} !T.Text {-# UNPACK #-} !T.Text
data Dedupe = Dedupe data Dedupe = Dedupe
{ index :: {-# UNPACK #-} !Int { index :: {-# UNPACK #-} !Int
, entry :: {-# UNPACK #-} !ChangeType , entry :: {-# UNPACK #-} !Change
, decl :: {-# UNPACK #-} !Declaration , decl :: {-# UNPACK #-} !Declaration
} }
@ -95,7 +95,7 @@ data Dedupe = Dedupe
-- 2. Two similar entries (defined by a case insensitive comparison of their -- 2. Two similar entries (defined by a case insensitive comparison of their
-- identifiers) are in the list. -- identifiers) are in the list.
-- Action: Combine them into a single Replaced entry. -- Action: Combine them into a single Replaced entry.
dedupe :: [(ChangeType, Declaration)] -> [(ChangeType, Declaration)] dedupe :: [(Change, Declaration)] -> [(Change, Declaration)]
dedupe = map (entry &&& decl) . sortOn index . Map.elems . foldl' go Map.empty . zipWith (uncurry . Dedupe) [0..] where dedupe = map (entry &&& decl) . sortOn index . Map.elems . foldl' go Map.empty . zipWith (uncurry . Dedupe) [0..] where
go m d@(Dedupe _ _ decl) = let key = dedupeKey decl in case Map.lookup key m of go m d@(Dedupe _ _ decl) = let key = dedupeKey decl in case Map.lookup key m of
Just (Dedupe _ _ similar) Just (Dedupe _ _ similar)
@ -105,8 +105,8 @@ dedupe = map (entry &&& decl) . sortOn index . Map.elems . foldl' go Map.empty .
dedupeKey (Declaration kind ident _ _ _) = DedupeKey (formatKind kind) (T.toLower ident) dedupeKey (Declaration kind ident _ _ _) = DedupeKey (formatKind kind) (T.toLower ident)
-- | Construct a description of an 'ChangeType'. -- | Construct a description of an 'Change'.
formatEntry :: ChangeType -> Text formatEntry :: Change -> Text
formatEntry entry = case entry of formatEntry entry = case entry of
Changed -> "modified" Changed -> "modified"
Deleted -> "removed" Deleted -> "removed"
@ -114,7 +114,7 @@ formatEntry entry = case entry of
Replaced -> "modified" Replaced -> "modified"
-- | Construct a 'TOCSummary' from a node annotation and a change type label. -- | Construct a 'TOCSummary' from a node annotation and a change type label.
recordSummary :: ChangeType -> Declaration -> TOCSummary recordSummary :: Change -> Declaration -> TOCSummary
recordSummary entry decl@(Declaration kind text _ srcSpan language) recordSummary entry decl@(Declaration kind text _ srcSpan language)
| ErrorDeclaration <- kind = ErrorSummary text srcSpan language | ErrorDeclaration <- kind = ErrorSummary text srcSpan language
| otherwise = TOCSummary (formatKind kind) (formatIdentifier decl) srcSpan (formatEntry entry) | otherwise = TOCSummary (formatKind kind) (formatIdentifier decl) srcSpan (formatEntry entry)