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

Update vim callback handlers in light of vim change.

Browse Source 
Vim 7.4.1810 stopped sending DETACH to the out_cb handler to mark the
end of the job's stdout.  Instead we add a close_cb handler which does
what the out_cb handler used to do upon receiving DETACH.
This commit is contained in:
Andy Stewart
2016-05-05 10:16:58 +01:00
parent a4e75dd074
commit 72d100517a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
autoload/gitgutter/async.vim
View File

@@ -1,7 +1,7 @@
let s:jobs = {} let s:jobs = {}
" Async broken on MacVim in GUI mode: " Async broken on MacVim in GUI mode:
" https://github.com/macvim-dev/macvim/issues/272 " https://github.com/macvim-dev/macvim/issues/272
let s:available = has('nvim') "|| (has('patch-7-4-1791') && !(has('gui_macvim') && has('gui_running'))) let s:available = has('nvim') || (has('patch-7-4-1810') && !(has('gui_macvim') && has('gui_running')))
function! gitgutter#async#available() function! gitgutter#async#available()
return s:available return s:available
@@ -31,9 +31,9 @@ function! gitgutter#async#execute(cmd)
" ignored (and thus signs are not updated; this assumes that an error " ignored (and thus signs are not updated; this assumes that an error
" only occurs when a file is not tracked by git). " only occurs when a file is not tracked by git).
let job = job_start([&shell, &shellcmdflag, a:cmd], { let job = job_start([&shell, &shellcmdflag, a:cmd], {
\ 'out_cb': 'gitgutter#async#handle_diff_job_vim' \ 'out_cb': 'gitgutter#async#handle_diff_job_vim',
\ 'close_cb': 'gitgutter#async#handle_diff_job_vim_close'
\ }) \ })
" \ 'close_cb': 'gitgutter#handle_diff_job_vim_close'
call gitgutter#debug#log('[vim job: '.string(job_info(job)).'] '.a:cmd) call gitgutter#debug#log('[vim job: '.string(job_info(job)).'] '.a:cmd)
endif endif
endfunction endfunction
@@ -75,12 +75,17 @@ function! gitgutter#async#handle_diff_job_vim(channel, line)
" This seems to be the only way to get info about the channel once closed. " This seems to be the only way to get info about the channel once closed.
let channel_id = matchstr(a:channel, '\d\+') let channel_id = matchstr(a:channel, '\d\+')
if a:line ==# 'DETACH' " End of job output call s:accumulate_job_output(channel_id, a:line)
endfunction
function! gitgutter#async#handle_diff_job_vim_close(channel)
call gitgutter#debug#log('channel: '.a:channel)
" This seems to be the only way to get info about the channel once closed.
let channel_id = matchstr(a:channel, '\d\+')
call gitgutter#handle_diff(s:job_output(channel_id)) call gitgutter#handle_diff(s:job_output(channel_id))
call s:job_finished(channel_id) call s:job_finished(channel_id)
else
call s:accumulate_job_output(channel_id, a:line)
endif
endfunction endfunction