From 8bc1936de81a69423cc76c9c3ed1f192759bba95 Mon Sep 17 00:00:00 2001
From: Liang Ding <DL88250@gmail.com>
Date: Thu, 4 Sep 2014 23:09:51 +0800
Subject: [PATCH] #30

---
 editor/editors.go | 51 ++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/editor/editors.go b/editor/editors.go
index ed5ac38..dfc40fb 100644
--- a/editor/editors.go
+++ b/editor/editors.go
@@ -12,6 +12,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 )
@@ -150,12 +151,31 @@ func AutocompleteHandler(w http.ResponseWriter, r *http.Request) {
 
 	// glog.Infof("offset: %d", offset)
 
-	argv := []string{"-f=json", "autocomplete", strconv.Itoa(offset)}
+	userRepos := strings.Replace(conf.Wide.UserRepos, "{user}", username, -1)
+	userWorkspace := userRepos[:strings.LastIndex(userRepos, "/src")]
+	userWorkspace = filepath.FromSlash(userWorkspace)
+	//glog.Infof("User [%s] workspace [%s]", username, userWorkspace)
+	userLib := userWorkspace + string(os.PathSeparator) + "pkg" + string(os.PathSeparator) +
+		runtime.GOOS + "_" + runtime.GOARCH
 
-	cmd := exec.Command("gocode", argv...)
+	masterWorkspace := conf.Wide.Repos[:strings.LastIndex(conf.Wide.Repos, "/src")]
+	masterWorkspace = filepath.FromSlash(masterWorkspace)
+	//glog.Infof("Master workspace [%s]", masterWorkspace)
+	masterLib := masterWorkspace + string(os.PathSeparator) + "pkg" + string(os.PathSeparator) +
+		runtime.GOOS + "_" + runtime.GOARCH
 
-	// 设置环境变量（设置当前用户的 GOPATH 等）
-	setCmdEnv(cmd, username)
+	libPath := userLib + string(os.PathListSeparator) + masterLib
+	//glog.Infof("gocode set lib-path %s", libPath)
+
+	argv := []string{"set", "lib-path", libPath}
+	exec.Command("gocode", argv...).Start()
+
+	//argv = []string{"set", "autobuild", "true"}
+	//cmd := exec.Command("gocode", argv...)
+	//cmd.Start()
+
+	argv = []string{"-f=json", "autocomplete", strconv.Itoa(offset)}
+	cmd = exec.Command("gocode", argv...)
 
 	stdin, _ := cmd.StdinPipe()
 	stdin.Write([]byte(code))
@@ -184,26 +204,3 @@ func getCursorOffset(code string, line, ch int) (offset int) {
 
 	return
 }
-
-func setCmdEnv(cmd *exec.Cmd, username string) {
-	userRepos := strings.Replace(conf.Wide.UserRepos, "{user}", username, -1)
-	userWorkspace := userRepos[:strings.LastIndex(userRepos, "/src")]
-	userWorkspace = filepath.FromSlash(userWorkspace)
-	glog.Infof("User [%s] workspace [%s]", username, userWorkspace)
-
-	masterWorkspace := conf.Wide.Repos[:strings.LastIndex(conf.Wide.Repos, "/src")]
-	masterWorkspace = filepath.FromSlash(masterWorkspace)
-	glog.Infof("Master workspace [%s]", masterWorkspace)
-
-	GOPATH := os.Getenv("GOPATH")
-	glog.Infof("Env GOPATH [%s]", GOPATH)
-
-	// FIXME: 这个地方和 gocode 取环境变量有冲突，估计需要修改 gocode
-
-	//cmd.Env = append(cmd.Env,
-	//	"GOPATH="+GOPATH+string(os.PathListSeparator)+
-	//		userWorkspace+string(os.PathListSeparator)+
-	//		masterWorkspace,
-	//	"GOROOT="+os.Getenv("GOROOT"),
-	//	"PATH="+os.Getenv("PATH"))
-}