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

Align Indexed branch nodes.

Browse Source
This commit is contained in:
Rob Rix 2016-03-21 18:27:46 -04:00
parent 0e83f33c6b
commit f03cdea1f7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Alignment.hs
View File

@ -121,9 +121,10 @@ alignTerm sources infos syntax = (\ (source, info) -> Free . Annotated info <$>
alignDiff :: Both (Source Char) -> Diff leaf Info -> AlignedDiff leaf
alignDiff sources diff = iter alignSyntax (alignPatch sources <$> diff)
where alignSyntax :: Annotated leaf (Both Info) (AlignedDiff leaf) -> AlignedDiff leaf
alignSyntax (Annotated infos syntax) = runBothWith ((Join .) . These) $ case syntax of
Leaf s -> (\ info -> fmap (Free . (`Annotated` Leaf s) . setCharacterRange info)) <$> infos <*> lineRanges
_ -> both [] []
alignSyntax (Annotated infos syntax) = case syntax of
Leaf s -> runBothWith ((Join .) . These) $ (\ info -> fmap (Free . (`Annotated` Leaf s) . setCharacterRange info)) <$> infos <*> lineRanges
Indexed children -> fmap (\ (range, children) -> Free (Annotated (Info range mempty) (Indexed children))) <$> groupChildrenByLine (runBothWith These lineRanges) children
_ -> Join (These [] [])
where lineRanges = actualLineRanges <$> (characterRange <$> infos) <*> sources
groupChildrenByLine :: These [Range] [Range] -> [AlignedDiff leaf] -> Join These [(Range, [SplitDiff leaf Info])]