Fix -imports handling aliased imports in source mode (#165)

Mihai Claudiu Toader · web-flow · commit d97cf0dd1849 · 2024-11-19T04:56:56.000-08:00
In source mode, when generating a mock within the same package that uses names from a package that is imported with an alias, the generated mock should obey -imports properly and generate imports with the provided alias. If the generated code is not using the same aliases as the main filed in a package the go compiler will still happily run but if you want ot use this package as a source in another package where you want to generate a mock, mock will fail because it will not know what to do with a package that is imported with two different names in a source package. This patch fixes the generation by making `-imports` handling do a more correct thing. It can be argued that the correct behavior is, by default use the the same package aliases as the ones in the source file, however that change looked way more invasive and i didn't see a good coverage of tests that would help me make sure the changes worked well. This is what i found to be the least invasive fix for #166.
diff --git a/mockgen/internal/tests/import_aliased/source.go b/mockgen/internal/tests/import_aliased/source.go
@@ -0,0 +1,11 @@
+package import_aliased
+
+import (
+	definitionAlias "context"
+)
+
+//go:generate mockgen -package import_aliased -destination source_mock.go -source=source.go -imports definitionAlias=context
+
+type S interface {
+	M(ctx definitionAlias.Context)
+}
diff --git a/mockgen/internal/tests/import_aliased/source_mock.go b/mockgen/internal/tests/import_aliased/source_mock.go
diff --git a/mockgen/mockgen.go b/mockgen/mockgen.go
@@ -393,8 +393,8 @@ func (g *generator) Generate(pkg *model.Package, outputPkgName string, outputPac
 		// try base0, base1, ...
 		pkgName := base
 
-		if _, ok := definedImports[base]; ok {
-			pkgName = definedImports[base]
+		if _, ok := definedImports[pth]; ok {
+			pkgName = definedImports[pth]
 		}
 
 		i := 0

Original file line number	Diff line number	Diff line change
`@@ -393,8 +393,8 @@ func (g generator) Generate(pkg model.Package, outputPkgName string, outputPac`
`393`	`393`	`// try base0, base1, ...`
`394`	`394`	`pkgName := base`
`395`	`395`
`396`		`- if _, ok := definedImports[base]; ok {`
`397`		`- pkgName = definedImports[base]`
	`396`	`+ if _, ok := definedImports[pth]; ok {`
	`397`	`+ pkgName = definedImports[pth]`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`i := 0`