fix: import and arg collision by bstncartwright · Pull Request #219 · uber-go/mock

bstncartwright · 2024-10-22T17:00:29Z

Resolves #218

This is my first time contributing to this project, please let me know if there is anything I need to change. Thanks!

HassanCehef · 2024-10-23T08:03:12Z

I'm not a maintainer; I reported the bug.

I like the fix. Name collisions have always been possible: they didn't happen so much because "arg0"..."arg5" are not usual package names.
How about using this as a suffix rather than a full replacement?
DoThat(internalpackage int): instead of becoming

-func (m *MockMything) DoThat(arg0 int) internalpackage.FooExported {
+func (m *MockMything) DoThat(internalpackage_arg0 int) internalpackage.FooExported {

this way we still get the v0.5.0 feature that provides human readable names when using mocks in all cases.

bstncartwright · 2024-10-24T16:50:28Z

I'm not a maintainer; I reported the bug.

I like the fix. Name collisions have always been possible: they didn't happen so much because "arg0"..."arg5" are not usual package names. How about using this as a suffix rather than a full replacement? DoThat(internalpackage int): instead of becoming
-func (m *MockMything) DoThat(arg0 int) internalpackage.FooExported {
+func (m *MockMything) DoThat(internalpackage_arg0 int) internalpackage.FooExported {
this way we still get the v0.5.0 feature that provides human readable names when using mocks in all cases.

Interesting, I like that idea but I wonder if it could cause more confusion. Auto-complete from the LSP could show internalpackage_arg0 and the developer might think it is an argument of that package? Just a thought, I am open to finding the best answer here!

tchung1118

Added a comment. Also, could you re-generate existing test mocks?

mockgen/mockgen.go

bstncartwright · 2024-10-28T15:25:30Z

Added a comment. Also, could you re-generate existing test mocks?

Done. Thanks for your review!

tchung1118

LGTM. Thank you for your contribution!

becoded · 2024-11-15T11:05:23Z

@tchung1118 can we expect a new patch/minor release for this fix anytime soon?

arxeiss · 2025-04-03T08:07:17Z

Hello, is Mock package still maintained? We are still using v0.4.0, this issue is obviously solved. But without new release it is just half way done.

…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. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7488 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org> Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>

bstncartwright mentioned this pull request Oct 22, 2024

v0.5.0 mock generated do not compile due to name clash #218

Closed

tchung1118 reviewed Oct 28, 2024

View reviewed changes

mockgen/mockgen.go Outdated Show resolved Hide resolved

fix: import and arg collision

92587e1

bstncartwright force-pushed the fix/arg-package-conflict branch from 1a87bd5 to 92587e1 Compare October 28, 2024 15:25

bstncartwright requested a review from tchung1118 October 28, 2024 15:44

tchung1118 approved these changes Oct 28, 2024

View reviewed changes

tchung1118 merged commit eb67641 into uber-go:main Oct 28, 2024

bstncartwright deleted the fix/arg-package-conflict branch October 28, 2024 19:10

cavus700 mentioned this pull request Nov 6, 2024

Compile error occurs when an arg name is same as a package name. #222

Closed

coderabbitai bot mentioned this pull request Apr 7, 2025

Prepare release v0.5.1 #241

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: import and arg collision#219

fix: import and arg collision#219
tchung1118 merged 1 commit intouber-go:mainfrom
bstncartwright:fix/arg-package-conflict

bstncartwright commented Oct 22, 2024

Uh oh!

HassanCehef commented Oct 23, 2024

Uh oh!

bstncartwright commented Oct 24, 2024

Uh oh!

tchung1118 left a comment

Uh oh!

Uh oh!

bstncartwright commented Oct 28, 2024

Uh oh!

tchung1118 left a comment

Uh oh!

becoded commented Nov 15, 2024

Uh oh!

arxeiss commented Apr 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

bstncartwright commented Oct 22, 2024

Uh oh!

HassanCehef commented Oct 23, 2024

Uh oh!

bstncartwright commented Oct 24, 2024

Uh oh!

tchung1118 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bstncartwright commented Oct 28, 2024

Uh oh!

tchung1118 left a comment

Choose a reason for hiding this comment

Uh oh!

becoded commented Nov 15, 2024

Uh oh!

arxeiss commented Apr 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants