Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -imports handling aliased imports in source mode #165

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

mtoader
Copy link

@mtoader mtoader commented Mar 6, 2024

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.

@CLAassistant
Copy link

CLAassistant commented Mar 6, 2024

CLA assistant check
All committers have signed the CLA.

@mtoader
Copy link
Author

mtoader commented Mar 19, 2024

@JacobOaks can you help with #166 and this ?

Copy link
Contributor

@r-hang r-hang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

The net effect of this change will be that the gomock generated code should now follow the aliases specified by the -imports mapping. It does seem like this fixes a bug where definedImports is never looked-up by the full path that map is populated with.

@mtoader
Copy link
Author

mtoader commented Nov 12, 2024

@r-hang merged master into. Now it needs some maintainer approval

@mtoader
Copy link
Author

mtoader commented Nov 15, 2024

@r-hang I'm not that familiar with the reqs for the internal tests but i believe the latest commit might fix the tests. Can you approve the workflow run ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants