From ad4d1ab9e4f68584c5e7bb641ae52c580775a706 Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@github.com>
Date: Thu, 14 Apr 2016 16:34:49 -0400
Subject: [PATCH] Pair with the ranges appropriate for the intersecting
 elements.

This is gross.
---
 src/Alignment.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Alignment.hs b/src/Alignment.hs
index ca529a4bf..c1d30e298 100644
--- a/src/Alignment.hs
+++ b/src/Alignment.hs
@@ -17,7 +17,7 @@ import Control.Monad
 import Control.Monad.Free
 import Data.Adjoined
 import Data.Align
-import Data.Bifunctor
+import Data.Biapplicative
 import Data.Bifunctor.Join
 import Data.Bifunctor.These
 import Data.Coalescent
@@ -146,7 +146,8 @@ alignChildrenInRanges ranges children
   | Just headRanges <- sequenceL $ listToMaybe <$> ranges
   , (intersecting, nonintersecting) <- spanAndSplitFirstLines (intersects headRanges) children
   , (thisLine, nextLines) <- foldr (\ (this, next) (these, nexts) -> (this : these, next ++ nexts)) ([], []) intersecting
-  , merged <- pairRangesWithLine headRanges (catThese thisLine)
+  , thisRanges <- fromMaybe headRanges $ const <$> headRanges `applyThese` catThese (thisLine ++ nextLines)
+  , merged <- pairRangesWithLine thisRanges (modifyJoin (uncurry These . fromThese [] []) (catThese thisLine))
   , advance <- fromMaybe (drop 1, drop 1) $ fromThese id id . runJoin . (drop 1 <$) <$> listToMaybe nextLines
   , (nextRanges, nextChildren, nextLines) <- alignChildrenInRanges (modifyJoin (uncurry bimap advance) ranges) (nextLines : nonintersecting)
   = (nextRanges, nextChildren, merged : nextLines)