github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-03 21:16:12 +03:00
Code Issues Projects Releases Wiki Activity

groupChildrenByLine calls out to group2.

Browse Source
This commit is contained in:
Rob Rix 2016-03-31 15:06:01 -04:00
parent 30b58becf1
commit 2fa67f48e4
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Alignment.hs
View File

@ -133,14 +133,9 @@ alignDiff sources diff = iter alignSyntax (alignPatch sources <$> diff)
where lineRanges = runBothWith ((Join .) . These) (actualLineRanges <$> (characterRange <$> infos) <*> sources)
groupChildrenByLine :: Join These [Range] -> [AlignedDiff leaf] -> [Join These (Range, [SplitDiff leaf Info])]
groupChildrenByLine ranges children | Just (headRanges, tailRanges) <- unconsThese ranges
, (intersectingChildren, rest) <- spanMergeable headRanges children
, ~(intersectingChildrenL, intersectingChildrenR) <- bimap catMaybes catMaybes (unalign $ runJoin <$> join intersectingChildren)
= (case runJoin headRanges of
This l -> Join $ This (l, intersectingChildrenL)
That r -> Join $ That (r, intersectingChildrenR)
These l r -> Join $ These (l, intersectingChildrenL) (r, intersectingChildrenR))
: groupChildrenByLine tailRanges rest
groupChildrenByLine ranges children | (child:rest) <- children
, (nextRanges, lines) <- group2 ranges child
= lines ++ groupChildrenByLine nextRanges rest
| otherwise = []
group2 :: Join These [Range] -> AlignedDiff leaf -> (Join These [Range], [Join These (Range, [SplitDiff leaf Info])])