Updated plugins

sources_non_forked/vim-go/autoload/go/coverage.vim

@@ -48,12 +48,13 @@ function! go#coverage#Buffer(bang, ...) abort
     call go#util#EchoProgress("testing...")
   endif
 
-  if go#util#has_job()
+  if go#util#has_job() || has('nvim')
     call s:coverage_job({
           \ 'cmd': ['go', 'test', '-tags', go#config#BuildTags(), '-coverprofile', l:tmpname] + a:000,
           \ 'complete': function('s:coverage_callback', [l:tmpname]),
           \ 'bang': a:bang,
           \ 'for': 'GoTest',
+          \ 'statustype': 'coverage',
           \ })
     return
   endif
@@ -63,24 +64,8 @@ function! go#coverage#Buffer(bang, ...) abort
     call extend(args, a:000)
   endif
 
-  let disabled_term = 0
-  if go#config#TermEnabled()
-    let disabled_term = 1
-    call go#config#SetTermEnabled(0)
-  endif
-
   let id = call('go#test#Test', args)
 
-  if disabled_term
-    call go#config#SetTermEnabled(1)
-  endif
-
-  if has('nvim')
-    call go#jobcontrol#AddHandler(function('s:coverage_handler'))
-    let s:coverage_handler_jobs[id] = l:tmpname
-    return
-  endif
-
   if go#util#ShellError() == 0
     call go#coverage#overlay(l:tmpname)
   endif
@@ -104,7 +89,7 @@ endfunction
 " a new HTML coverage page from that profile in a new browser
 function! go#coverage#Browser(bang, ...) abort
   let l:tmpname = tempname()
-  if go#util#has_job()
+  if go#util#has_job() || has('nvim')
     call s:coverage_job({
           \ 'cmd': ['go', 'test', '-tags', go#config#BuildTags(), '-coverprofile', l:tmpname],
           \ 'complete': function('s:coverage_browser_callback', [l:tmpname]),
@@ -120,11 +105,6 @@ function! go#coverage#Browser(bang, ...) abort
   endif
 
   let id = call('go#test#Test', args)
-  if has('nvim')
-    call go#jobcontrol#AddHandler(function('s:coverage_browser_handler'))
-    let s:coverage_browser_handler_jobs[id] = l:tmpname
-    return
-  endif
 
   if go#util#ShellError() == 0
     call go#tool#ExecuteInDir(['go', 'tool', 'cover', '-html=' . l:tmpname])
@@ -275,48 +255,17 @@ function s:coverage_job(args)
   " autowrite is not enabled for jobs
   call go#cmd#autowrite()
 
-  let status_dir =  expand('%:p:h')
-  let Complete = a:args.complete
-  function! s:complete(job, exit_status, data) closure
-    let status = {
-          \ 'desc': 'last status',
-          \ 'type': "coverage",
-          \ 'state': "finished",
-          \ }
+  let disabled_term = 0
+  if go#config#TermEnabled()
+    let disabled_term = 1
+    call go#config#SetTermEnabled(0)
+  endif
 
-    if a:exit_status
-      let status.state = "failed"
-    endif
+  call go#job#Spawn(a:args.cmd, a:args)
 
-    call go#statusline#Update(status_dir, status)
-    return Complete(a:job, a:exit_status, a:data)
-  endfunction
-
-  let a:args.complete = funcref('s:complete')
-  let callbacks = go#job#Spawn(a:args)
-
-  let start_options = {
-        \ 'callback': callbacks.callback,
-        \ 'exit_cb': callbacks.exit_cb,
-        \ 'close_cb': callbacks.close_cb,
-        \ }
-
-  " pre start
-  let dir = getcwd()
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let jobdir = fnameescape(expand("%:p:h"))
-  execute cd . jobdir
-
-  call go#statusline#Update(status_dir, {
-        \ 'desc': "current status",
-        \ 'type': "coverage",
-        \ 'state': "started",
-        \})
-
-  call job_start(a:args.cmd, start_options)
-
-  " post start
-  execute cd . fnameescape(dir)
+  if disabled_term
+    call go#config#SetTermEnabled(1)
+  endif
 endfunction
 
 " coverage_callback is called when the coverage execution is finished
@@ -336,39 +285,4 @@ function! s:coverage_browser_callback(coverfile, job, exit_status, data)
   call delete(a:coverfile)
 endfunction
 
-" -----------------------
-" | Neovim job handlers |
-" -----------------------
-
-let s:coverage_handler_jobs = {}
-let s:coverage_browser_handler_jobs = {}
-
-function! s:coverage_handler(job, exit_status, data) abort
-  if !has_key(s:coverage_handler_jobs, a:job.id)
-    return
-  endif
-  let l:tmpname = s:coverage_handler_jobs[a:job.id]
-  if a:exit_status == 0
-    call go#coverage#overlay(l:tmpname)
-  endif
-
-  call delete(l:tmpname)
-  unlet s:coverage_handler_jobs[a:job.id]
-endfunction
-
-function! s:coverage_browser_handler(job, exit_status, data) abort
-  if !has_key(s:coverage_browser_handler_jobs, a:job.id)
-    return
-  endif
-
-  let l:tmpname = s:coverage_browser_handler_jobs[a:job.id]
-  if a:exit_status == 0
-    call go#tool#ExecuteInDir(['go', 'tool', 'cover', '-html=' . l:tmpname])
-  endif
-
-  call delete(l:tmpname)
-  unlet s:coverage_browser_handler_jobs[a:job.id]
-endfunction
-
-
 " vim: sw=2 ts=2 et