featWASM Compiler: get struct field & method into completion item.

tools/compiler/internal/ast.go

@@ -202,3 +202,22 @@ func getCodeFunctionList(file *ast.File) (funcList, error) {
 
 	return fv.funcList, nil
 }
+
+type selectorExprVisitor struct {
+	selectorExprList []*ast.SelectorExpr
+}
+
+func (v *selectorExprVisitor) Visit(node ast.Node) ast.Visitor {
+	if selectorExpr, ok := node.(*ast.SelectorExpr); ok {
+		v.selectorExprList = append(v.selectorExprList, selectorExpr)
+	}
+	return v
+}
+
+func getCodeSelectorExprList(file *ast.File) ([]*ast.SelectorExpr, error) {
+	sv := &selectorExprVisitor{}
+
+	ast.Walk(sv, file)
+
+	return sv.selectorExprList, nil
+}

tools/compiler/internal/base.go

@@ -150,9 +150,7 @@ func GetCompletions(fileName string, fileMap map[string]string, line, column int
 	if err != nil {
 		fmt.Println("Internal error: ", err)
 	}
-	items := goKeywords
-	items = append(items, list...)
-	return items, nil
+	return list, nil
 }
 
 func GetTokenDetail(token, pkgPath string) (interface{}, error) {

tools/compiler/internal/completion.go

@@ -192,6 +192,15 @@ func getScopesItems(fileName string, fileMap map[string]string, line, column int
 	}
 
 	items := &completionList{}
+	selector, find := getSelector(file, cursorPos)
+	if find {
+		selectorInfoGetter(info, selector, items)
+		if items != nil {
+			return *items, nil
+		}
+	}
+
+	*items = goKeywords
 
 	smallScopes := findSmallestScopesAtPosition(info, cursorPos, fset)
 	for _, scope := range smallScopes {
@@ -201,6 +210,37 @@ func getScopesItems(fileName string, fileMap map[string]string, line, column int
 	return *items, nil
 }
 
+func selectorInfoGetter(info *typesutil.Info, selectorExpr *ast.SelectorExpr, items *completionList) {
+	if childSelectorExpr, ok := selectorExpr.X.(*ast.SelectorExpr); ok {
+		ident := childSelectorExpr.Sel
+		obj := info.Uses[ident]
+		if obj == nil {
+			return
+		}
+		handleStruct(obj.Type(), obj.Name(), items)
+	} else if ident, ok := selectorExpr.X.(*ast.Ident); ok {
+		obj := info.Uses[ident]
+		if obj == nil {
+			return
+		}
+		handleStruct(obj.Type(), obj.Name(), items)
+	}
+}
+
+func getSelector(file *ast.File, cursorPos token.Pos) (*ast.SelectorExpr, bool) {
+	list, _ := getCodeSelectorExprList(file)
+	for _, node := range list {
+		if checkPositionInRange(cursorPos, node.Pos(), node.End()) {
+			return node, true
+		}
+	}
+	return nil, false
+}
+
+func checkPositionInRange(pos, from, end token.Pos) bool {
+	return pos > from && pos < end
+}
+
 func findSmallestScopesAtPosition(info *typesutil.Info, pos token.Pos, fset *token.FileSet) []*types.Scope {
 	var scopeList []*types.Scope
 	var smallList []*types.Scope
@@ -274,10 +314,7 @@ func handleStruct(T types.Type, name string, items *completionList) {
 		if stru.Field(i).Embedded() {
 			handleStruct(stru.Field(i).Type(), name, items)
 		}
-		if stru.Field(i).Exported() {
-			addCompletionItem(stru.Field(i), name, items)
-		}
-		if stru.Field(i).Pkg().Path() == PKG {
+		if stru.Field(i).Exported() || stru.Field(i).Pkg().Path() == PKG {
 			addCompletionItem(stru.Field(i), stru.Field(i).Name(), items)
 		}
 	}