Always remove self_package import (#343)

golang · Jan 14, 2020 · e00cb15 · e00cb15
1 parent 0800f9a
commit e00cb15
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/mockgen/internal/tests/self_package/mock.go b/mockgen/internal/tests/self_package/mock.go
diff --git a/mockgen/internal/tests/self_package/types.go b/mockgen/internal/tests/self_package/types.go
@@ -0,0 +1,10 @@
+//go:generate mockgen -package core -self_package github.com/golang/mock/mockgen/internal/tests/self_package -destination mock.go github.com/golang/mock/mockgen/internal/tests/self_package Methods
+package core
+
+type Info struct {
+	name string
+}
+
+type Methods interface {
+	getInfo() Info
+}
diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go
@@ -235,7 +235,8 @@ func sanitize(s string) string {
 }
 
 func (g *generator) Generate(pkg *model.Package, outputPkgName string, outputPackagePath string) error {
-	if outputPkgName != pkg.Name {
+	if outputPkgName != pkg.Name && *selfPackage == "" {
+		// reset outputPackagePath if it's not passed in through -self_package
 		outputPackagePath = ""
 	}