Merge pull request #2150 from ldelossa/godef-in-path

Run godef from buffer path
fatih · Feb 22, 2019 · bf951d9 · bf951d9
2 parents c860f7c + b83f4c2
commit bf951d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/autoload/go/def.vim b/autoload/go/def.vim
@@ -22,9 +22,9 @@ function! go#def#Jump(mode) abort
     if &modified
       let l:stdin_content = join(go#util#GetLines(), "\n")
       call add(l:cmd, "-i")
-      let [l:out, l:err] = go#util#Exec(l:cmd, l:stdin_content)
+      let [l:out, l:err] = go#tool#ExecuteInDir(l:cmd, l:stdin_content)
     else
-      let [l:out, l:err] = go#util#Exec(l:cmd)
+      let [l:out, l:err] = go#util#ExecuteInDir(l:cmd)
     endif
   elseif bin_name == 'guru'
     let cmd = [go#path#CheckBinPath(bin_name)]

diff --git a/autoload/go/tool.vim b/autoload/go/tool.vim
@@ -166,7 +166,7 @@ function! go#tool#FilterValids(items) abort
   return filtered
 endfunction
 
-function! go#tool#ExecuteInDir(cmd) abort
+function! go#tool#ExecuteInDir(cmd, ...) abort
   if !isdirectory(expand("%:p:h"))
     return ['', 1]
   endif
@@ -175,7 +175,7 @@ function! go#tool#ExecuteInDir(cmd) abort
   let dir = getcwd()
   try
     execute cd . fnameescape(expand("%:p:h"))
-    let [l:out, l:err] = go#util#Exec(a:cmd)
+    let [l:out, l:err] = call('go#util#Exec', [a:cmd] + a:000)
   finally
     execute cd . fnameescape(l:dir)
   endtry