fixes

.mockery.yaml

@@ -46,7 +46,7 @@ packages:
         config:
           replace-type:
             - github.com/vektra/mockery/v2/pkg/fixtures.ReplaceGeneric[-TImport]=github.com/vektra/mockery/v2/pkg/fixtures/redefined_type_b.B
-            - github.com/vektra/mockery/v2/pkg/fixtures.ReplaceGeneric[TConstraint]=github.com/vektra/mockery/v2/pkg/fixtures/constraints.Integer
+            - github.com/vektra/mockery/v2/pkg/fixtures.ReplaceGeneric[TConstraint]=github.com/vektra/mockery/v2/pkg/fixtures/constraints.String
       # Replace a generic param with the parent type
       ReplaceGenericSelf:
         config:

docs/features.md

@@ -93,19 +93,58 @@ func (_m *Handler) HandleMessage(m pubsub.Message) error {
 Generic type constraints can also be replaced by targeting the changed parameter with the square bracket notation on the left hand side.
 
 ```shell
-mockery --replace-type github.com/vektra/mockery/v2/baz/internal/foo.InternalBaz[T]=baz:github.com/vektra/mockery/v2/baz.Baz
+mockery --replace-type github.com/vektra/mockery/v2/baz/internal/foo.InternalBaz[T]=github.com/vektra/mockery/v2/baz.Baz
+```
+
+For example:
+
+```go
+type InternalBaz[T any] struct{}
+
+func (*InternalBaz[T]) Foo() T {}
+
+// Becomes
+type InternalBaz[T baz.Baz] struct{}
+
+func (*InternalBaz[T]) Foo() T {}
 ```
 
 If a type constraint needs to be removed and replaced with a type, target the constraint with square brackets and include a '-' in front to have it removed.
 
 ```shell
-mockery --replace-type github.com/vektra/mockery/v2/baz/internal/foo.InternalBaz[-T]=baz:github.com/vektra/mockery/v2/baz.Baz
+mockery --replace-type github.com/vektra/mockery/v2/baz/internal/foo.InternalBaz[-T]=github.com/vektra/mockery/v2/baz.Baz
+```
+
+For example:
+
+```go
+type InternalBaz[T any] struct{}
+
+func (*InternalBaz[T]) Foo() T {}
+
+// Becomes
+type InternalBaz struct{}
+
+func (*InternalBaz) Foo() baz.Baz {}
 ```
 
 When replacing a generic constraint, you can replace the type with a pointer by adding a '*' before the output type name.
 
 ```shell
-mockery --replace-type github.com/vektra/mockery/v2/baz/internal/foo.InternalBaz[-T]=baz:github.com/vektra/mockery/v2/baz.*Baz
+mockery --replace-type github.com/vektra/mockery/v2/baz/internal/foo.InternalBaz[-T]=github.com/vektra/mockery/v2/baz.*Baz
+```
+
+For example:
+
+```go
+type InternalBaz[T any] struct{}
+
+func (*InternalBaz[T]) Foo() T {}
+
+// Becomes
+type InternalBaz struct{}
+
+func (*InternalBaz) Foo() *baz.Baz {}
 ```
 
 `packages` configuration

pkg/fixtures/constraints/constraints.go

@@ -7,3 +7,7 @@ type Signed interface {
 type Integer interface {
 	~int
 }
+
+type String interface {
+	~string
+}

pkg/fixtures/test/generic_test.go

@@ -0,0 +1,30 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	mocks "github.com/vektra/mockery/v2/mocks/github.com/vektra/mockery/v2/pkg/fixtures"
+	rtb "github.com/vektra/mockery/v2/pkg/fixtures/redefined_type_b"
+)
+
+func TestReplaceGeneric(t *testing.T) {
+	type str string
+
+	m := mocks.NewReplaceGeneric[str, str](t)
+
+	m.EXPECT().A(rtb.B(1)).Return("")
+	assert.Equal(t, m.A(rtb.B(1)), str(""))
+
+	m.EXPECT().B().Return(2)
+	assert.Equal(t, m.B(), rtb.B(2))
+
+	m.EXPECT().C().Return("")
+	assert.Equal(t, m.C(), str(""))
+}
+
+func TestReplaceGenericSelf(t *testing.T) {
+	m := mocks.NewReplaceGenericSelf(t)
+	m.EXPECT().A().Return(m)
+	assert.Equal(t, m.A(), m)
+}

pkg/generator.go

@@ -1164,12 +1164,7 @@ func parseReplaceType(t string) *replaceType {
 	// Match type parameter substitution
 	match := regexp.MustCompile(`\[(.*?)\]$`).FindStringSubmatch(t)
 	if len(match) >= 2 {
-		if match[1][:1] == "-" {
-			ret.param = match[1][1:]
-			ret.rmvParam = true
-		} else {
-			ret.param = match[1]
-		}
+		ret.param, ret.rmvParam = strings.CutPrefix(match[1], "-")
 		t = strings.ReplaceAll(t, match[0], "")
 	}
 

pkg/generator_test.go

@@ -760,32 +760,6 @@ func (s *GeneratorSuite) TestReplaceTypePackageMultiple() {
 	})
 }
 
