separate "go env ROOT"

vim-jp · Jul 16, 2016 · b1ab840 · b1ab840
1 parent 522fc49
commit b1ab840
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/autoload/go/complete.vim b/autoload/go/complete.vim
@@ -55,14 +55,7 @@ function! go#complete#Package(ArgLead, CmdLine, CursorPos)
     return go#complete#PackageMembers(words[1], words[2])
   endif
 
-  if executable('go')
-    let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
-    if v:shell_error
-      echomsg '''go env GOROOT'' failed'
-    endif
-  else
-    let goroot = $GOROOT
-  endif
+  let goroot = go#env#root()
 
   if len(goroot) != 0 && isdirectory(goroot)
     let dirs += [goroot]

diff --git a/autoload/go/env.vim b/autoload/go/env.vim
@@ -0,0 +1,11 @@
+function! go#env#root()
+  if executable('go')
+    let root = substitute(system('go env GOROOT'), '\n', '', 'g')
+    if v:shell_error
+      echomsg '''go env GOROOT'' failed'
+    endif
+  else
+    let root = $GOROOT
+  endif
+  return root
+endfunction