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

Revert "Skip a recursive call when we haven’t yet exhausted the lines in a child."

Browse Source 
This reverts commit 6da256ef89752bf312a0ba40cf571ff8f410c436.
This commit is contained in:
Rob Rix 2016-03-31 10:01:42 -04:00
parent 19cc23b51a
commit 8d808e32ca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Alignment.hs
View File

@ -163,7 +163,7 @@ intersectsChild range child = end (getRange child) <= end range
spanMergeable :: Join These Range -> [AlignedDiff leaf] -> ([AlignedDiff leaf], [AlignedDiff leaf]) spanMergeable :: Join These Range -> [AlignedDiff leaf] -> ([AlignedDiff leaf], [AlignedDiff leaf])
spanMergeable ranges children | ((firstChildLine:restChildLines):rest) <- children spanMergeable ranges children | ((firstChildLine:restChildLines):rest) <- children
, ~(merge, nope) <- if null restChildLines then spanMergeable ranges rest else ([], restChildLines : rest) , ~(merge, nope) <- spanMergeable ranges (if null restChildLines then rest else restChildLines : rest)
, ~(this, that) <- split firstChildLine , ~(this, that) <- split firstChildLine
= case fromThese False False . runJoin $ intersects ranges firstChildLine of = case fromThese False False . runJoin $ intersects ranges firstChildLine of
(True, True) -> ([firstChildLine] : merge, nope) (True, True) -> ([firstChildLine] : merge, nope)