vim/vim-signify
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better handling of calls to s:remove_signs()

Browse Source 
Improving by removing!

Closes #2.
This commit is contained in:
Marco Hinz 2013-03-08 09:54:42 +01:00
parent 24d8a37b58
commit 51f5139ff5
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugin/signify.vim
View File

@ -94,7 +94,6 @@ aug signify
au ColorScheme * call s:set_colors() au ColorScheme * call s:set_colors()
au BufWritePost,FocusGained * call s:start(expand('<afile>:p')) au BufWritePost,FocusGained * call s:start(expand('<afile>:p'))
au BufEnter * let s:colors_set = 0 | call s:start(expand('<afile>:p')) au BufEnter * let s:colors_set = 0 | call s:start(expand('<afile>:p'))
au BufDelete * call s:stop(expand('<afile>:p')) | call s:remove_from_buffer_list(expand('<afile>:p'))
aug END aug END
com! -nargs=0 -bar SignifyToggle call s:toggle_signify() com! -nargs=0 -bar SignifyToggle call s:toggle_signify()
@ -125,23 +124,28 @@ function! s:start(path) abort
endfor endfor
endif endif
" Is a diff available?
let diff = s:get_diff(a:path)
if empty(diff)
return
endif
" New buffer.. add to list. " New buffer.. add to list.
if !has_key(s:sy, a:path) if !has_key(s:sy, a:path)
let s:sy[a:path] = { 'active': 1, 'ids': [], 'id_jump': s:id_top, 'id_top': s:id_top, 'last_jump_was_next': -1 } let s:sy[a:path] = { 'active': 1, 'ids': [], 'id_jump': s:id_top, 'id_top': s:id_top, 'last_jump_was_next': -1 }
" Inactive buffer.. bail out. " Inactive buffer.. bail out.
elseif s:sy[a:path].active == 0 elseif s:sy[a:path].active == 0
return return
" Update active buffer.. reset default values
else else
call s:remove_signs(a:path)
let s:sy[a:path].id_top = s:id_top let s:sy[a:path].id_top = s:id_top
let s:sy[a:path].id_jump = s:id_top let s:sy[a:path].id_jump = s:id_top
let s:sy[a:path].last_jump_was_next = -1 let s:sy[a:path].last_jump_was_next = -1
endif endif
" Is a diff available? if s:sign_overwrite == 0
let diff = s:get_diff(a:path) call s:get_other_signs(a:path)
if empty(diff)
call s:remove_signs(a:path)
return
endif endif
" Set colors only for the first time or when a new colorscheme is set. " Set colors only for the first time or when a new colorscheme is set.
@ -150,12 +154,6 @@ function! s:start(path) abort
let s:colors_set = 1 let s:colors_set = 1
endif endif
call s:remove_signs(a:path)
if s:sign_overwrite == 0
call s:get_other_signs(a:path)
endif
" Use git's diff cmd to set our signs. " Use git's diff cmd to set our signs.
call s:process_diff(diff) call s:process_diff(diff)
@ -164,8 +162,13 @@ endfunction
" Functions -> s:stop() {{{2 " Functions -> s:stop() {{{2
function! s:stop(path) abort function! s:stop(path) abort
echom expand('%:p') if !has_key(s:sy, a:path)
return
endif
call s:remove_signs(a:path) call s:remove_signs(a:path)
call remove(s:sy, a:path)
aug signify aug signify
au! * <buffer> au! * <buffer>
aug END aug END
@ -428,13 +431,6 @@ function! s:jump_to_prev_hunk()
let s:sy[path].last_jump_was_next = 0 let s:sy[path].last_jump_was_next = 0
endfunction endfunction
" Functions -> s:remove_from_buffer_list() {{{2
function! s:remove_from_buffer_list(path) abort
if has_key(s:sy, a:path)
call remove(s:sy, a:path)
endif
endfunction
" Functions -> SignifyDebugListActiveBuffers() {{{2 " Functions -> SignifyDebugListActiveBuffers() {{{2
function! SignifyDebugListActiveBuffers() abort function! SignifyDebugListActiveBuffers() abort
if len(s:sy) == 0 if len(s:sy) == 0