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

Improve sign handling with better data structure.

Browse Source 
Using a dictionary instead of a list clarifies the code.
This commit is contained in:
Andy Stewart
2014-01-13 10:34:41 +01:00
parent da47098496
commit c680694b06
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
autoload/sign.vim
View File

@@ -11,8 +11,8 @@ let s:dummy_sign_id = s:first_sign_id - 1
" Removes gitgutter's signs from the given file. " Removes gitgutter's signs from the given file.
function! sign#clear_signs(file_name) function! sign#clear_signs(file_name)
call sign#find_current_signs(a:file_name) call sign#find_current_signs(a:file_name)
for sign in getbufvar(a:file_name, 'gitgutter_gitgutter_signs') for sign in values(getbufvar(a:file_name, 'gitgutter_gitgutter_signs'))
execute "sign unplace" sign[1] execute "sign unplace" sign.id
endfor endfor
call setbufvar(a:file_name, 'gitgutter_gitgutter_signs', []) call setbufvar(a:file_name, 'gitgutter_gitgutter_signs', [])
endfunction endfunction
@@ -49,7 +49,7 @@ endfunction
function! sign#find_current_signs(file_name) function! sign#find_current_signs(file_name)
let gitgutter_signs = [] let gitgutter_signs = {} " <line_number>: {'id': <id>, 'name': <name>}
let other_signs = [] let other_signs = []
redir => signs redir => signs
@@ -65,7 +65,7 @@ function! sign#find_current_signs(file_name)
let line_number = str2nr(split(components[0], '=')[1]) let line_number = str2nr(split(components[0], '=')[1])
if name =~# 'GitGutter' if name =~# 'GitGutter'
let id = str2nr(split(components[1], '=')[1]) let id = str2nr(split(components[1], '=')[1])
call add(gitgutter_signs, [line_number, id, name]) " TODO: use dictionary instead? let gitgutter_signs[line_number] = {'id': id, 'name': name}
else else
call add(other_signs, line_number) call add(other_signs, line_number)
endif endif
@@ -79,11 +79,9 @@ endfunction
function! sign#remove_obsolete_gitgutter_signs(file_name, new_gitgutter_signs_line_numbers) function! sign#remove_obsolete_gitgutter_signs(file_name, new_gitgutter_signs_line_numbers)
let old_gitgutter_signs = getbufvar(a:file_name, 'gitgutter_gitgutter_signs') let old_gitgutter_signs = getbufvar(a:file_name, 'gitgutter_gitgutter_signs')
for sign in old_gitgutter_signs for line_number in keys(old_gitgutter_signs)
let line_number = sign[0] if index(a:new_gitgutter_signs_line_numbers, str2nr(line_number)) == -1
if index(a:new_gitgutter_signs_line_numbers, line_number) == -1 execute "sign unplace" old_gitgutter_signs[line_number].id
let id = sign[1]
execute "sign unplace" id
endif endif
endfor endfor
endfunction endfunction
@@ -92,21 +90,18 @@ endfunction
function! sign#upsert_new_gitgutter_signs(file_name, modified_lines) function! sign#upsert_new_gitgutter_signs(file_name, modified_lines)
let other_signs = getbufvar(a:file_name, 'gitgutter_other_signs') let other_signs = getbufvar(a:file_name, 'gitgutter_other_signs')
let old_gitgutter_signs = getbufvar(a:file_name, 'gitgutter_gitgutter_signs') let old_gitgutter_signs = getbufvar(a:file_name, 'gitgutter_gitgutter_signs')
let old_gitgutter_signs_line_numbers = map(copy(old_gitgutter_signs), 'v:val[0]')
for line in a:modified_lines for line in a:modified_lines
let line_number = line[0] let line_number = line[0]
if index(other_signs, line_number) == -1 " don't clobber others' signs if index(other_signs, line_number) == -1 " don't clobber others' signs
let name = utility#highlight_name_for_change(line[1]) let name = utility#highlight_name_for_change(line[1])
let idx = index(old_gitgutter_signs_line_numbers, line_number) if !has_key(old_gitgutter_signs, line_number) " insert
if idx == -1 " insert
let id = sign#next_sign_id() let id = 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 "file=" . a:file_name
else " update if sign has changed else " update if sign has changed
let old_name = old_gitgutter_signs[idx][2] let old_sign = old_gitgutter_signs[line_number]
if old_name !=# name if old_sign.name !=# name
let id = old_gitgutter_signs[idx][1] execute "sign place" old_sign.id "name=" . old_sign.name "file=" . a:file_name
execute "sign place" id "name=" . name "file=" . a:file_name
end end
endif endif
endif endif