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

Vim: make sure all stdout is read when job exits

Browse Source 
References #228.
This commit is contained in:
Marco Hinz 2017-02-20 14:43:35 +01:00
parent 3020873ee4
commit 0908e37758
No known key found for this signature in database
GPG Key ID: 1C980A1B657B4A4F
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
autoload/sy/repo.vim
View File

@ -38,22 +38,32 @@ endfunction
" Function: s:callback_close {{{1 " Function: s:callback_close {{{1
function! s:callback_close(channel) dict abort function! s:callback_close(channel) dict abort
try let job = ch_getjob(a:channel)
silent! call job_status(ch_getjob(a:channel)) while 1
catch if job_status(job) == 'dead'
endtry let exitval = job_info(job).exitval
break
endif
sleep 10m
endwhile
call s:job_exit(self.bufnr, self.vcs, exitval, self.stdoutbuf, self.do_register)
endfunction endfunction
" Function: s:callback_exit {{{1 " Function: s:callback_exit {{{1
function! s:callback_exit(_job_id, exitval, ...) dict abort function! s:callback_exit(_job_id, exitval, _event) dict abort
call sy#verbose('callback_exit()', self.vcs) call s:job_exit(self.bufnr, self.vcs, a:exitval, self.stdoutbuf, self.do_register)
let sy = getbufvar(self.bufnr, 'sy') endfunction
" Function: s:job_exit {{{1
function! s:job_exit(bufnr, vcs, exitval, diff, do_register) abort
call sy#verbose('job_exit()', a:vcs)
let sy = getbufvar(a:bufnr, 'sy')
if empty(sy) if empty(sy)
call sy#verbose(printf('No b:sy found for %s', bufname(self.bufnr)), self.vcs) call sy#verbose(printf('No b:sy found for %s', bufname(a:bufnr)), a:vcs)
return return
endif endif
call sy#repo#get_diff_{self.vcs}(sy, a:exitval, self.stdoutbuf, self.do_register) call sy#repo#get_diff_{a:vcs}(sy, a:exitval, a:diff, a:do_register)
call setbufvar(self.bufnr, 'sy_job_id_'.self.vcs, 0) call setbufvar(a:bufnr, 'sy_job_id_'.a:vcs, 0)
endfunction endfunction
" Function: sy#get_diff_start {{{1 " Function: sy#get_diff_start {{{1
@ -94,13 +104,10 @@ function! sy#repo#get_diff_start(vcs, do_register) abort
execute chdir fnameescape(b:sy_info.dir) execute chdir fnameescape(b:sy_info.dir)
call sy#verbose(printf('CMD: %s | CWD: %s', string(cmd), getcwd()), a:vcs) call sy#verbose(printf('CMD: %s | CWD: %s', string(cmd), getcwd()), a:vcs)
let opts = { let opts = {
\ 'in_io': 'null', \ 'in_io': 'null',
\ 'out_cb': function('s:callback_stdout_vim', options), \ 'out_cb': function('s:callback_stdout_vim', options),
\ 'exit_cb': function('s:callback_exit', options), \ 'close_cb': function('s:callback_close', options),
\ } \ }
if !has('patch-8.0.50')
let opts.close_cb = function('s:callback_close', options)
endif
let b:sy_job_id_{a:vcs} = job_start(cmd, opts) let b:sy_job_id_{a:vcs} = job_start(cmd, opts)
finally finally
execute chdir fnameescape(cwd) execute chdir fnameescape(cwd)