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

add text-icu

Browse Source
This commit is contained in:
joshvera 2015-12-15 16:34:47 -05:00
parent d4b41f8109
commit e80bc4590d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
semantic-diff.cabal
View File

@ -53,6 +53,7 @@ executable semantic-diff-exe
, optparse-applicative , optparse-applicative
, filepath , filepath
, text >= 1.2.1.3 , text >= 1.2.1.3
, text-icu
default-language: Haskell2010 default-language: Haskell2010
default-extensions: OverloadedStrings default-extensions: OverloadedStrings
extra-libraries: bridge extra-libraries: bridge
@ -74,6 +75,7 @@ executable semantic-diff-profile
, optparse-applicative , optparse-applicative
, filepath , filepath
, text >= 1.2.1.3 , text >= 1.2.1.3
, text-icu
default-language: Haskell2010 default-language: Haskell2010
default-extensions: OverloadedStrings default-extensions: OverloadedStrings
extra-libraries: bridge extra-libraries: bridge

5
src/Split.hs
View File

@ -66,7 +66,7 @@ split diff before after = return . TL.toStrict . HText.renderHtml
. (table ! A.class_ "diff") . (table ! A.class_ "diff")
. mconcat $ toMarkup <$> (reverse $ foldl numberRows [] rows) . mconcat $ toMarkup <$> (reverse $ foldl numberRows [] rows)
where where
rows = fst $ diffToRows diff (0, 0) before after rows = normalizedDiffToRows diff before after
numberRows :: [(Int, Line, Int, Line)] -> Row -> [(Int, Line, Int, Line)] numberRows :: [(Int, Line, Int, Line)] -> Row -> [(Int, Line, Int, Line)]
numberRows [] (Row EmptyLine EmptyLine) = [] numberRows [] (Row EmptyLine EmptyLine) = []
@ -78,6 +78,9 @@ split diff before after = return . TL.toStrict . HText.renderHtml
numberRows rows@((leftCount, _, rightCount, _):_) (Row EmptyLine right@(Line _)) = (leftCount, EmptyLine, rightCount + 1, right):rows numberRows rows@((leftCount, _, rightCount, _):_) (Row EmptyLine right@(Line _)) = (leftCount, EmptyLine, rightCount + 1, right):rows
numberRows rows@((leftCount, _, rightCount, _):_) (Row left right) = (leftCount + 1, left, rightCount + 1, right):rows numberRows rows@((leftCount, _, rightCount, _):_) (Row left right) = (leftCount + 1, left, rightCount + 1, right):rows
normalizedDiffToRows :: Diff a Info -> T.Text -> T.Text -> [Row]
normalizedDiffToRows diff before after = fst $ diffToRows diff (0, 0) before after
data Row = Row Line Line data Row = Row Line Line
deriving Eq deriving Eq