Skip to content

Commit

Permalink
fix bg bleed in git diff for whitespace errors
Browse files Browse the repository at this point in the history 
Alter the end pattern for the Bg syn regions in AnsiEsc to also match
the pattern git uses to reset ANSI colors, namely \e\[m .

There is still an issue with vim's conceal regions screwing up how many
spaces vim thinks is a tab, not sure how to fix this in AnsiEsc, we make
vimpager use a crude hack to work around this: force a :retab.
  • Loading branch information
@rkitover
rkitover committed Aug 21, 2014
1 parent 8f435d7 commit 731abf0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions ansiesc/autoload/AnsiEsc.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
" call Decho("installing implicit background highlighting")

syn cluster AnsiBlackBgGroup contains=ansiFgBlackBlack,ansiFgRedBlack,ansiFgGreenBlack,ansiFgYellowBlack,ansiFgBlueBlack,ansiFgMagentaBlack,ansiFgCyanBlack,ansiFgWhiteBlack
syn region ansiBlackBg start="\e\[;\=0\{0,2};\=\%(1;\)\=40\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiBlackBgGroup
syn region ansiBlackBg start="\e\[;\=0\{0,2};\=\%(1;\)\=40\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiBlackBgGroup
syn region ansiFgBlackBlack contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedBlack contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenBlack contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand All @@ -231,7 +231,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteBlack ansiWhiteBlack

syn cluster AnsiRedBgGroup contains=ansiFgBlackRed,ansiFgRedRed,ansiFgGreenRed,ansiFgYellowRed,ansiFgBlueRed,ansiFgMagentaRed,ansiFgCyanRed,ansiFgWhiteRed
syn region ansiRedBg start="\e\[;\=0\{0,2};\=\%(1;\)\=41\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiRedBgGroup
syn region ansiRedBg start="\e\[;\=0\{0,2};\=\%(1;\)\=41\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiRedBgGroup
syn region ansiFgBlackRed contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedRed contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenRed contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand All @@ -250,7 +250,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteRed ansiWhiteRed

syn cluster AnsiGreenBgGroup contains=ansiFgBlackGreen,ansiFgRedGreen,ansiFgGreenGreen,ansiFgYellowGreen,ansiFgBlueGreen,ansiFgMagentaGreen,ansiFgCyanGreen,ansiFgWhiteGreen
syn region ansiGreenBg start="\e\[;\=0\{0,2};\=\%(1;\)\=42\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiGreenBgGroup
syn region ansiGreenBg start="\e\[;\=0\{0,2};\=\%(1;\)\=42\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiGreenBgGroup
syn region ansiFgBlackGreen contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedGreen contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenGreen contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand All @@ -269,7 +269,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteGreen ansiWhiteGreen

syn cluster AnsiYellowBgGroup contains=ansiFgBlackYellow,ansiFgRedYellow,ansiFgGreenYellow,ansiFgYellowYellow,ansiFgBlueYellow,ansiFgMagentaYellow,ansiFgCyanYellow,ansiFgWhiteYellow
syn region ansiYellowBg start="\e\[;\=0\{0,2};\=\%(1;\)\=43\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiYellowBgGroup
syn region ansiYellowBg start="\e\[;\=0\{0,2};\=\%(1;\)\=43\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiYellowBgGroup
syn region ansiFgBlackYellow contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedYellow contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenYellow contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand All @@ -288,7 +288,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteYellow ansiWhiteYellow

syn cluster AnsiBlueBgGroup contains=ansiFgBlackBlue,ansiFgRedBlue,ansiFgGreenBlue,ansiFgYellowBlue,ansiFgBlueBlue,ansiFgMagentaBlue,ansiFgCyanBlue,ansiFgWhiteBlue
syn region ansiBlueBg contained start="\e\[;\=0\{0,2};\=\%(1;\)\=44\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiBlueBgGroup
syn region ansiBlueBg contained start="\e\[;\=0\{0,2};\=\%(1;\)\=44\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiBlueBgGroup
syn region ansiFgBlackBlue contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedBlue contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenBlue contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand Down Expand Up @@ -325,7 +325,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteBlue ansiWhiteBlue

syn cluster AnsiMagentaBgGroup contains=ansiFgBlackMagenta,ansiFgRedMagenta,ansiFgGreenMagenta,ansiFgYellowMagenta,ansiFgBlueMagenta,ansiFgMagentaMagenta,ansiFgCyanMagenta,ansiFgWhiteMagenta
syn region ansiMagentaBg contained start="\e\[;\=0\{0,2};\=\%(1;\)\=45\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiMagentaBgGroup
syn region ansiMagentaBg contained start="\e\[;\=0\{0,2};\=\%(1;\)\=45\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiMagentaBgGroup
syn region ansiFgBlackMagenta contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedMagenta contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenMagenta contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand All @@ -344,7 +344,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteMagenta ansiWhiteMagenta

syn cluster AnsiCyanBgGroup contains=ansiFgBlackCyan,ansiFgRedCyan,ansiFgGreenCyan,ansiFgYellowCyan,ansiFgBlueCyan,ansiFgMagentaCyan,ansiFgCyanCyan,ansiFgWhiteCyan
syn region ansiCyanBg start="\e\[;\=0\{0,2};\=\%(1;\)\=46\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiCyanBgGroup
syn region ansiCyanBg start="\e\[;\=0\{0,2};\=\%(1;\)\=46\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiCyanBgGroup
syn region ansiFgBlackCyan contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedCyan contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenCyan contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand All @@ -363,7 +363,7 @@ fun! AnsiEsc#AnsiEsc(rebuild)
hi link ansiFgWhiteCyan ansiWhiteCyan

syn cluster AnsiWhiteBgGroup contains=ansiFgBlackWhite,ansiFgRedWhite,ansiFgGreenWhite,ansiFgYellowWhite,ansiFgBlueWhite,ansiFgMagentaWhite,ansiFgCyanWhite,ansiFgWhiteWhite
syn region ansiWhiteBg start="\e\[;\=0\{0,2};\=\%(1;\)\=47\%(1;\)\=m" end="\e\[[04]"me=e-3 contains=ansiConceal,@ansiWhiteBgGroup
syn region ansiWhiteBg start="\e\[;\=0\{0,2};\=\%(1;\)\=47\%(1;\)\=m" end="\ze\e\[\%([04]\|m\)" contains=ansiConceal,@ansiWhiteBgGroup
syn region ansiFgBlackWhite contained start="\e\[30m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgRedWhite contained start="\e\[31m" end="\e\["me=e-2 contains=ansiConceal
syn region ansiFgGreenWhite contained start="\e\[32m" end="\e\["me=e-2 contains=ansiConceal
Expand Down

0 comments on commit 731abf0

Please sign in to comment.