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

Simplify showLine.

Browse Source
This commit is contained in:
Rob Rix 2016-04-25 14:59:00 -04:00
parent 7628d15a73
commit 237558fbed
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/AlignmentSpec.hs
View File

@ -117,11 +117,9 @@ instance Eq PrettyDiff where
instance Show PrettyDiff where
show (PrettyDiff sources lines) = ('\n':) =<< (showLine (fromMaybe 0 (maximum (fmap length <$> shownLines))) <$> catMaybes shownLines)
where shownLines = toBoth <$> lines
showLine n line = case runJoin line of
This before -> pad n before " | "
That after -> showString (replicate n ' ') (showString " | " after)
These before after -> pad n before (showString " | " after)
showLine n line = let (before, after) = fromThese (replicate n ' ') (replicate n ' ') (runJoin (pad n <$> line)) in
before ++ " | " ++ after
showDiff diff = stripNewlines . toList . Source.slice (getRange diff)
stripNewlines = filter (/= '\n')
pad n string = showString (take n string) . showString (replicate (max 0 (n - length string)) ' ')
pad n string = showString (take n string) (showString (replicate (max 0 (n - length string)) ' ') "")
toBoth them = showDiff <$> them `applyThese` modifyJoin (uncurry These) sources