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

Join the child lines.

Browse Source
This commit is contained in:
Rob Rix 2016-03-24 14:39:23 -04:00
parent da3e338d84
commit 9e3db2853c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Alignment.hs
View File

@ -132,13 +132,12 @@ 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 = go (fromThese [] [] $ runJoin ranges) children
groupChildrenByLine ranges children = go (fromThese [] [] $ runJoin ranges) (join children)
where go ranges children | (l:ls, r:rs) <- ranges
, ((firstLine:restOfLines):rest) <- children
= case fromThese False False $ bimap (intersects l . getRange) (intersects r . getRange) $ runJoin firstLine of
(True, True) -> bimapJoin ((,) l . pure) ((,) r . pure) firstLine : go ranges (restOfLines:rest)
, (first:rest) <- children
= case fromThese False False $ bimap ((< end l) . end . getRange) ((< end r) . end . getRange) $ runJoin first of
(True, True) -> bimapJoin ((,) l . pure) ((,) r . pure) first : go ranges rest
(_, _) -> Join (These (l, []) (r, [])) : go (ls, rs) children
| ([]:rest) <- children = go ranges rest
| otherwise = uncurry (alignWith (fmap (flip (,) []) . Join)) ranges
getRange (Free (Annotated (Info range _) _)) = range
getRange (Pure patch) | Info range _ :< _ <- getSplitTerm patch = range