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

Use buffer numbers instead of buffer names.

Browse Source 
Also don't pass buffer number to functions when they can look it up
themselves.

Using buffer numbers also eliminates any ambiguity which might arise
from symbolic links, where you have potentially two names for a file.

Thanks to @Z1MM32M4N for work on this (see #209).
This commit is contained in:
Andy Stewart
2014-11-14 12:55:40 +01:00
parent ce4e3d7c9a
commit dfe985a1a6
4 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
autoload/gitgutter/sign.vim
View File

@@ -10,33 +10,34 @@ let s:dummy_sign_id = s:first_sign_id - 1
let s:supports_star = v:version > 703 || (v:version == 703 && has("patch596"))
" Removes gitgutter's signs (excluding dummy sign) from the given file.
function! gitgutter#sign#clear_signs(file_name)
call gitgutter#sign#find_current_signs(a:file_name)
" Removes gitgutter's signs (excluding dummy sign) from the buffer being processed.
function! gitgutter#sign#clear_signs()
let bufnr = gitgutter#utility#bufnr()
call gitgutter#sign#find_current_signs()
let sign_ids = map(values(getbufvar(a:file_name, 'gitgutter_gitgutter_signs')), 'v:val.id')
call gitgutter#sign#remove_signs(sign_ids, a:file_name, 1)
call setbufvar(a:file_name, 'gitgutter_gitgutter_signs', {})
let sign_ids = map(values(getbufvar(bufnr, 'gitgutter_gitgutter_signs')), 'v:val.id')
call gitgutter#sign#remove_signs(sign_ids, 1)
call setbufvar(bufnr, 'gitgutter_gitgutter_signs', {})
endfunction
" Updates gitgutter's signs in the given file.
" Updates gitgutter's signs in the buffer being processed.
"
" modified_lines: list of [<line_number (number)>, <name (string)>]
" where name = 'added|removed|modified|modified_removed'
function! gitgutter#sign#update_signs(file_name, modified_lines)
call gitgutter#sign#find_current_signs(a:file_name)
function! gitgutter#sign#update_signs(modified_lines)
call gitgutter#sign#find_current_signs()
let new_gitgutter_signs_line_numbers = map(copy(a:modified_lines), 'v:val[0]')
let obsolete_signs = gitgutter#sign#obsolete_gitgutter_signs_to_remove(a:file_name, new_gitgutter_signs_line_numbers)
let obsolete_signs = gitgutter#sign#obsolete_gitgutter_signs_to_remove(new_gitgutter_signs_line_numbers)
let flicker_possible = s:remove_all_old_signs && !empty(a:modified_lines)
if flicker_possible
call gitgutter#sign#add_dummy_sign()
endif
call gitgutter#sign#remove_signs(obsolete_signs, a:file_name, s:remove_all_old_signs)
call gitgutter#sign#upsert_new_gitgutter_signs(a:file_name, a:modified_lines)
call gitgutter#sign#remove_signs(obsolete_signs, s:remove_all_old_signs)
call gitgutter#sign#upsert_new_gitgutter_signs(a:modified_lines)
if flicker_possible
call gitgutter#sign#remove_dummy_sign(0)
@@ -45,16 +46,18 @@ endfunction
function! gitgutter#sign#add_dummy_sign()
if !getbufvar(gitgutter#utility#file(), 'gitgutter_dummy_sign')
execute "sign place" s:dummy_sign_id "line=" . 9999 "name=GitGutterDummy file=" . gitgutter#utility#file()
call setbufvar(gitgutter#utility#file(), 'gitgutter_dummy_sign', 1)
let bufnr = gitgutter#utility#bufnr()
if !getbufvar(bufnr, 'gitgutter_dummy_sign')
execute "sign place" s:dummy_sign_id "line=" . 9999 "name=GitGutterDummy buffer=" . bufnr
call setbufvar(bufnr, 'gitgutter_dummy_sign', 1)
endif
endfunction
function! gitgutter#sign#remove_dummy_sign(force)
if getbufvar(gitgutter#utility#file(), 'gitgutter_dummy_sign') && (a:force || !g:gitgutter_sign_column_always)
execute "sign unplace" s:dummy_sign_id "file=" . gitgutter#utility#file()
call setbufvar(gitgutter#utility#file(), 'gitgutter_dummy_sign', 0)
let bufnr = gitgutter#utility#bufnr()
if getbufvar(bufnr, 'gitgutter_dummy_sign') && (a:force || !g:gitgutter_sign_column_always)
execute "sign unplace" s:dummy_sign_id "buffer=" . bufnr
call setbufvar(bufnr, 'gitgutter_dummy_sign', 0)
endif
endfunction
@@ -64,13 +67,14 @@ endfunction
"
function! gitgutter#sign#find_current_signs(file_name)
function! gitgutter#sign#find_current_signs()
let bufnr = gitgutter#utility#bufnr()
let gitgutter_signs = {} " <line_number (string)>: {'id': <id (number)>, 'name': <name (string)>}
let other_signs = [] " [<line_number (number),...]
let dummy_sign_placed = 0
redir => signs
silent execute "sign place file=" . a:file_name
silent execute "sign place buffer=" . bufnr
redir END
for sign_line in filter(split(signs, '\n'), 'v:val =~# "="')
@@ -97,18 +101,19 @@ function! gitgutter#sign#find_current_signs(file_name)
end
endfor
call setbufvar(a:file_name, 'gitgutter_dummy_sign', dummy_sign_placed)
call setbufvar(a:file_name, 'gitgutter_gitgutter_signs', gitgutter_signs)
call setbufvar(a:file_name, 'gitgutter_other_signs', other_signs)
call setbufvar(bufnr, 'gitgutter_dummy_sign', dummy_sign_placed)
call setbufvar(bufnr, 'gitgutter_gitgutter_signs', gitgutter_signs)
call setbufvar(bufnr, 'gitgutter_other_signs', other_signs)
endfunction
" Returns a list of [<id (number)>, ...]
" Sets `s:remove_all_old_signs` as a side-effect.
function! gitgutter#sign#obsolete_gitgutter_signs_to_remove(file_name, new_gitgutter_signs_line_numbers)
function! gitgutter#sign#obsolete_gitgutter_signs_to_remove(new_gitgutter_signs_line_numbers)
let bufnr = gitgutter#utility#bufnr()
let signs_to_remove = [] " list of [<id (number)>, ...]
let remove_all_signs = 1
let old_gitgutter_signs = getbufvar(a:file_name, 'gitgutter_gitgutter_signs')
let old_gitgutter_signs = getbufvar(bufnr, 'gitgutter_gitgutter_signs')
for line_number in keys(old_gitgutter_signs)
if index(a:new_gitgutter_signs_line_numbers, str2nr(line_number)) == -1
call add(signs_to_remove, old_gitgutter_signs[line_number].id)
@@ -121,12 +126,13 @@ function! gitgutter#sign#obsolete_gitgutter_signs_to_remove(file_name, new_gitgu
endfunction
function! gitgutter#sign#remove_signs(sign_ids, file_name, all_signs)
if a:all_signs && s:supports_star && empty(getbufvar(a:file_name, 'gitgutter_other_signs'))
let dummy_sign_present = getbufvar(a:file_name, 'gitgutter_dummy_sign')
execute "sign unplace * file=" . a:file_name
function! gitgutter#sign#remove_signs(sign_ids, all_signs)
let bufnr = gitgutter#utility#bufnr()
if a:all_signs && s:supports_star && empty(getbufvar(bufnr, 'gitgutter_other_signs'))
let dummy_sign_present = getbufvar(bufnr, 'gitgutter_dummy_sign')
execute "sign unplace * buffer=" . bufnr
if dummy_sign_present
execute "sign place" s:dummy_sign_id "line=" . 9999 "name=GitGutterDummy file=" . a:file_name
execute "sign place" s:dummy_sign_id "line=" . 9999 "name=GitGutterDummy buffer=" . bufnr
endif
else
for id in a:sign_ids
@@ -136,9 +142,10 @@ function! gitgutter#sign#remove_signs(sign_ids, file_name, all_signs)
endfunction
function! gitgutter#sign#upsert_new_gitgutter_signs(file_name, modified_lines)
let other_signs = getbufvar(a:file_name, 'gitgutter_other_signs')
let old_gitgutter_signs = getbufvar(a:file_name, 'gitgutter_gitgutter_signs')
function! gitgutter#sign#upsert_new_gitgutter_signs(modified_lines)
let bufnr = gitgutter#utility#bufnr()
let other_signs = getbufvar(bufnr, 'gitgutter_other_signs')
let old_gitgutter_signs = getbufvar(bufnr, 'gitgutter_gitgutter_signs')
for line in a:modified_lines
let line_number = line[0] " <number>
@@ -146,11 +153,11 @@ function! gitgutter#sign#upsert_new_gitgutter_signs(file_name, modified_lines)
let name = gitgutter#utility#highlight_name_for_change(line[1])
if !has_key(old_gitgutter_signs, line_number) " insert
let id = gitgutter#sign#next_sign_id()
execute "sign place" id "line=" . line_number "name=" . name "file=" . a:file_name
execute "sign place" id "line=" . line_number "name=" . name "buffer=" . bufnr
else " update if sign has changed
let old_sign = old_gitgutter_signs[line_number]
if old_sign.name !=# name
execute "sign place" old_sign.id "name=" . name "file=" . a:file_name
execute "sign place" old_sign.id "name=" . name "buffer=" . bufnr
end
endif
endif