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

Extract and rename pairWithNothing.

Browse Source
This commit is contained in:
Rob Rix 2016-03-15 08:54:35 -04:00
parent d1b8a94b75
commit c3fa0eb986
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Alignment.hs
View File

@ -86,14 +86,16 @@ childLines :: (Copointed c, Functor c, Applicative f, Coalescent (f (Line (Maybe
childLines sources child (followingLines, next) | or $ (>) . end <$> childRanges <*> next = (followingLines, next)
| otherwise =
((placeChildAndRangeInContainer <$> copoint child)
<> tsequenceL (pure mempty) (fromList . pairWithNothing <$> trailingContextLines)
<> tsequenceL (pure mempty) (fromList . makeContextLines <$> trailingContextLines)
<> followingLines, start <$> childRanges)
where pairWithNothing = fmap (fmap ((,) Nothing))
placeChildAndRangeInContainer = fmap (fmap (first (Just . (<$ child))))
where placeChildAndRangeInContainer = fmap (fmap (first (Just . (<$ child))))
trailingContextLines = linesInRangeOfSource <$> rangeUntilNext <*> sources
rangeUntilNext = (Range <$> (end <$> childRanges) <*> next)
childRanges = unionLineRangesFrom <$> (rangeAt <$> next) <*> sequenceA (copoint child)
makeContextLines :: [Line Range] -> [Line (Maybe a, Range)]
makeContextLines = fmap (fmap ((,) Nothing))
-- | Produce open/closed lines for the portion of the source spanned by a range.
linesInRangeOfSource :: Range -> Source Char -> [Line Range]
linesInRangeOfSource range source = pureBy (openRange source) <$> actualLineRanges range source