Merge pull request #909 from fatih/fix-go-test-compile

cmd: fix :GoTestCompile leaving behind artifacts

autoload/go/cmd.vim

@@ -188,8 +188,7 @@ endfunction
 function! go#cmd#Test(bang, compile, ...)
     let args = ["test"]
 
-    " don't run the test, only compile it. Useful to capture and fix errors or
-    " to create a test binary.
+    " don't run the test, only compile it. Useful to capture and fix errors.
     if a:compile
         let compile_file = "vim-go-test-compile"
         call extend(args, ["-c", "-o", compile_file])
@@ -233,25 +232,21 @@ function! go#cmd#Test(bang, compile, ...)
     redraw
 
     let command = "go " . join(args, ' ')
-
     let out = go#tool#ExecuteInDir(command)
 
     let l:listtype = "quickfix"
 
+    let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+    let dir = getcwd()
+    execute cd fnameescape(expand("%:p:h"))
+
     if a:compile
         call delete(compile_file)
     endif
 
     if go#util#ShellError() != 0
-        let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-        let dir = getcwd()
-        try
-            execute cd fnameescape(expand("%:p:h"))
-            let errors = go#tool#ParseErrors(split(out, '\n'))
-            let errors = go#tool#FilterValids(errors)
-        finally
-            execute cd . fnameescape(dir)
-        endtry
+        let errors = go#tool#ParseErrors(split(out, '\n'))
+        let errors = go#tool#FilterValids(errors)
 
         call go#list#Populate(l:listtype, errors)
         call go#list#Window(l:listtype, len(errors))
@@ -272,6 +267,7 @@ function! go#cmd#Test(bang, compile, ...)
             echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
         endif
     endif
+    execute cd . fnameescape(dir)
 endfunction
 
 " Testfunc runs a single test that surrounds the current cursor position.

autoload/go/jobcontrol.vim

@@ -115,6 +115,11 @@ endfunction
 " it'll be closed.
 function! s:on_exit(job_id, exit_status)
   let std_combined = self.stderr + self.stdout
+
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+  let dir = getcwd()
+  execute cd self.dir
+
   call s:callback_handlers_on_exit(s:jobs[a:job_id], a:exit_status, std_combined)
 
   if a:exit_status == 0
@@ -123,21 +128,18 @@ function! s:on_exit(job_id, exit_status)
 
     let self.state = "SUCCESS"
     call go#util#EchoSuccess("SUCCESS")
+
+    execute cd . fnameescape(dir)
     return
   endif
 
   let self.state = "FAILED"
   call go#util#EchoError("FAILED")
 
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  try
-    execute cd self.dir
-    let errors = go#tool#ParseErrors(std_combined)
-    let errors = go#tool#FilterValids(errors)
-  finally
-    execute cd . fnameescape(dir)
-  endtry
+  let errors = go#tool#ParseErrors(std_combined)
+  let errors = go#tool#FilterValids(errors)
+
+  execute cd . fnameescape(dir)
 
   if !len(errors)
     " failed to parse errors, output the original content