Merge commit 'pullrequests/Ralph7C2/genericparams'

maxbrunsfeld · Jan 12, 2024 · 2c17700 · 2c17700
2 parents c1028da + 69e693e
commit 2c17700
Show file tree

Hide file tree

Showing 6 changed files with 251 additions and 0 deletions.
diff --git a/fixtures/genericparam/genericparam.go b/fixtures/genericparam/genericparam.go
@@ -0,0 +1,16 @@
+package genericparam
+
+import (
+ "github.com/maxbrunsfeld/counterfeiter/v6/fixtures/genericparam/genericparamtype"
+ "github.com/maxbrunsfeld/counterfeiter/v6/fixtures/genericparam/genericreturntype"
+)
+
+//counterfeiter:generate . GenericParamFunc
+type GenericParamFunc func(Generic[genericparamtype.T]) Generic[genericreturntype.R]
+
+//counterfeiter:generate . GenericParamInterface
+type GenericParamInterface interface {
+ DoSomething(Generic[genericparamtype.T]) Generic[genericreturntype.R]
+}
+
+type Generic[T any] struct{ _ T }
diff --git a/fixtures/genericparam/genericparamfakes/fake_generic_param_func.go b/fixtures/genericparam/genericparamfakes/fake_generic_param_func.go
diff --git a/fixtures/genericparam/genericparamfakes/fake_generic_param_interface.go b/fixtures/genericparam/genericparamfakes/fake_generic_param_interface.go
diff --git a/fixtures/genericparam/genericparamtype/genericparamtype.go b/fixtures/genericparam/genericparamtype/genericparamtype.go
@@ -0,0 +1,3 @@
+package genericparamtype
+
+type T string
diff --git a/fixtures/genericparam/genericreturntype/genericreturntype.go b/fixtures/genericparam/genericreturntype/genericreturntype.go
@@ -0,0 +1,3 @@
+package genericreturntype
+
+type R struct{}
diff --git a/generator/loader.go b/generator/loader.go
@@ -132,6 +132,10 @@ func (f *Fake) addImportsFor(typ types.Type) {
  f.addImportsFor(t.Elem())
  case *types.Named:
  if t.Obj() != nil && t.Obj().Pkg() != nil {
+ typeArgs := t.TypeArgs()
+ for i := 0; i < typeArgs.Len(); i++ {
+ f.addImportsFor(typeArgs.At(i))
+ }
  f.Imports.Add(t.Obj().Pkg().Name(), t.Obj().Pkg().Path())
  }
  case *types.Slice: