From 6f043b60fc2dcc979ea674c0c330a6d349957d6f Mon Sep 17 00:00:00 2001 From: LandonTClipp <11232769+LandonTClipp@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:22:18 -0600 Subject: [PATCH] Grab pkgname from interface collection --- internal/cmd/mockery.go | 2 +- internal/template_generator.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cmd/mockery.go b/internal/cmd/mockery.go index 3a0feb54..9cf7f719 100644 --- a/internal/cmd/mockery.go +++ b/internal/cmd/mockery.go @@ -320,7 +320,7 @@ func (r *RootApp) Run() error { interfacesInFile.outFilePath.Parent(), packageConfig.Template, pkg.Formatter(r.Config.Formatter), - packageConfig, + interfacesInFile.pkgName, ) if err != nil { return err diff --git a/internal/template_generator.go b/internal/template_generator.go index 67160bac..7604a256 100644 --- a/internal/template_generator.go +++ b/internal/template_generator.go @@ -112,14 +112,14 @@ func NewTemplateGenerator( outPkgFSPath *pathlib.Path, templateName string, formatter Formatter, - pkgConfig *Config, + pkgName string, ) (*TemplateGenerator, error) { srcPkgFSPath := pathlib.NewPath(srcPkg.GoFiles[0]).Parent() log := zerolog.Ctx(ctx).With(). Stringer("srcPkgFSPath", srcPkgFSPath). Stringer("outPkgFSPath", outPkgFSPath). Str("src-pkg-name", srcPkg.Name). - Str("out-pkg-name", pkgConfig.PkgName). + Str("out-pkg-name", pkgName). Logger() if !outPkgFSPath.IsAbsolute() { cwd, err := os.Getwd() @@ -140,7 +140,7 @@ func NewTemplateGenerator( // Note: Technically, go allows test files to have a different package name // than non-test files. In this case, the test files have to import the source // package just as if it were in a different directory. - if pkgConfig.PkgName == srcPkg.Name && srcPkgFSPath.Equals(outPkgFSPath) { + if pkgName == srcPkg.Name && srcPkgFSPath.Equals(outPkgFSPath) { log.Debug().Msg("output package detected to be in-package of original package") inPackage = true } else {