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

Don't clobber other people's signs.

Browse Source
This commit is contained in:
Andy Stewart
2013-02-21 16:07:02 +01:00
parent 0049a1e72c
commit aab9bd5ad9
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugin/gitgutter.vim
View File

@@ -13,6 +13,7 @@ function! s:init()
let s:first_sign_id = 3000 " to avoid clashing with other signs
let s:next_sign_id = s:first_sign_id
let s:sign_ids = []
let s:other_signs = []
let g:gitgutter_initialised = 1
endif
@@ -151,10 +152,26 @@ function! s:show_signs(modified_lines)
endfor
endfunction
function! s:find_other_signs()
redir => signs
silent exe ":sign place file=" . s:current_file()
redir END
let s:other_signs = []
for sign_line in split(signs, '\n')
if sign_line =~ '^\s\+line'
let matches = matchlist(sign_line, '^\s\+line=\(\d\+\)')
let line_number = str2nr(matches[1])
call add(s:other_signs, line_number)
endif
endfor
endfunction
function! s:add_sign(line_number, name, file_name)
let id = s:next_sign_id()
exe ":sign place " . id . " line=" . a:line_number . " name=" . a:name . " file=" . a:file_name
call s:remember_sign(id)
if index(s:other_signs, a:line_number) == -1 " Don't clobber other people's signs.
exe ":sign place " . id . " line=" . a:line_number . " name=" . a:name . " file=" . a:file_name
call s:remember_sign(id)
endif
endfunction
function! s:next_sign_id()
@@ -178,6 +195,7 @@ function! GitGutter()
let hunks = s:parse_diff(diff)
let modified_lines = s:process_hunks(hunks)
call s:clear_signs()
call s:find_other_signs()
call s:show_signs(modified_lines)
endif
endfunction