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

🔥 mask.

Browse Source
This commit is contained in:
Rob Rix 2016-04-14 12:46:25 -04:00
parent 1656f93f65
commit 8c9a9c7586
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Alignment.hs
View File

@ -167,16 +167,6 @@ catThese as = maybe (Join (These [] [])) Join $ getUnion $ mconcat $ Union . Jus
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
mask :: Join These a -> Join These b -> Join These b
mask (Join (This _)) (Join (This b1)) = Join $ This b1
mask (Join (This _)) (Join (These b1 _)) = Join $ This b1
mask (Join (That _)) (Join (That b2)) = Join $ That b2
mask (Join (That _)) (Join (These _ b2)) = Join $ That b2
mask (Join (These _ _)) (Join (This b1)) = Join $ This b1
mask (Join (These _ _)) (Join (That b2)) = Join $ That b2
mask (Join (These _ _)) (Join (These b1 b2)) = Join $ These b1 b2
mask _ b = b
getRange :: SplitDiff leaf Info -> Range getRange :: SplitDiff leaf Info -> Range
getRange (Free (Annotated (Info range _) _)) = range getRange (Free (Annotated (Info range _) _)) = range
getRange (Pure patch) | Info range _ :< _ <- getSplitTerm patch = range getRange (Pure patch) | Info range _ :< _ <- getSplitTerm patch = range