Collapse if statements and rename interface in the fixtures.

vektra · Apr 21, 2022 · 2e1360a · 2e1360a
1 parent b8c62f7
commit 2e1360a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/...fixtures/example_project/foo/collision.go → ...le_project/foo/pkg_name_same_as_import.go b/...fixtures/example_project/foo/collision.go → ...le_project/foo/pkg_name_same_as_import.go
@@ -2,6 +2,6 @@ package foo
 
 import "github.com/vektra/mockery/v2/pkg/fixtures/example_project/bar/foo"
 
-type Collision interface {
+type PackageNameSameAsImport interface {
 	NewClient() foo.Client
 }
diff --git a/pkg/generator.go b/pkg/generator.go
@@ -106,11 +106,9 @@ func (g *Generator) addPackageImportWithName(ctx context.Context, path, name str
 }
 
 func (g *Generator) getNonConflictingName(path, name string) string {
-	if !g.importNameExists(name) {
+	if !g.importNameExists(name) && (!g.InPackage || g.iface.Pkg.Name() != name) {
 		// do not allow imports with the same name as the package when inPackage
-		if !g.InPackage || g.iface.Pkg.Name() != name {
-			return name
-		}
+		return name
 	}
 
 	// The path will always contain '/' because it is enforced in getLocalizedPath
@@ -126,11 +124,9 @@ func (g *Generator) getNonConflictingName(path, name string) string {
 	var prospectiveName string
 	for i := 1; i <= numDirectories; i++ {
 		prospectiveName = strings.Join(cleanedDirectories[numDirectories-i:], "")
-		if !g.importNameExists(prospectiveName) {
+		if !g.importNameExists(prospectiveName) && (!g.InPackage || g.iface.Pkg.Name() != prospectiveName) {
 			// do not allow imports with the same name as the package when inPackage
-			if !g.InPackage || g.iface.Pkg.Name() != prospectiveName {
-				return prospectiveName
-			}
+			return prospectiveName
 		}
 	}
 	// Try adding numbers to the given name