Merge pull request #1948 from bhcleek/homogenize-async-progress

Homogenize async progress

Author: bhcleek

autoload/go/cmd.vim

@@ -32,10 +32,6 @@ function! go#cmd#Build(bang, ...) abort
 
   " Vim and Neovim async.
   if go#util#has_job() || has('nvim')
-    if go#config#EchoCommandInfo()
-      call go#util#EchoProgress("building dispatched ...")
-    endif
-
     call s:cmd_job({
           \ 'cmd': ['go'] + args,
           \ 'bang': a:bang,
@@ -196,10 +192,6 @@ function! go#cmd#Install(bang, ...) abort
     " expand all wildcards(i.e: '%' to the current file name)
     let goargs = map(copy(a:000), "expand(v:val)")
 
-    if go#config#EchoCommandInfo()
-      call go#util#EchoProgress("installing dispatched ...")
-    endif
-
     call s:cmd_job({
           \ 'cmd': ['go', 'install', '-tags', go#config#BuildTags()] + goargs,
           \ 'bang': a:bang,

autoload/go/coverage.vim

@@ -44,10 +44,6 @@ function! go#coverage#Buffer(bang, ...) abort
   let s:toggle = 1
   let l:tmpname = tempname()
 
-  if go#config#EchoCommandInfo()
-    call go#util#EchoProgress("testing...")
-  endif
-
   if go#util#has_job() || has('nvim')
     call s:coverage_job({
           \ 'cmd': ['go', 'test', '-tags', go#config#BuildTags(), '-coverprofile', l:tmpname] + a:000,
@@ -59,6 +55,10 @@ function! go#coverage#Buffer(bang, ...) abort
     return
   endif
 
+  if go#config#EchoCommandInfo()
+    call go#util#EchoProgress("testing...")
+  endif
+
   let args = [a:bang, 0, "-coverprofile", l:tmpname]
   if a:0
     call extend(args, a:000)
@@ -95,6 +95,7 @@ function! go#coverage#Browser(bang, ...) abort
           \ 'complete': function('s:coverage_browser_callback', [l:tmpname]),
           \ 'bang': a:bang,
           \ 'for': 'GoTest',
+          \ 'statustype': 'coverage',
           \ })
     return
   endif

autoload/go/def.vim

@@ -48,14 +48,13 @@ function! go#def#Jump(mode) abort
             \ 'cmd': cmd,
             \ 'complete': function('s:jump_to_declaration_cb', [a:mode, bin_name], l:state),
             \ 'for': '_',
+            \ 'statustype': 'searching declaration',
             \ }
 
       if &modified
         let l:spawn_args.input = stdin_content
       endif
 
-      call go#util#EchoProgress("searching declaration ...")
-
       call s:def_job(spawn_args, l:state)
       return
     endif

autoload/go/guru.vim

@@ -114,13 +114,6 @@ function! s:async_guru(args) abort
     return
   endif
 
-  if !has_key(a:args, 'disable_progress')
-    if a:args.needs_scope
-      call go#util#EchoProgress("analysing with scope " . result.scope .
-            \ " (see ':help go-guru-scope' if this doesn't work)...")
-    endif
-  endif
-
   let state = {
         \ 'mode': a:args.mode,
         \ 'parse' : get(a:args, 'custom_parse', funcref("s:parse_guru_output"))
@@ -141,6 +134,10 @@ function! s:async_guru(args) abort
         \ 'complete': state.complete,
         \ }
 
+  if has_key(a:args, 'disable_progress')
+    let opts.statustype = ''
+  endif
+
   let opts = go#job#Options(l:opts)
 
   if has_key(result, 'stdin_content')
@@ -151,6 +148,11 @@ function! s:async_guru(args) abort
   endif
 
   call go#job#Start(result.cmd, opts)
+
+  if a:args.needs_scope && go#config#EchoCommandInfo() && !has_key(a:args, 'disable_progress')
+    call go#util#EchoProgress("analysing with scope " . result.scope .
+          \ " (see ':help go-guru-scope' if this doesn't work)...")
+  endif
 endfunc
 
 " run_guru runs the given guru argument
@@ -315,18 +317,13 @@ function! go#guru#DescribeInfo(showstatus) abort
 
   let args = {
         \ 'mode': 'describe',
-        \ 'statustype': '',
         \ 'format': 'json',
         \ 'selected': -1,
         \ 'needs_scope': 0,
         \ 'custom_parse': function('s:info'),
         \ 'disable_progress': 1,
         \ }
 
-  if a:showstatus
-    let args.statustype = args.mode
-  endif
-
   call s:run_guru(args)
 endfunction
 
@@ -426,14 +423,13 @@ function! go#guru#SameIds(showstatus) abort
 
   let args = {
         \ 'mode': 'what',
-        \ 'statustype': '',
         \ 'format': 'json',
         \ 'selected': -1,
         \ 'needs_scope': 0,
         \ 'custom_parse': function('s:same_ids_highlight'),
         \ }
-  if a:showstatus
-    let args.statustype = args.mode
+  if !a:showstatus
+    let args.disable_progress = 1
   endif
 
   call s:run_guru(args)

autoload/go/job.vim

@@ -105,22 +105,19 @@ function! go#job#Options(args)
   endfunction
 
   function state.show_status(job, exit_status) dict
-    if go#config#EchoCommandInfo() && self.for != '_'
-      let prefix = ""
-      if self.statustype != ''
-        let prefix = '[' . self.statustype . '] '
-      endif
+    if self.statustype == ''
+      return
+    endif
+
+    if go#config#EchoCommandInfo()
+      let prefix = '[' . self.statustype . '] '
       if a:exit_status == 0
         call go#util#EchoSuccess(prefix . "SUCCESS")
       else
         call go#util#EchoError(prefix . "FAIL")
       endif
     endif
 
-    if self.statustype == ''
-      return
-    endif
-
     let status = {
           \ 'desc': 'last status',
           \ 'type': self.statustype,
@@ -146,6 +143,11 @@ function! go#job#Options(args)
   endif
 
   function! s:start(args) dict
+    if go#config#EchoCommandInfo()
+      let prefix = '[' . self.statustype . '] '
+      call go#util#EchoSuccess(prefix . "dispatched")
+    endif
+
     if self.statustype != ''
       let status = {
             \ 'desc': 'current status',

autoload/go/rename.vim

@@ -28,7 +28,6 @@ function! go#rename#Rename(bang, ...) abort
   let cmd = [bin_path, "-offset", offset, "-to", to_identifier, '-tags', go#config#BuildTags()]
 
   if go#util#has_job() || has('nvim')
-    call go#util#EchoProgress(printf("renaming to '%s' ...", to_identifier))
     call s:rename_job({
           \ 'cmd': cmd,
           \ 'bang': a:bang,

autoload/go/test.vim

@@ -26,14 +26,6 @@ function! go#test#Test(bang, compile, ...) abort
     call add(args, printf("-timeout=%s", timeout))
   endif
 
-  if go#config#EchoCommandInfo()
-    if a:compile
-      call go#util#EchoProgress("compiling tests ...")
-    else
-      call go#util#EchoProgress("testing...")
-    endif
-  endif
-
   if has('nvim') && go#config#TermEnabled()
     call go#term#new(a:bang, ["go"] + args)
   endif
@@ -55,6 +47,14 @@ function! go#test#Test(bang, compile, ...) abort
     return
   endif
 
+  if go#config#EchoCommandInfo()
+    if a:compile
+      call go#util#EchoProgress("compiling tests ...")
+    else
+      call go#util#EchoProgress("testing...")
+    endif
+  endif
+
   call go#cmd#autowrite()
   redraw