m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-10 04:23:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix independent toggling of signs in sign column and line highlights.

Browse Source 
Note that line highlighting requires signs to be placed (because the
line highlight is simply an attribute of a sign).  If the user doesn't
want to see signs in the sign column, but does want line highlighting,
then we make the signs in the sign column invisible.

If neither the signs in the sign column nor the line highlights are
needed (presumably the user just looks at the hunks stats) then we can
remove all signs, at which point Vim removes the sign column...unless
the "sign column always" option is set.
This commit is contained in:
Andy Stewart
2014-05-19 15:50:51 +02:00
parent 0759c96770
commit ceeba75239
2 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
autoload/highlight.vim
View File

@@ -6,17 +6,24 @@ function! highlight#define_highlights()
let [guibg, ctermbg] = highlight#get_background_colors('SignColumn')
" Highlights used by the signs.
execute "highlight GitGutterAddDefault guifg=#009900 guibg=" . guibg . " ctermfg=2 ctermbg=" . ctermbg
execute "highlight GitGutterChangeDefault guifg=#bbbb00 guibg=" . guibg . " ctermfg=3 ctermbg=" . ctermbg
execute "highlight GitGutterDeleteDefault guifg=#ff2222 guibg=" . guibg . " ctermfg=1 ctermbg=" . ctermbg
highlight default link GitGutterChangeDeleteDefault GitGutterChangeDefault
execute "highlight GitGutterAddInvisible guifg=bg" . " guibg=" . guibg . " ctermfg=" . ctermbg . " ctermbg=" . ctermbg
execute "highlight GitGutterChangeInvisible guifg=bg" . " guibg=" . guibg . " ctermfg=" . ctermbg . " ctermbg=" . ctermbg
execute "highlight GitGutterDeleteInvisible guifg=bg" . " guibg=" . guibg . " ctermfg=" . ctermbg . " ctermbg=" . ctermbg
highlight default link GitGutterChangeDeleteInvisible GitGutterChangeInvisble
highlight default link GitGutterAdd GitGutterAddDefault
highlight default link GitGutterChange GitGutterChangeDefault
highlight default link GitGutterDelete GitGutterDeleteDefault
highlight default link GitGutterChangeDelete GitGutterChangeDeleteDefault
" Highlights used for the whole line.
highlight default link GitGutterAddLine DiffAdd
highlight default link GitGutterChangeLine DiffChange
highlight default link GitGutterDeleteLine DiffDelete
@@ -43,6 +50,21 @@ function! highlight#define_sign_text()
endfunction
function! highlight#define_sign_text_highlights()
" Once a sign's text attribute has been defined, it cannot be undefined or
" set to an empty value. So to make signs' text disappear we make it
" invisible.
if g:gitgutter_signs
highlight link GitGutterAdd GitGutterAddDefault
highlight link GitGutterChange GitGutterChangeDefault
highlight link GitGutterDelete GitGutterDeleteDefault
highlight link GitGutterChangeDelete GitGutterChangeDeleteDefault
else
highlight link GitGutterAdd GitGutterAddInvisible
highlight link GitGutterChange GitGutterChangeInvisible
highlight link GitGutterDelete GitGutterDeleteInvisible
highlight link GitGutterChangeDelete GitGutterChangeDeleteInvisible
endif
sign define GitGutterLineAdded texthl=GitGutterAdd
sign define GitGutterLineModified texthl=GitGutterChange
sign define GitGutterLineRemoved texthl=GitGutterDelete