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

Handle there being no process for a job better in Vim 8, re issue #39.

Browse Source
This commit is contained in:
w0rp 2016-10-08 21:04:42 +01:00
parent 57b157bbae
commit 20a28b7856
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugin/ale/zmain.vim
View File

@ -107,6 +107,11 @@ function! s:FixLoclist(buffer, loclist)
endfunction endfunction
function! s:HandleExit(job) function! s:HandleExit(job)
if a:job == 'no process'
" Stop right away when the job is not valid in Vim 8.
return
endif
let job_id = s:GetJobID(a:job) let job_id = s:GetJobID(a:job)
if !has_key(s:job_info_map, job_id) if !has_key(s:job_info_map, job_id)
@ -192,18 +197,18 @@ function! s:ApplyLinter(buffer, linter)
if has('nvim') if has('nvim')
if a:linter.output_stream ==# 'stderr' if a:linter.output_stream ==# 'stderr'
" Read from stderr instead of stdout. " Read from stderr instead of stdout.
let a:linter.job = jobstart(command, { let job = jobstart(command, {
\ 'on_stderr': 's:GatherOutputNeoVim', \ 'on_stderr': 's:GatherOutputNeoVim',
\ 'on_exit': 's:HandleExitNeoVim', \ 'on_exit': 's:HandleExitNeoVim',
\}) \})
elseif a:linter.output_stream ==# 'both' elseif a:linter.output_stream ==# 'both'
let a:linter.job = jobstart(command, { let job = jobstart(command, {
\ 'on_stdout': 's:GatherOutputNeoVim', \ 'on_stdout': 's:GatherOutputNeoVim',
\ 'on_stderr': 's:GatherOutputNeoVim', \ 'on_stderr': 's:GatherOutputNeoVim',
\ 'on_exit': 's:HandleExitNeoVim', \ 'on_exit': 's:HandleExitNeoVim',
\}) \})
else else
let a:linter.job = jobstart(command, { let job = jobstart(command, {
\ 'on_stdout': 's:GatherOutputNeoVim', \ 'on_stdout': 's:GatherOutputNeoVim',
\ 'on_exit': 's:HandleExitNeoVim', \ 'on_exit': 's:HandleExitNeoVim',
\}) \})
@ -236,20 +241,25 @@ function! s:ApplyLinter(buffer, linter)
endif endif
" Vim 8 will read the stdin from the file's buffer. " Vim 8 will read the stdin from the file's buffer.
let a:linter.job = job_start(l:command, l:job_options) let job = job_start(l:command, l:job_options)
endif endif
" Store the ID for the job in the map to read back again. " Sometimes the job can be failed to be created at all in Vim 8.
let s:job_info_map[s:GetJobID(a:linter.job)] = { if job != 'no process'
\ 'linter': a:linter, let a:linter.job = job
\ 'buffer': a:buffer,
\ 'output': [],
\}
if has('nvim') " Store the ID for the job in the map to read back again.
" For NeoVim, we have to send the text in the buffer to the command. let s:job_info_map[s:GetJobID(job)] = {
call jobsend(a:linter.job, join(getline(1, '$'), "\n") . "\n") \ 'linter': a:linter,
call jobclose(a:linter.job, 'stdin') \ 'buffer': a:buffer,
\ 'output': [],
\}
if has('nvim')
" For NeoVim, we have to send the text in the buffer to the command.
call jobsend(a:linter.job, join(getline(1, '$'), "\n") . "\n")
call jobclose(a:linter.job, 'stdin')
endif
endif endif
endfunction endfunction