diff --git a/src/Alignment.hs b/src/Alignment.hs index a0297c5a4..3a6d77058 100644 --- a/src/Alignment.hs +++ b/src/Alignment.hs @@ -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 ranges children | Just (headRanges, _) <- unconsThese ranges , ~(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)))) , ~(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)