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

Refactoring: provide funcref to run on job exit

Browse Source
This commit is contained in:
Marco Hinz 2019-08-01 17:44:01 +02:00
parent 0f763b514a
commit 83b226f069
No known key found for this signature in database
GPG Key ID: 1C980A1B657B4A4F
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/sy.vim
View File

@ -75,7 +75,7 @@ function! sy#start() abort
call sy#verbose('Update is already in progress.', vcs) call sy#verbose('Update is already in progress.', vcs)
else else
call sy#verbose('Updating signs.', vcs) call sy#verbose('Updating signs.', vcs)
call sy#repo#get_diff_start(vcs) call sy#repo#get_diff_start(vcs, function('sy#repo#job_exit_show_signs'))
endif endif
endfor endfor
endif endif

18
autoload/sy/repo.vim
View File

@ -6,7 +6,7 @@ scriptencoding utf-8
function! sy#repo#detect() abort function! sy#repo#detect() abort
for vcs in s:vcs_list for vcs in s:vcs_list
let b:sy.detecting += 1 let b:sy.detecting += 1
call sy#repo#get_diff_start(vcs) call sy#repo#get_diff_start(vcs, function('sy#repo#job_exit_show_signs'))
endfor endfor
endfunction endfunction
@ -23,7 +23,7 @@ endfunction
" Function: s:callback_nvim_exit {{{1 " Function: s:callback_nvim_exit {{{1
function! s:callback_nvim_exit(_job_id, exitval, _event) dict abort function! s:callback_nvim_exit(_job_id, exitval, _event) dict abort
call s:job_exit(self.bufnr, self.vcs, a:exitval, self.stdoutbuf) call self.func(self.bufnr, self.vcs, a:exitval, self.stdoutbuf)
endfunction endfunction
" Function: s:callback_vim_stdout {{{1 " Function: s:callback_vim_stdout {{{1
@ -41,12 +41,12 @@ function! s:callback_vim_close(channel) dict abort
endif endif
sleep 10m sleep 10m
endwhile endwhile
call s:job_exit(self.bufnr, self.vcs, exitval, self.stdoutbuf) call self.func(self.bufnr, self.vcs, exitval, self.stdoutbuf)
endfunction endfunction
" Function: s:job_exit {{{1 " Function: #job_exit_show_signs {{{1
function! s:job_exit(bufnr, vcs, exitval, diff) abort function! sy#repo#job_exit_show_signs(bufnr, vcs, exitval, diff) abort
call sy#verbose('job_exit()', a:vcs) call sy#verbose('sy#repo#job_exit_show_signs()', a:vcs)
let sy = getbufvar(a:bufnr, 'sy') let sy = getbufvar(a:bufnr, 'sy')
if empty(sy) if empty(sy)
call sy#verbose(printf('No b:sy found for %s', bufname(a:bufnr)), a:vcs) call sy#verbose(printf('No b:sy found for %s', bufname(a:bufnr)), a:vcs)
@ -62,8 +62,8 @@ function! s:job_exit(bufnr, vcs, exitval, diff) abort
endfunction endfunction
" Function: sy#get_diff_start {{{1 " Function: sy#get_diff_start {{{1
function! sy#repo#get_diff_start(vcs) abort function! sy#repo#get_diff_start(vcs, func) abort
call sy#verbose('get_diff_start()', a:vcs) call sy#verbose('sy#repoget_diff_start()', a:vcs)
let job_id = get(b:, 'sy_job_id_'.a:vcs) let job_id = get(b:, 'sy_job_id_'.a:vcs)
" Neovim " Neovim
@ -73,6 +73,7 @@ function! sy#repo#get_diff_start(vcs) abort
endif endif
let [cmd, options] = s:initialize_job(a:vcs) let [cmd, options] = s:initialize_job(a:vcs)
let options.func = a:func
let [cwd, chdir] = sy#util#chdir() let [cwd, chdir] = sy#util#chdir()
call sy#verbose(['CMD: '. string(cmd), 'CMD DIR: '. b:sy.info.dir, 'ORIG DIR: '. cwd], a:vcs) call sy#verbose(['CMD: '. string(cmd), 'CMD DIR: '. b:sy.info.dir, 'ORIG DIR: '. cwd], a:vcs)
@ -98,6 +99,7 @@ function! sy#repo#get_diff_start(vcs) abort
endif endif
let [cmd, options] = s:initialize_job(a:vcs) let [cmd, options] = s:initialize_job(a:vcs)
let options.func = a:func
let [cwd, chdir] = sy#util#chdir() let [cwd, chdir] = sy#util#chdir()
call sy#verbose(['CMD: '. string(cmd), 'CMD DIR: '. b:sy.info.dir, 'ORIG DIR: '. cwd], a:vcs) call sy#verbose(['CMD: '. string(cmd), 'CMD DIR: '. b:sy.info.dir, 'ORIG DIR: '. cwd], a:vcs)