hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop errors being generated when jobs are removed from the Dictionary before callbacks fire

Browse Source
This commit is contained in:
w0rp 2017-06-05 13:30:40 +01:00
parent 33b0852c84
commit dcbab18a35
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
autoload/ale/job.vim
View File

@ -83,7 +83,7 @@ function! s:VimOutputCallback(channel, data) abort
let l:job_id = ale#job#ParseVim8ProcessID(string(l:job)) let l:job_id = ale#job#ParseVim8ProcessID(string(l:job))
" Only call the callbacks for jobs which are valid. " Only call the callbacks for jobs which are valid.
if l:job_id > 0 if l:job_id > 0 && has_key(s:job_map, l:job_id)
call ale#util#GetFunction(s:job_map[l:job_id].out_cb)(l:job_id, a:data) call ale#util#GetFunction(s:job_map[l:job_id].out_cb)(l:job_id, a:data)
endif endif
endfunction endfunction
@ -93,7 +93,7 @@ function! s:VimErrorCallback(channel, data) abort
let l:job_id = ale#job#ParseVim8ProcessID(string(l:job)) let l:job_id = ale#job#ParseVim8ProcessID(string(l:job))
" Only call the callbacks for jobs which are valid. " Only call the callbacks for jobs which are valid.
if l:job_id > 0 if l:job_id > 0 && has_key(s:job_map, l:job_id)
call ale#util#GetFunction(s:job_map[l:job_id].err_cb)(l:job_id, a:data) call ale#util#GetFunction(s:job_map[l:job_id].err_cb)(l:job_id, a:data)
endif endif
endfunction endfunction
@ -103,6 +103,10 @@ function! s:VimCloseCallback(channel) abort
let l:job_id = ale#job#ParseVim8ProcessID(string(l:job)) let l:job_id = ale#job#ParseVim8ProcessID(string(l:job))
let l:info = get(s:job_map, l:job_id, {}) let l:info = get(s:job_map, l:job_id, {})
if empty(l:info)
return
endif
" job_status() can trigger the exit handler. " job_status() can trigger the exit handler.
" The channel can close before the job has exited. " The channel can close before the job has exited.
if job_status(l:job) ==# 'dead' if job_status(l:job) ==# 'dead'
@ -122,6 +126,11 @@ endfunction
function! s:VimExitCallback(job, exit_code) abort function! s:VimExitCallback(job, exit_code) abort
let l:job_id = ale#job#ParseVim8ProcessID(string(a:job)) let l:job_id = ale#job#ParseVim8ProcessID(string(a:job))
let l:info = get(s:job_map, l:job_id, {}) let l:info = get(s:job_map, l:job_id, {})
if empty(l:info)
return
endif
let l:info.exit_code = a:exit_code let l:info.exit_code = a:exit_code
" The program can exit before the data has finished being read. " The program can exit before the data has finished being read.