Skip to content

Added support for unnamed interface params #1

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 1 commit into
base: master
Choose a base branch
from
Open

Added support for unnamed interface params #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions jen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ var (

func (rename ParamRenamer) rename(index int, p *Param) {
if rename != nil {
p.Name = rename(index, p.Name)
if p.Name == "" {
p.Name = rename(index, "")
} else {
p.Name = rename(index, p.Name)
}
}
}

Expand Down Expand Up @@ -60,11 +64,11 @@ func paramsFromFieldList(fl *ast.FieldList, imports importMap) Params {
return nil
}
codes := make(Params, 0, fl.NumFields())
for _, l := range fl.List {
for i, l := range fl.List {
typ := exprToJen(l.Type, imports)
_, isVariadic := l.Type.(*ast.Ellipsis)
if len(l.Names) == 0 {
codes = append(codes, Param{Type: typ, IsVariadic: isVariadic})
codes = append(codes, Param{Name: RenameUnnamed(i, ""), Type: typ, IsVariadic: isVariadic})
continue
}
for _, n := range l.Names {
Expand Down Expand Up @@ -114,8 +118,8 @@ func exprToJen(e ast.Expr, imports importMap) jen.Code {

case *ast.FuncType:
return jen.Func().
Params(paramsFromFieldList(e.Params, imports).ToSignatureParams(nil)...).
Params(paramsFromFieldList(e.Results, imports).ToSignatureParams(nil)...)
Params(paramsFromFieldList(e.Params, imports).ToSignatureParams(RenameUnnamed)...).
Params(paramsFromFieldList(e.Results, imports).ToSignatureParams(RenameUnnamed)...)

case *ast.InterfaceType:
return jen.InterfaceFunc(func(g *jen.Group) {
Expand All @@ -125,8 +129,8 @@ func exprToJen(e ast.Expr, imports importMap) jen.Code {
}
fn := m.Type.(*ast.FuncType)
g.Id(m.Names[0].Name).
Params(paramsFromFieldList(fn.Params, imports).ToSignatureParams(nil)...).
Params(paramsFromFieldList(fn.Results, imports).ToSignatureParams(nil)...)
Params(paramsFromFieldList(fn.Params, imports).ToSignatureParams(RenameUnnamed)...).
Params(paramsFromFieldList(fn.Results, imports).ToSignatureParams(RenameUnnamed)...)
}
})

Expand Down