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

Revert "Bind lists of intersecting & nonintersecting children."

Browse Source 
This reverts commit 2453b500adc0774ab5311ca1eca946806b2bb9c9.
This commit is contained in:
Rob Rix 2016-04-11 12:04:19 -04:00
parent 9174d5cfbe
commit fe7301ba3a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Alignment.hs
View File

@ -141,7 +141,6 @@ groupChildrenByLine ranges children | not (and $ null <$> ranges)
group2 :: Join These [Range] -> [AlignedDiff leaf] -> (Join These [Range], [AlignedDiff leaf], [Join These (Range, [SplitDiff leaf Info])]) group2 :: Join These [Range] -> [AlignedDiff leaf] -> (Join These [Range], [AlignedDiff leaf], [Join These (Range, [SplitDiff leaf Info])])
group2 ranges children | Just (headRanges, _) <- unconsThese ranges group2 ranges children | Just (headRanges, _) <- unconsThese ranges
, ~(group, l, r, rest) <- spanThese (intersects headRanges) children , ~(group, l, r, rest) <- spanThese (intersects headRanges) children
, ~(intersecting, nonIntersecting) <- span (or . intersects headRanges . head) children
, merged <- pairRangesWithLine headRanges $ fmap catMaybes (Join (uncurry These (unalign (runJoin <$> join group)))) , merged <- pairRangesWithLine headRanges $ fmap catMaybes (Join (uncurry These (unalign (runJoin <$> join group))))
, ~(moreRanges, moreChildren, remainingLines) <- group2 (modifyJoin (bimap (if null l && not (null r) then id else drop 1) (if null r && not (null l) then id else drop 1)) ranges) (l ++ r ++ rest) , ~(moreRanges, moreChildren, remainingLines) <- group2 (modifyJoin (bimap (if null l && not (null r) then id else drop 1) (if null r && not (null l) then id else drop 1)) ranges) (l ++ r ++ rest)
= (moreRanges, moreChildren, merged : remainingLines) = (moreRanges, moreChildren, merged : remainingLines)