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

Add a function to group children by line.

Browse Source
This commit is contained in:
Rob Rix 2016-03-21 16:03:10 -04:00
parent 8a019572dc
commit d1d9fa6970
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Alignment.hs
View File

@ -126,6 +126,14 @@ alignDiff sources diff = iter alignSyntax (alignPatch sources <$> diff)
_ -> both [] []
where lineRanges = actualLineRanges <$> (characterRange <$> infos) <*> sources
groupChildrenByLine :: Join These [Range] -> [AlignedDiff leaf] -> Join These [[SplitDiff leaf Info]]
groupChildrenByLine (Join lineRanges) children = Join $ bimap (f children) (g children) lineRanges
where f children ranges = (\ range -> children >>= intersectionsFst range) <$> ranges
g children ranges = (\ range -> children >>= intersectionsSnd range) <$> ranges
intersectionsFst range = filter (intersectsRange range) . these id (const []) (curry Prelude.fst) . runJoin
intersectionsSnd range = filter (intersectsRange range) . these (const []) id (curry Prelude.snd) . runJoin
intersectsRange range (Free (Annotated (Info nodeRange _) _)) = max (start nodeRange) (start range) < min (end nodeRange) (end range)
alignSyntax :: Source Char -> Range -> Syntax leaf (AlignedDiff leaf) -> [Syntax leaf (SplitDiff leaf Info)]
alignSyntax source range syntax = case syntax of
Leaf s -> Leaf s <$ lineRanges