-func (s *GeneratorSuite) TestReplaceTypeGeneric() {
-	cfg := GeneratorConfig{InPackage: false, ReplaceType: []string{
-		"github.com/vektra/mockery/v2/pkg/fixtures.ReplaceGeneric[-TImport]=github.com/vektra/mockery/v2/pkg/fixtures/redefined_type_b.B",
-		"github.com/vektra/mockery/v2/pkg/fixtures.ReplaceGeneric[TConstraint]=github.com/vektra/mockery/v2/pkg/fixtures/constraints.Integer",
-		"github.com/vektra/mockery/v2/pkg/fixtures.ReplaceGenericSelf[-T]=github.com/vektra/mockery/v2/pkg/fixtures.*ReplaceGenericSelf",
-	}}
-
-	s.checkGenerationRegexWithConfig("generic.go", "ReplaceGeneric", cfg, []regexpExpected{
-		// type ReplaceGeneric[TConstraint constraints.Integer, TKeep interface{}] struct
-		{true, regexp.MustCompile(`type ReplaceGeneric\[TConstraint constraints.Integer\, TKeep interface\{\}] struct`)},
-		// func (_m *ReplaceGeneric[TConstraint, TKeep]) A(t1 test.B) TKeep
-		{true, regexp.MustCompile(`func \(_m \*ReplaceGeneric\[TConstraint, TKeep\]\) A\(t1 test\.B\) TKeep`)},
-		// func (_m *ReplaceGeneric[TConstraint, TKeep]) B() test.B
-		{true, regexp.MustCompile(`func \(_m \*ReplaceGeneric\[TConstraint, TKeep\]\) B\(\) test\.B`)},
-		// func (_m *ReplaceGeneric[TConstraint, TKeep]) C() TConstraint
-		{true, regexp.MustCompile(`func \(_m \*ReplaceGeneric\[TConstraint, TKeep\]\) C\(\) TConstraint`)},
-	})
-
-	s.checkGenerationRegexWithConfig("generic.go", "ReplaceGenericSelf", cfg, []regexpExpected{
-		// type ReplaceGenericSelf struct
-		{true, regexp.MustCompile(`type ReplaceGenericSelf struct`)},
-		// func (_m *ReplaceGenericSelf) A() *ReplaceGenericSelf
-		{true, regexp.MustCompile(`func \(_m \*ReplaceGenericSelf\) A\(\) \*ReplaceGenericSelf`)},
-	})
-}
-
 func (s *GeneratorSuite) TestGenericGenerator() {
 	s.checkGeneration("generic.go", "RequesterGenerics", false, "", "")
 }