support import shadowing

eyasy1217 · Jul 11, 2024 · a9a24c1 · a9a24c1
1 parent 2c0a7fd
commit a9a24c1
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 0 deletions.
diff --git a/mockgen/internal/tests/import_shadowing/foo/foo.go b/mockgen/internal/tests/import_shadowing/foo/foo.go
@@ -0,0 +1,3 @@
+package foo
+
+type MyInt int
diff --git a/mockgen/internal/tests/import_shadowing/import.go b/mockgen/internal/tests/import_shadowing/import.go
@@ -0,0 +1,11 @@
+package import_shadowing
+
+import (
+	"go.uber.org/mock/mockgen/internal/tests/import_shadowing/foo"
+)
+
+//go:generate mockgen -destination mock.go -source import.go -package import_shadowing . Bar
+
+type Bar interface {
+	Hoge(foo string) foo.MyInt
+}
diff --git a/mockgen/internal/tests/import_shadowing/mock.go b/mockgen/internal/tests/import_shadowing/mock.go
diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go
@@ -386,6 +386,23 @@ func (g *generator) Generate(pkg *model.Package, outputPkgName string, outputPac
 			i++
 		}
 
+		isImportShadowing := func() bool {
+			for _, intf := range pkg.Interfaces {
+				for _, m := range intf.Methods {
+					for _, i := range m.In {
+						if i.Name == pkgName {
+							return true
+						}
+					}
+				}
+			}
+			return false
+		}
+
+		if isImportShadowing() {
+			pkgName = base + "Pkg"
+		}
+
 		// Avoid importing package if source pkg == output pkg
 		if pth == pkg.PkgPath && outputPackagePath == pkg.PkgPath {
 			continue