github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 14:21:31 +03:00
Code Issues Projects Releases Wiki Activity

Reformat alignChildrenInRanges for less indentation.

Browse Source
This commit is contained in:
Rob Rix 2016-04-14 13:19:18 -04:00
parent 23cca50048
commit 919fab9053
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Alignment.hs
View File

@ -142,15 +142,16 @@ groupChildrenByLine ranges children | not (and $ null <$> ranges)
| otherwise = []
alignChildrenInRanges :: Join These [Range] -> [AlignedDiff leaf] -> (Join These [Range], [AlignedDiff leaf], [Join These (Range, [SplitDiff leaf Info])])
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
, 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)
| ([]:rest) <- children = alignChildrenInRanges ranges rest
| otherwise = ([] <$ ranges, children, fmap (flip (,) []) <$> sequenceL ranges)
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
, 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)
| ([]:rest) <- children = alignChildrenInRanges ranges rest
| otherwise = ([] <$ ranges, children, fmap (flip (,) []) <$> sequenceL ranges)
spanAndSplitFirstLines :: (Join These a -> Join These Bool) -> [[Join These a]] -> ([(Join These a, [Join These a])], [[Join These a]])
spanAndSplitFirstLines pred = foldr go ([], [])