From 60d10c483e82651f6e47099e9ea0d52bc8f31f2c Mon Sep 17 00:00:00 2001 From: Rick Winfrey Date: Tue, 16 Aug 2016 13:08:55 -0500 Subject: [PATCH] Disambiguate between Syntax Comment and Category Comment --- src/Alignment.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Alignment.hs b/src/Alignment.hs index 00866ea3a..1513ec0d2 100644 --- a/src/Alignment.hs +++ b/src/Alignment.hs @@ -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