Properly use exepath for CheckBinPath

fatih#823 added this the wrong way, it was reverted back on 9f0cf00 but still not achieving the right functionality. This uses it properly now, also adding it to how we lookup goimports for srcdir support.
luan · May 20, 2016 · 1a44e8f · 1a44e8f
1 parent d54819d
commit 1a44e8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/autoload/go/fmt.vim b/autoload/go/fmt.vim
@@ -115,7 +115,9 @@ function! go#fmt#Format(withGoimport)
 
     if fmt_command == "goimports"
         if !exists('b:goimports_vendor_compatible')
-            let out = go#util#System("goimports --help")
+            let binpath = go#path#CheckBinPath("goimports")
+            echom binpath
+            let out = go#util#System(binpath . " --help")
             if out !~ "-srcdir"
                 echohl WarningMsg
                 echomsg "vim-go: goimports does not support srcdir."

diff --git a/autoload/go/path.vim b/autoload/go/path.vim
@@ -151,6 +151,7 @@ function! go#path#CheckBinPath(binpath)
 
     " if it's in PATH just return it
     if executable(binpath)
+        let binpath = exepath(binpath)
         let $PATH = old_path
         return binpath
     endif