github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-03 04:51:57 +03:00
Code Issues Projects Releases Wiki Activity

Consume all of the lines in group2.

Browse Source
This commit is contained in:
Rob Rix 2016-04-04 17:56:53 -04:00
parent 06dd79dc76
commit 20c7578807
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Alignment.hs
View File

@ -133,10 +133,10 @@ alignSyntax toJoinThese sources infos syntax = case syntax of
wrapInBranch constructor = applyThese $ toJoinThese ((\ info (range, children) -> Free (Annotated (setCharacterRange info range) (constructor children))) <$> infos) wrapInBranch constructor = applyThese $ toJoinThese ((\ info (range, children) -> Free (Annotated (setCharacterRange info range) (constructor children))) <$> infos)
groupChildrenByLine :: Join These [Range] -> [AlignedDiff leaf] -> [Join These (Range, [SplitDiff leaf Info])] groupChildrenByLine :: Join These [Range] -> [AlignedDiff leaf] -> [Join These (Range, [SplitDiff leaf Info])]
groupChildrenByLine ranges children | (nextRanges, nextChildren, lines) <- group2 ranges children groupChildrenByLine ranges children | not (and $ null <$> ranges)
, not (null lines) , (nextRanges, nextChildren, lines) <- group2 ranges children
= lines ++ groupChildrenByLine nextRanges nextChildren = lines ++ groupChildrenByLine nextRanges nextChildren
| otherwise = fmap (flip (,) []) <$> sequenceL ranges | otherwise = []
group2 :: Join These [Range] -> [AlignedDiff leaf] -> (Join These [Range], [AlignedDiff leaf], [Join These (Range, [SplitDiff leaf Info])]) group2 :: Join These [Range] -> [AlignedDiff leaf] -> (Join These [Range], [AlignedDiff leaf], [Join These (Range, [SplitDiff leaf Info])])
group2 ranges children | Just (headRanges, tailRanges) <- unconsThese ranges group2 ranges children | Just (headRanges, tailRanges) <- unconsThese ranges
@ -152,7 +152,7 @@ group2 ranges children | Just (headRanges, tailRanges) <- unconsThese ranges
(moreRanges, moreChildren, pairRangesWithLine headRanges (mask firstLine $ modifyJoin (uncurry These . fromThese [] []) $ pure <$> head r) : remainingLines) (moreRanges, moreChildren, pairRangesWithLine headRanges (mask firstLine $ modifyJoin (uncurry These . fromThese [] []) $ pure <$> head r) : remainingLines)
_ -> (tailRanges, children, [ flip (,) [] <$> headRanges ]) _ -> (tailRanges, children, [ flip (,) [] <$> headRanges ])
| ([]:rest) <- children = group2 ranges rest | ([]:rest) <- children = group2 ranges rest
| otherwise = (ranges, children, []) | otherwise = ([] <$ ranges, children, fmap (flip (,) []) <$> sequenceL ranges)
pairRangesWithLine :: Monoid b => Join These a -> Join These b -> Join These (a, b) pairRangesWithLine :: Monoid b => Join These a -> Join These b -> Join These (a, b)
pairRangesWithLine headRanges childLine = fromMaybe (flip (,) mempty <$> headRanges) $ (,) <$> headRanges `applyThese` childLine pairRangesWithLine headRanges childLine = fromMaybe (flip (,) mempty <$> headRanges) $ (,) <$> headRanges `applyThese` childLine