Always remove self_package import (#343)

linzhp · codyoss · commit e00cb15c9dfc · 2020-01-13T21:10:01.000-07:00
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 = ""
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,8 @@ func sanitize(s string) string {`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`func (g generator) Generate(pkg model.Package, outputPkgName string, outputPackagePath string) error {`
`238`		`- if outputPkgName != pkg.Name {`
	`238`	`+ if outputPkgName != pkg.Name && *selfPackage == "" {`
	`239`	`+ // reset outputPackagePath if it's not passed in through -self_package`
`239`	`240`	`outputPackagePath = ""`
`240`	`241`	`}`
`241`	`242`