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

Don’t short-circuit when there are still children to align.

Browse Source
This commit is contained in:
Rob Rix 2016-03-25 00:22:43 -04:00
parent fd61294642
commit b04c844d17
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Alignment.hs
View File

@ -145,6 +145,9 @@ groupChildrenByLine ranges children = go (fromThese [] [] $ runJoin ranges) (joi
, (lines, rest) <- span (and . bimapJoin (const True) ((< end r) . end . getRange)) children
, length lines > 0
= Join (That $ (r, catMaybes (Prelude.snd . unalign $ runJoin <$> lines))) : go (ls, rs) rest
| (l:ls, r:rs) <- ranges
, length children > 0
= Join (These (l, []) (r, [])) : go (ls, rs) children
| otherwise = uncurry (alignWith (fmap (flip (,) []) . Join)) ranges
getRange (Free (Annotated (Info range _) _)) = range
getRange (Pure patch) | Info range _ :< _ <- getSplitTerm patch = range