Merge pull request #702 from nhooyr/efficient-goroot

go#package#Paths more efficient at getting GOROOT
fatih · Jan 28, 2016 · a1cfa11 · a1cfa11
2 parents 4c485a2 + a8d44df
commit a1cfa11
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/autoload/go/package.vim b/autoload/go/package.vim
@@ -31,17 +31,19 @@ endif
 function! go#package#Paths()
     let dirs = []
 
-    if executable('go')
-        let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
-        if v:shell_error
-            echomsg '''go env GOROOT'' failed'
+    if !exists("s:goroot")
+        if executable('go')
+            let s:goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
+            if v:shell_error
+                echomsg '''go env GOROOT'' failed'
+            endif
+        else
+            let s:goroot = $GOROOT
         endif
-    else
-        let goroot = $GOROOT
     endif
 
-    if len(goroot) != 0 && isdirectory(goroot)
-        let dirs += [goroot]
+    if len(s:goroot) != 0 && isdirectory(s:goroot)
+        let dirs += [s:goroot]
     endif
 
     let workspaces = split($GOPATH, go#util#PathListSep())