github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-29 18:06:14 +03:00
Code Issues Projects Releases Wiki Activity

Union the ranges rather than concatenating them.

Browse Source
This commit is contained in:
Rob Rix 2015-12-30 12:35:27 -05:00
parent a225fb20fe
commit 176d45b59d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/PatchOutput.hs
View File

@ -5,6 +5,7 @@ module PatchOutput (
import Diff
import Line
import Range
import Row
import Source hiding ((++))
import Split
@ -29,7 +30,7 @@ showChange sourceA sourceB change = concat (showLine ' ' sourceB . unRight <$> c
then showLine ' ' sourceB lineB
else showLine '-' sourceA lineA ++ showLine '+' sourceB lineB
showLine _ _ EmptyLine = ""
showLine prefix source line = prefix : (toString . (`slice` source) . mconcat $ getRange <$> unLine line)
showLine prefix source line = prefix : (toString . (`slice` source) . unionRanges $ getRange <$> unLine line)
getRange (Free (Annotated (Info range _) _)) = range
getRange (Pure (Info range _ :< _)) = range