Merge pull request #821 from Link512/master

check nillable property for type aliases as well
vektra · Oct 2, 2024 · 0d1b1a2 · 0d1b1a2
2 parents 87fdecc + 2e2c85b
commit 0d1b1a2
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 2 deletions.
diff --git a/mocks/github.com/vektra/mockery/v2/pkg/fixtures/UsesAny.go b/mocks/github.com/vektra/mockery/v2/pkg/fixtures/UsesAny.go
diff --git a/pkg/fixtures/any_keyword.go b/pkg/fixtures/any_keyword.go
@@ -0,0 +1,5 @@
+package test
+
+type UsesAny interface {
+	GetReader() any
+}
diff --git a/pkg/generator.go b/pkg/generator.go
@@ -664,7 +664,7 @@ func isNillable(typ types.Type) bool {
 	switch t := typ.(type) {
 	case *types.Pointer, *types.Array, *types.Map, *types.Interface, *types.Signature, *types.Chan, *types.Slice:
 		return true
-	case *types.Named:
+	case *types.Named, *types.Alias:
 		return isNillable(t.Underlying())
 	}
 	return false

diff --git a/pkg/generator_test.go b/pkg/generator_test.go
@@ -340,6 +340,18 @@ func (s *GeneratorSuite) TestGeneratorChecksInterfacesForNilable() {
 	s.checkGeneration("requester_iface.go", "RequesterIface", false, "", "")
 }
 
+func (s *GeneratorSuite) TestGeneratorTreatsAnyAsNilable() {
+	cfg := GeneratorConfig{
+		WithExpecter: true,
+	}
+	expectedBytes, err := os.ReadFile(getMocksPath("UsesAny.go"))
+	s.Require().NoError(err)
+	expected := string(expectedBytes)
+	expected = expected[strings.Index(expected, "// UsesAny is"):]
+
+	s.checkGenerationWithConfig("any_keyword.go", "UsesAny", cfg, expected)
+}
+
 func (s *GeneratorSuite) TestGeneratorPointers() {
 	s.checkGeneration("requester_ptr.go", "RequesterPtr", false, "", "")
 }
@@ -816,7 +828,6 @@ func TestParseReplaceType(t *testing.T) {
 	}
 }
 
-
 func (s *GeneratorSuite) TestReplaceTypePackagePrologueGo123() {
 	expected := `package mocks