extractNamed parse named.TypeArgs for TypesRecord.toNamedType

visualfc · Sep 7, 2022 · da20891 · da20891
1 parent 1eaf1e3
commit da20891
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/types_go117.go b/types_go117.go
@@ -16,6 +16,15 @@ func hasTypeParam(t types.Type) bool {
 	return false
 }
 
+func extractNamed(named *types.Named) (pkgpath string, name string) {
+	obj := named.Obj()
+	if pkg := obj.Pkg(); pkg != nil {
+		pkgpath = pkg.Path()
+	}
+	name = obj.Name()
+	return
+}
+
 func (sp *sourcePackage) Load() (err error) {
 	if sp.Info == nil {
 		sp.Info = &types.Info{

diff --git a/types_go118.go b/types_go118.go
@@ -24,6 +24,25 @@ func hasTypeParam(t types.Type) bool {
 	return false
 }
 
+func extractNamed(named *types.Named) (pkgpath string, name string) {
+	obj := named.Obj()
+	if pkg := obj.Pkg(); pkg != nil {
+		pkgpath = pkg.Path()
+	}
+	name = obj.Name()
+	if args := named.TypeArgs(); args != nil {
+		name += "["
+		for i := 0; i < args.Len(); i++ {
+			if i != 0 {
+				name += ","
+			}
+			name += args.At(i).String()
+		}
+		name += "]"
+	}
+	return
+}
+
 func (sp *sourcePackage) Load() (err error) {
 	if sp.Info == nil {
 		sp.Info = &types.Info{

diff --git a/xtypes.go b/xtypes.go
@@ -275,9 +275,9 @@ func (r *TypesRecord) toInterfaceType(t *types.Interface) reflect.Type {
 
 func (r *TypesRecord) toNamedType(t *types.Named) reflect.Type {
 	ut := t.Underlying()
-	name := t.Obj()
-	if name.Pkg() == nil {
-		if name.Name() == "error" {
+	pkgpath, name := extractNamed(t)
+	if pkgpath == "" {
+		if name == "error" {
 			return tyErrorInterface
 		}
 		return r.ToType(ut)
@@ -286,7 +286,7 @@ func (r *TypesRecord) toNamedType(t *types.Named) reflect.Type {
 	numMethods := len(methods)
 	if numMethods == 0 {
 		styp := toMockType(t.Underlying())
-		typ := reflectx.NamedTypeOf(name.Pkg().Path(), name.Name(), styp)
+		typ := reflectx.NamedTypeOf(pkgpath, name, styp)
 		r.saveType(t, typ)
 		utype := r.ToType(ut)
 		reflectx.SetUnderlying(typ, utype)
@@ -302,7 +302,7 @@ func (r *TypesRecord) toNamedType(t *types.Named) reflect.Type {
 	}
 	// toMockType for size/align
 	etyp := toMockType(ut)
-	styp := reflectx.NamedTypeOf(name.Pkg().Path(), name.Name(), etyp)
+	styp := reflectx.NamedTypeOf(pkgpath, name, etyp)
 	typ := reflectx.NewMethodSet(styp, mcount, pcount)
 	r.saveType(t, typ)
 	utype := r.ToType(ut)