Fix -imports handling aliased imports in source mode
#165
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
@JacobOaks can you help with #166 and this ? |
r-hang
approved these changes
Nov 12, 2024
There was a problem hiding this comment.
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.
|
@r-hang merged master into. Now it needs some maintainer approval |
|
@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 ? |
|
@r-hang one more try. I did spend some time now to make sure the CI tooling does the right thing |
|
When will there be a new release ? |
Merged
apricote
pushed a commit
to hetznercloud/fleeting-plugin-hetzner
that referenced
this pull request
Apr 8, 2025
…eting-plugin-hetzner!238) This MR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go.uber.org/mock](https://github.com/uber/mock) | require | patch | `v0.5.0` -> `v0.5.1` | --- ### Release Notes <details> <summary>uber/mock (go.uber.org/mock)</summary> ### [`v0.5.1`](https://github.com/uber-go/mock/releases/tag/v0.5.1) [Compare Source](uber-go/mock@v0.5.0...v0.5.1) #### 0.5.1 (7 Apr 2025) ##### Fixed - [#​220][]: Package mode will now generate code that uses aliases of types when they are used in the source. - [#​219][]: Fixed a collision between function argument names and package names in generated code. - [#​165][]: Fixed an issue where aliases specified by `-imports` were not being respected in generated code. [#​220]: uber-go/mock#220 [#​219]: uber-go/mock#219 [#​165]: uber-go/mock#165 Thanks to [@​mtoader](https://github.com/mtoader) and [@​bstncartwright](https://github.com/bstncartwright) for their contributions to this release. </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMzUuMiIsInVwZGF0ZWRJblZlciI6IjM5LjIzNS4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Apr 8, 2025
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go.uber.org/mock](https://github.com/uber/mock) | require | patch | `v0.5.0` -> `v0.5.1` | --- ### Release Notes <details> <summary>uber/mock (go.uber.org/mock)</summary> ### [`v0.5.1`](https://github.com/uber-go/mock/releases/tag/v0.5.1) [Compare Source](uber-go/mock@v0.5.0...v0.5.1) #### 0.5.1 (7 Apr 2025) ##### Fixed - [#​220][]: Package mode will now generate code that uses aliases of types when they are used in the source. - [#​219][]: Fixed a collision between function argument names and package names in generated code. - [#​165][]: Fixed an issue where aliases specified by `-imports` were not being respected in generated code. [#​220]: uber-go/mock#220 [#​219]: uber-go/mock#219 [#​165]: uber-go/mock#165 Thanks to [@​mtoader](https://github.com/mtoader) and [@​bstncartwright](https://github.com/bstncartwright) for their contributions to this release. </details> --- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMzMuNSIsInVwZGF0ZWRJblZlciI6IjM5LjIzMy41IiwidGFyZ2V0QnJhbmNoIjoiZm9yZ2VqbyIsImxhYmVscyI6WyJkZXBlbmRlbmN5LXVwZ3JhZGUiLCJ0ZXN0L25vdC1uZWVkZWQiXX0=--> Co-authored-by: Gusted <[email protected]> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7488 Reviewed-by: Earl Warren <[email protected]> Co-authored-by: Renovate Bot <[email protected]> Co-committed-by: Renovate Bot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
-importshandling 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.