Fix autocomplete

thestrukture · Jul 18, 2022 · 7131ee7 · 7131ee7
1 parent 203ccb9
commit 7131ee7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 154 deletions.
diff --git a/api/handlers/rest_ApiComplete.go b/api/handlers/rest_ApiComplete.go
@@ -13,95 +13,32 @@ import (
 	"github.com/cheikhshift/gos/core"
 	"github.com/gorilla/sessions"
 	"github.com/thestrukture/IDE/api/globals"
-	"gopkg.in/mgo.v2/bson"
 )
 
 //
 func ApiComplete(w http.ResponseWriter, r *http.Request, session *sessions.Session) (response string, callmet bool) {
 
 	prefx := r.FormValue("pref")
 
-	ret := []bson.M{}
-	//return {name: ea.word, value: ea.insert, score: 0, meta: ea.meta}
-	gxml := os.ExpandEnv("$GOPATH") + "/src/" + r.FormValue("pkg") + "/gos.gxml"
+	content := r.FormValue("content")
+	id := r.FormValue("id")
+	tempFile := filepath.Join(globals.AutocompletePath, id)
 
-	if _, err := os.Stat(gxml); !os.IsNotExist(err) && r.FormValue("gocode") == "" {
-		gos, _ := core.PLoadGos(gxml)
-		score := 0
-		for _, v := range gos.Variables {
+	ioutil.WriteFile(tempFile, []byte(content), 0700)
+	cms := "gocode"
 
-			if strings.Contains(v.Name, prefx) {
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": v.Name, "score": score, "meta": "Global variable | " + v.Type})
-			}
-
-		}
-
-		for _, v := range gos.RootImports {
-
-			if strings.Contains(v.Src, prefx) {
-				score = score + 1
-				paths := strings.Split(v.Src, "/")
-				ret = append(ret, bson.M{"name": v.Src, "value": paths[len(paths)-1], "score": score, "meta": "package"})
-			}
-
-		}
-
-		for _, v := range gos.Header.Structs {
-
-			if strings.Contains(v.Name, prefx) {
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": v.Name, "score": score, "meta": "Interface"})
-			}
-
-		}
-
-		for _, v := range gos.Header.Objects {
-
-			if strings.Contains(v.Name, prefx) {
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": v.Name, "score": score, "meta": "{{Interface func group}}"})
-			}
-
-		}
-
-		for _, v := range gos.Methods.Methods {
-
-			if strings.Contains(v.Name, prefx) {
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": v.Name + " ", "score": score, "meta": "{{Template pipeline}}"})
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": "net" + v.Name + "(" + v.Variables + ")", "score": score, "meta": "Pipeline go function."})
-			}
-
-		}
-
-		for _, v := range gos.Templates.Templates {
-
-			if strings.Contains(v.Name, prefx) {
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": v.Name + " ", "score": score, "meta": "{{Template $struct}}"})
-				score = score + 1
-				ret = append(ret, bson.M{"name": v.Name, "value": "netb" + v.Name + "(" + v.Struct + "{})", "score": score, "meta": "Template build go function."})
-			}
-
-		}
-
-		response = mResponse(ret)
-	} else {
-		content := r.FormValue("content")
-		id := r.FormValue("id")
-		tempFile := filepath.Join(globals.AutocompletePath, id)
+	if globals.Windows {
+		cms = strings.Replace(os.ExpandEnv("$GOPATH")+"\\bin\\gocode.exe", "/", "\\", -1)
+	}
 
-		ioutil.WriteFile(tempFile, []byte(content), 0700)
-		cmd := fmt.Sprintf("gocode -f=json --in=%s autocomplete %s", tempFile, prefx)
+	cmd := fmt.Sprintf(cms+" -f=json --in=%s autocomplete %s", tempFile, prefx)
 
-		res, _ := core.RunCmdSmart(cmd)
-		response = res
+	res, err := core.RunCmdSmart(cmd)
+	response = res
 
-		os.Remove(tempFile)
+
 
-	}
+	os.Remove(tempFile)
 
 	callmet = true
 	return

diff --git a/gos.gxml b/gos.gxml
@@ -2341,89 +2341,27 @@ for _, v := range apps {
 
 				prefx := r.FormValue("pref")
 
+
+				content := r.FormValue("content")
+				id := r.FormValue("id")
+				tempFile := filepath.Join(autocompletePath, id)
 
-				ret := []bson.M{}
-					//return {name: ea.word, value: ea.insert, score: 0, meta: ea.meta}
-				gxml := os.ExpandEnv("$GOPATH") + "/src/" +  r.FormValue("pkg") + "/gos.gxml"
-
-				if _, err := os.Stat(gxml); !os.IsNotExist(err) && r.FormValue("gocode") == ""  {
-					gos,_ := core.PLoadGos(gxml)
-					score := 0
-					for _,v := range gos.Variables {
-
-						if strings.Contains(v.Name, prefx){
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":v.Name,"score":score,"meta":"Global variable | " + v.Type})
-						}
-
-					}
-
-					for _,v := range gos.RootImports {
-
-						if strings.Contains(v.Src, prefx){
-							score = score + 1
-							paths := strings.Split(v.Src,"/")
-							ret = append(ret, bson.M{"name":v.Src,"value":paths[len(paths) - 1],"score":score,"meta":"package"})
-						}
-
-					}
-
-					for _,v := range gos.Header.Structs {
-
-						if strings.Contains(v.Name, prefx){
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":v.Name ,"score":score,"meta":"Interface"})
-						}
-
-					}
-
-					for _,v := range gos.Header.Objects {
-
-						if strings.Contains(v.Name, prefx){
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":v.Name ,"score":score,"meta":"{{Interface func group}}"})
-						}				
-
-					}
-
-					for _,v := range gos.Methods.Methods {
-
-						if strings.Contains(v.Name, prefx){
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":v.Name + " ","score":score,"meta":"{{Template pipeline}}"})
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":"net_" + v.Name + "(" + v.Variables +")","score":score,"meta":"Pipeline go function."})
-						}		
-
-					}
-
-					for _,v := range gos.Templates.Templates {
-
-						if strings.Contains(v.Name, prefx){
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":v.Name + " ","score":score,"meta":"{{Template $struct}}"})
-							score = score + 1
-							ret = append(ret, bson.M{"name":v.Name,"value":"net_b" + v.Name + "(" + v.Struct +"{})","score":score,"meta":"Template build go function."})
-						}	
+				ioutil.WriteFile(tempFile, []byte(content), 0700)
+				cms := "gocode"
 
-					}
-
-					response = mResponse(ret)
-				} else {
-					content := r.FormValue("content")
-					id := r.FormValue("id")
-					tempFile := filepath.Join(autocompletePath, id)
+				if Windows {
+					cms = strings.Replace(os.ExpandEnv("$GOPATH")+"\\bin\\gocode.exe", "/", "\\", -1)
+
+				}
 
-					ioutil.WriteFile(tempFile, []byte(content), 0700)
-					cmd := fmt.Sprintf("gocode -f=json --in=%s autocomplete %s", tempFile ,prefx)
+				cmd := fmt.Sprintf( cms + " -f=json --in=%s autocomplete %s", tempFile ,prefx)
 
-					res, _ := core.RunCmdSmart(cmd)
-					response = res
-
-					os.Remove(tempFile)
-
-				}
+				res, err := core.RunCmdSmart(cmd)
+				response = res
 
+
+
+				os.Remove(tempFile)
 
 				</end>