server: improve type report

Author: x1unix

pkg/analyzer/decl.go

@@ -10,7 +10,7 @@ func formatFieldAndType(t ast.Expr, id *ast.Ident) string {
 	return id.String() + " " + typeStr
 }
 
-func formatFuncParams(params *ast.FieldList) (string, int) {
+func formatFieldsList(params *ast.FieldList, joinChar string) (string, int) {
 	if params == nil {
 		return "", 0
 	}
@@ -30,7 +30,7 @@ func formatFuncParams(params *ast.FieldList) (string, int) {
 		}
 	}
 
-	return strings.Join(fieldTypePair, ", "), paramsLen
+	return strings.Join(fieldTypePair, joinChar), paramsLen
 }
 
 func valSpecToItem(isConst bool, v *ast.ValueSpec, withPrivate bool) []*CompletionItem {
@@ -61,26 +61,30 @@ func valSpecToItem(isConst bool, v *ast.ValueSpec, withPrivate bool) []*Completi
 	return items
 }
 
-func funcToItem(fn *ast.FuncDecl) *CompletionItem {
-	ci := &CompletionItem{
-		Label:         fn.Name.String(),
-		Kind:          Function,
-		Documentation: fn.Doc.Text(),
-	}
-
-	params, _ := formatFuncParams(fn.Type.Params)
-	ci.Detail = "func(" + params + ")"
-	ci.InsertText = ci.Label + "(" + params + ")"
-
-	returns, retCount := formatFuncParams(fn.Type.Results)
+func funcToString(fn *ast.FuncType) string {
+	params, _ := formatFieldsList(fn.Params, ", ")
+	str := "func(" + params + ")"
+	returns, retCount := formatFieldsList(fn.Results, ", ")
 	switch retCount {
 	case 0:
 		break
 	case 1:
-		ci.Detail += " " + returns
+		str += " " + returns
 	default:
-		ci.Detail += " (" + returns + ")"
+		str += " (" + returns + ")"
+	}
+
+	return str
+}
+
+func funcToItem(fn *ast.FuncDecl) *CompletionItem {
+	ci := &CompletionItem{
+		Label:         fn.Name.String(),
+		Kind:          Function,
+		Documentation: fn.Doc.Text(),
 	}
 
+	ci.Detail = funcToString(fn.Type)
+	ci.InsertText = ci.Label + "()"
 	return ci
 }

pkg/analyzer/expr.go

@@ -23,6 +23,24 @@ func expToString(exp ast.Expr) string {
 		return v.Sel.String()
 	case *ast.StarExpr:
 		return "*" + expToString(v.X)
+	case *ast.Ellipsis:
+		return "..." + expToString(v.Elt)
+	case *ast.MapType:
+		keyT := expToString(v.Key)
+		valT := expToString(v.Value)
+		return "map[" + keyT + "]" + valT
+	case *ast.ChanType:
+		chanT := expToString(v.Value)
+		return "chan " + chanT
+	case *ast.InterfaceType:
+		typ := "interface{"
+		fields, fieldCount := formatFieldsList(v.Methods, "\n")
+		if fieldCount > 0 {
+			typ += "\n" + fields + "\n"
+		}
+		return typ + "}"
+	case *ast.FuncType:
+		return funcToString(v)
 	default:
 		log.Warnf("expToString: unknown expression - [%[1]T %[1]v]", exp)
 		return "interface{}"