1
1
mirror of https://github.com/github/semantic.git synced 2024-12-23 23:11:50 +03:00

Disambiguate between Syntax Comment and Category Comment

This commit is contained in:
Rick Winfrey 2016-08-16 13:08:55 -05:00
parent 7fd0b52a91
commit 60d10c483e

View File

@ -63,7 +63,7 @@ alignPatch sources patch = case patch of
alignSyntax :: (Applicative f, HasField fields Range) => (forall a. f a -> Join These a) -> (CofreeF (Syntax leaf) (Record fields) term -> term) -> (term -> Range) -> f (Source Char) -> CofreeF (Syntax leaf) (f (Record fields)) [Join These term] -> [Join These term]
alignSyntax toJoinThese toNode getRange sources (infos :< syntax) = catMaybes $ case syntax of
Leaf s -> wrapInBranch (const (Leaf s)) <$> alignBranch getRange [] bothRanges
Comment a -> wrapInBranch (const (Comment a)) <$> alignBranch getRange [] bothRanges
Syntax.Comment a -> wrapInBranch (const (Syntax.Comment a)) <$> alignBranch getRange [] bothRanges
Fixed children -> wrapInBranch Fixed <$> alignBranch getRange (join children) bothRanges
_ -> wrapInBranch Indexed <$> alignBranch getRange (join (toList syntax)) bothRanges
where bothRanges = modifyJoin (fromThese [] []) lineRanges