Add provider#Poll() to handle starting and polling the provider

4 files changed, 24 insertions, 50 deletions

diff --git a/runtime/autoload/provider.vim b/runtime/autoload/provider.vim
new file mode 100644
index 0000000000..dc24e801d0
--- /dev/null
+++ b/runtime/autoload/provider.vim
@@ -0,0 +1,21 @@
+" Common functions for providers
+
+" Start the provider and perform a 'poll' request
+"
+" Returns a valid channel on success
+function! provider#Poll(argv, orig_name, log_env) abort
+  let job = {'rpc': v:true, 'stderr_buffered': v:true}
+  try
+    let channel_id = jobstart(a:argv, job)
+    if channel_id > 0 && rpcrequest(channel_id, 'poll') ==# 'ok'
+      return channel_id
+    endif
+  catch
+    echomsg v:throwpoint
+    echomsg v:exception
+    for row in get(job, 'stderr', [])
+      echomsg row
+    endfor
+  endtry
+  throw remote#host#LoadErrorForHost(a:orig_name, a:log_env)
+endfunction
diff --git a/runtime/autoload/provider/node.vim b/runtime/autoload/provider/node.vim
index 493eecf433..ae6f84de72 100644
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -3,8 +3,6 @@ if exists('g:loaded_node_provider')
 endif
 let g:loaded_node_provider = 1
 
-let s:job_opts = {'rpc': v:true, 'stderr_buffered': v:true}
-
 function! s:is_minimum_version(version, min_major, min_minor) abort
   if empty(a:version)
     let nodejs_version = get(split(system(['node', '-v']), "\n"), 0, '')
@@ -72,21 +70,7 @@ function! provider#node#Require(host) abort
 
   call add(args, provider#node#Prog())
 
-  try
-    let job = copy(s:job_opts)
-    let channel_id = jobstart(args, job)
-    if rpcrequest(channel_id, 'poll') ==# 'ok'
-      return channel_id
-    endif
-  catch
-    echomsg v:throwpoint
-    echomsg v:exception
-    for row in get(job, 'stderr', [])
-      echomsg row
-    endfor
-  endtry
-  endtry
-  throw remote#host#LoadErrorForHost(a:host.orig_name, '$NVIM_NODE_LOG_FILE')
+  return provider#Poll(args, a:host.orig_name, '$NVIM_NODE_LOG_FILE')
 endfunction
 
 function! provider#node#Call(method, args) abort
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index f9aa09b16b..b51c398410 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -5,8 +5,6 @@ endif
 
 let s:loaded_pythonx_provider = 1
 
-let s:job_opts = {'rpc': v:true, 'stderr_buffered': v:true}
-
 function! provider#pythonx#Require(host) abort
   let ver = (a:host.orig_name ==# 'python') ? 2 : 3
 
@@ -20,21 +18,7 @@ function! provider#pythonx#Require(host) abort
     call add(args, plugin.path)
   endfor
 
-  try
-    let job = copy(s:job_opts)
-    let channel_id = jobstart(args, job)
-    if rpcrequest(channel_id, 'poll') ==# 'ok'
-      return channel_id
-    endif
-  catch
-    echomsg v:throwpoint
-    echomsg v:exception
-    for row in get(job, 'stderr', [])
-      echomsg row
-    endfor
-  endtry
-  throw remote#host#LoadErrorForHost(a:host.orig_name,
-        \ '$NVIM_PYTHON_LOG_FILE')
+  return provider#Poll(args, a:host.orig_name, '$NVIM_PYTHON_LOG_FILE')
 endfunction
 
 function! provider#pythonx#Detect(major_ver) abort
diff --git a/runtime/autoload/provider/ruby.vim b/runtime/autoload/provider/ruby.vim
index 3d1f7a4138..2fe3817512 100644
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -4,8 +4,6 @@ if exists('g:loaded_ruby_provider')
 endif
 let g:loaded_ruby_provider = 1
 
-let s:job_opts = {'rpc': v:true, 'stderr_buffered': v:true}
-
 function! provider#ruby#Detect() abort
   if exists("g:ruby_host_prog")
     return g:ruby_host_prog
@@ -26,20 +24,7 @@ function! provider#ruby#Require(host) abort
     let prog .= " " . shellescape(plugin.path)
   endfor
 
-  try
-    let job = copy(s:job_opts)
-    let channel_id = jobstart(prog, job)
-    if rpcrequest(channel_id, 'poll') ==# 'ok'
-      return channel_id
-    endif
-  catch
-    echomsg v:throwpoint
-    echomsg v:exception
-    for row in get(job, 'stderr', [])
-      echomsg row
-    endfor
-  endtry
-  throw remote#host#LoadErrorForHost(a:host.orig_name, '$NVIM_RUBY_LOG_FILE')
+  return provider#Poll(prog, a:host.orig_name, '$NVIM_RUBY_LOG_FILE')
 endfunction
 
 function! provider#ruby#Call(method, args) abort