Skip to content

Fix archive mode does not support type aliases #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix archive mode does not support type aliases #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions mockgen/model/model_gotypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,6 @@ func parameterFromGoTypesType(v *types.Var, variadic bool) (*Parameter, error) {
}

func typeFromGoTypesType(t types.Type) (Type, error) {
if t, ok := t.(*types.Named); ok {
tn := t.Obj()
if tn.Pkg() == nil {
return PredeclaredType(tn.Name()), nil
}
return &NamedType{
Package: tn.Pkg().Path(),
Type: tn.Name(),
}, nil
}

// only unnamed or predeclared types after here

// Lots of types have element types. Let's do the parsing and error checking for all of them.
var elemType Type
if t, ok := t.(interface{ Elem() types.Type }); ok {
Expand Down Expand Up @@ -153,6 +140,39 @@ func typeFromGoTypesType(t types.Type) (Type, error) {
if t.NumFields() == 0 {
return PredeclaredType("struct{}"), nil
}
case *types.Named, *types.Alias:
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shamelessly stolen from package_mode.go, which seems to implement the same typeFromGoTypesType function?

object := t.(interface{ Obj() *types.TypeName })
name := object.Obj().Name()
var pkg string
if object.Obj().Pkg() != nil {
pkg = object.Obj().Pkg().Path()
}

// TypeArgs method not available for aliases in go1.22
genericType, ok := t.(interface{ TypeArgs() *types.TypeList })
if !ok || genericType.TypeArgs() == nil {
return &NamedType{
Package: pkg,
Type: name,
}, nil
}

typeParams := &TypeParametersType{TypeParameters: make([]Type, genericType.TypeArgs().Len())}
for i := range genericType.TypeArgs().Len() {
typeParam := genericType.TypeArgs().At(i)
typedParam, err := typeFromGoTypesType(typeParam)
if err != nil {
return nil, fmt.Errorf("parse type parameter %v: %w", typeParam.String(), err)
}

typeParams.TypeParameters[i] = typedParam
}

return &NamedType{
Package: pkg,
Type: name,
TypeParams: typeParams,
}, nil
// TODO: UnsafePointer
}

Expand Down