mirror of
https://github.com/airblade/vim-gitgutter.git
synced 2025-11-08 19:43:47 -05:00
208b439585
Until this commit the err callback closed the channel to prevent the close callback from being invoked, because the close callback invoked the out handler (which we don't want when the job was unsuccessful). This mostly worked but if closing the channel took too long, which it seemed it could when dealing with large files, the close callback could be called in the meantime. This commit removes the unreliable code. The parent commit ensured that the close callback only calls the out handler when the job succeeded, so we no longer need to try to prevent the close callback from being called.
96 lines
2.4 KiB
VimL
96 lines
2.4 KiB
VimL
let s:available = has('nvim') || (
|
|
\ has('job') && (
|
|
\ (has('patch-7-4-1826') && !has('gui_running')) ||
|
|
\ (has('patch-7-4-1850') && has('gui_running')) ||
|
|
\ (has('patch-7-4-1832') && has('gui_macvim'))
|
|
\ )
|
|
\ )
|
|
|
|
function! gitgutter#async#available()
|
|
return s:available
|
|
endfunction
|
|
|
|
|
|
function! gitgutter#async#execute(cmd, bufnr, handler) abort
|
|
call gitgutter#debug#log('[async] '.a:cmd)
|
|
|
|
let options = {
|
|
\ 'stdoutbuffer': [],
|
|
\ 'buffer': a:bufnr,
|
|
\ 'handler': a:handler
|
|
\ }
|
|
let command = s:build_command(a:cmd)
|
|
|
|
if has('nvim')
|
|
call jobstart(command, extend(options, {
|
|
\ 'on_stdout': function('s:on_stdout_nvim'),
|
|
\ 'on_stderr': function('s:on_stderr_nvim'),
|
|
\ 'on_exit': function('s:on_exit_nvim')
|
|
\ }))
|
|
else
|
|
call job_start(command, {
|
|
\ 'out_cb': function('s:on_stdout_vim', options),
|
|
\ 'err_cb': function('s:on_stderr_vim', options),
|
|
\ 'close_cb': function('s:on_exit_vim', options)
|
|
\ })
|
|
endif
|
|
endfunction
|
|
|
|
|
|
function! s:build_command(cmd)
|
|
if has('unix')
|
|
return ['sh', '-c', a:cmd]
|
|
endif
|
|
|
|
if has('win32')
|
|
return has('nvim') ? ['cmd.exe', '/c', a:cmd] : 'cmd.exe /c '.a:cmd
|
|
endif
|
|
|
|
throw 'unknown os'
|
|
endfunction
|
|
|
|
|
|
function! s:on_stdout_nvim(_job_id, data, _event) dict abort
|
|
if empty(self.stdoutbuffer)
|
|
let self.stdoutbuffer = a:data
|
|
else
|
|
let self.stdoutbuffer = self.stdoutbuffer[:-2] +
|
|
\ [self.stdoutbuffer[-1] . a:data[0]] +
|
|
\ a:data[1:]
|
|
endif
|
|
endfunction
|
|
|
|
function! s:on_stderr_nvim(_job_id, _data, _event) dict abort
|
|
call self.handler.err(self.buffer)
|
|
endfunction
|
|
|
|
function! s:on_exit_nvim(_job_id, exit_code, _event) dict abort
|
|
if !a:exit_code
|
|
call self.handler.out(self.buffer, join(self.stdoutbuffer, "\n"))
|
|
endif
|
|
endfunction
|
|
|
|
|
|
function! s:on_stdout_vim(_channel, data) dict abort
|
|
call add(self.stdoutbuffer, a:data)
|
|
endfunction
|
|
|
|
function! s:on_stderr_vim(channel, _data) dict abort
|
|
call self.handler.err(self.buffer)
|
|
endfunction
|
|
|
|
function! s:on_exit_vim(channel) dict abort
|
|
let job = ch_getjob(a:channel)
|
|
while 1
|
|
if job_status(job) == 'dead'
|
|
let exit_code = job_info(job).exitval
|
|
break
|
|
endif
|
|
sleep 5m
|
|
endwhile
|
|
|
|
if !exit_code
|
|
call self.handler.out(self.buffer, join(self.stdoutbuffer, "\n"))
|
|
endif
|
|
endfunction
|