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.

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

correctly map typegen to cbg in all cases #26

Merged
merged 1 commit into from
Jul 10, 2020
Merged

correctly map typegen to cbg in all cases #26

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
11 changes: 7 additions & 4 deletions gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,17 @@ func typeName(pkg string, t reflect.Type) string {
case reflect.Map:
return "map[" + typeName(pkg, t.Key()) + "]" + typeName(pkg, t.Elem())
default:
return strings.TrimPrefix(t.String(), pkg+".")
name := t.String()
if t.PkgPath() == "github.com/whyrusleeping/cbor-gen" {
name = "cbg." + strings.TrimPrefix(name, "typegen.")
} else {
name = strings.TrimPrefix(name, pkg+".")
}
return name
}
}

func (f Field) TypeName() string {
if f.Type.PkgPath() == "github.com/whyrusleeping/cbor-gen" {
return "cbg" + strings.TrimPrefix(typeName(f.Pkg, f.Type), "typegen")
}
return typeName(f.Pkg, f.Type)
}

Expand Down