aboutsummaryrefslogtreecommitdiff
path: root/runtime/autoload/provider/pythonx.vim
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2017-11-27 11:06:43 +0100
committerBjörn Linse <bjorn.linse@gmail.com>2017-11-27 11:07:49 +0100
commitdf019cebd59a456d6f7dc5948703fdd2059c4b04 (patch)
tree1e49476224e41237250bff1bf2ff00d744a3d55c /runtime/autoload/provider/pythonx.vim
parenta043899ba255524b7421579b9bd6112801f09247 (diff)
downloadrneovim-df019cebd59a456d6f7dc5948703fdd2059c4b04.tar.gz
rneovim-df019cebd59a456d6f7dc5948703fdd2059c4b04.tar.bz2
rneovim-df019cebd59a456d6f7dc5948703fdd2059c4b04.zip
Revert "provider: delete vimL stderr collector, now that it exists builtin"
This change exposed a memory issue with buffered channels, possibly involving GC. Revert until it has been fixed. This reverts commit 0de019b6a65c6dd5141b7e002343df3689065ce7.
Diffstat (limited to 'runtime/autoload/provider/pythonx.vim')
-rw-r--r--runtime/autoload/provider/pythonx.vim9
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index 1c77eabe23..7285ed43ea 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -5,7 +5,7 @@ endif
let s:loaded_pythonx_provider = 1
-let s:job_opts = {'rpc': v:true, 'stderr_buffered': v:true}
+let s:job_opts = {'rpc': v:true, 'on_stderr': function('provider#stderr_collector')}
function! provider#pythonx#Require(host) abort
let ver = (a:host.orig_name ==# 'python') ? 2 : 3
@@ -21,17 +21,18 @@ function! provider#pythonx#Require(host) abort
endfor
try
- let job = copy(s:job_opts)
- let channel_id = jobstart(args, job)
+ let channel_id = jobstart(args, s:job_opts)
if rpcrequest(channel_id, 'poll') ==# 'ok'
return channel_id
endif
catch
echomsg v:throwpoint
echomsg v:exception
- for row in job.stderr
+ for row in provider#get_stderr(channel_id)
echomsg row
endfor
+ finally
+ call provider#clear_stderr(channel_id)
endtry
throw remote#host#LoadErrorForHost(a:host.orig_name,
\ '$NVIM_PYTHON_LOG_FILE')