Skip to content

Use _name instead argn in case of conflict #240

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.

Sign up for GitHub

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

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

Use _name instead argn in case of conflict #240

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3263f6a
Update mockgen.go
klaidliadon Mar 21, 2025
75cb29b
Fix statement
klaidliadon Mar 21, 2025
9e38abc
Use argn for empty or ignored names, underscore prefix for conflict
klaidliadon Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions mockgen/mockgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ Example:

Package mode works by specifying the package and interface names.
It is enabled by passing two non-flag arguments: an import path, and a
comma-separated list of symbols.
comma-separated list of symbols.
You can use "." to refer to the current path's package.
Example:
mockgen database/sql/driver Conn,Driver
Expand Down Expand Up @@ -781,16 +781,20 @@ func (g *generator) getArgNames(m *model.Method, in bool) []string {
for i, p := range params {
name := p.Name

if name == "" || name == "_" || g.nameExistsAsPackage(name) {
if name == "" || name == "_" {
name = fmt.Sprintf("arg%d", i)
} else if g.nameExistsAsPackage(name) {
name = "_" + name
}
argNames[i] = name
}
if m.Variadic != nil && in {
name := m.Variadic.Name

if name == "" || g.nameExistsAsPackage(name) {
if name == "" {
name = fmt.Sprintf("arg%d", len(params))
} else if g.nameExistsAsPackage(name) {
name = "_" + name
}
argNames = append(argNames, name)
}
Expand Down