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

Run the computation over both sides of the functor.

Browse Source
This commit is contained in:
Rob Rix 2016-02-28 22:04:18 -05:00
parent 81a1a14d4c
commit c3039cd853
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Alignment.hs
View File

@ -75,9 +75,8 @@ splitAnnotatedByLines sources ranges categories syntax = case syntax of
Fixed children -> adjoinChildRows (Fixed . fmap get) (Identity <$> children)
Keyed children -> adjoinChildRows (Keyed . Map.fromList) (Map.toList children)
where contextRows :: Both Range -> Both (Source Char) -> [Row Range]
contextRows ranges sources = zipWithDefaults Row EmptyLine EmptyLine
(pure <$> actualLineRanges (fst $ runBoth ranges) (fst $ runBoth sources))
(pure <$> actualLineRanges (snd $ runBoth ranges) (snd $ runBoth sources))
contextRows ranges sources = uncurry (zipWithDefaults Row EmptyLine EmptyLine) $
runBoth (fmap pure <$> (actualLineRanges <$> ranges <*> sources))
adjoin :: Has f => [Row (Either Range (f (SplitDiff leaf Info)))] -> [Row (Either Range (f (SplitDiff leaf Info)))]
adjoin = reverse . foldl (adjoinRowsBy (openEither (openRange . fst $ runBoth sources) (openDiff . fst $ runBoth sources)) (openEither (openRange . snd $ runBoth sources) (openDiff . snd $ runBoth sources))) []