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

Define termToLines in terms of adjoin2LinesBy.

Browse Source
This commit is contained in:
Rob Rix 2015-12-21 10:03:03 -05:00
parent e92d4037fd
commit 422dad44a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Split.hs
View File

@ -165,7 +165,7 @@ diffToRows (Pure (Replace a b)) _ before after = (replacedRows, (leftRange, righ
termToLines :: Term a Info -> String -> ([Line HTML], Range) termToLines :: Term a Info -> String -> ([Line HTML], Range)
termToLines (Info range categories :< syntax) source = (rows syntax, range) termToLines (Info range categories :< syntax) source = (rows syntax, range)
where where
rows (Leaf _) = reverse $ foldl adjoin2Lines [] $ Line True . (:[]) <$> elements rows (Leaf _) = reverse $ foldl (adjoin2LinesBy openElement) [] $ Line True . (:[]) <$> elements
rows (Indexed i) = rewrapLineContentsIn Ul <$> childLines i rows (Indexed i) = rewrapLineContentsIn Ul <$> childLines i
rows (Fixed f) = rewrapLineContentsIn Ul <$> childLines f rows (Fixed f) = rewrapLineContentsIn Ul <$> childLines f
rows (Keyed k) = rewrapLineContentsIn Dl <$> childLines k rows (Keyed k) = rewrapLineContentsIn Dl <$> childLines k
@ -174,12 +174,12 @@ termToLines (Info range categories :< syntax) source = (rows syntax, range)
rewrapLineContentsIn _ EmptyLine = EmptyLine rewrapLineContentsIn _ EmptyLine = EmptyLine
lineElements r s = Line True . (:[]) <$> textElements r s lineElements r s = Line True . (:[]) <$> textElements r s
childLines i = appendRemainder $ foldl sumLines ([], start range) i childLines i = appendRemainder $ foldl sumLines ([], start range) i
appendRemainder (lines, previous) = reverse . foldl adjoin2Lines [] $ lines ++ lineElements (Range previous (end range)) source appendRemainder (lines, previous) = reverse . foldl (adjoin2LinesBy openElement) [] $ lines ++ lineElements (Range previous (end range)) source
sumLines (lines, previous) child = (allLines, end childRange) sumLines (lines, previous) child = (allLines, end childRange)
where where
separatorLines = lineElements (Range previous $ start childRange) source separatorLines = lineElements (Range previous $ start childRange) source
unadjoinedLines = lines ++ separatorLines ++ childLines unadjoinedLines = lines ++ separatorLines ++ childLines
allLines = reverse $ foldl adjoin2Lines [] unadjoinedLines allLines = reverse $ foldl (adjoin2LinesBy openElement) [] unadjoinedLines
(childLines, childRange) = termToLines child source (childLines, childRange) = termToLines child source
elements = (elementAndBreak $ Span (classify categories)) =<< actualLines (substring range source) elements = (elementAndBreak $ Span (classify categories)) =<< actualLines (substring range source)