Skip to content

add de-duping of custom imports #235

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

Closed
wants to merge 1 commit into from
Closed

add de-duping of custom imports #235

Show file tree
Hide file tree
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
20 changes: 15 additions & 5 deletions protoc-gen-gogo/generator/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescripto
g.Fail(err.Error())
}
if len(packageName) > 0 {
g.customImports = append(g.customImports, packageName)
g.addCustomImport(packageName)
}
case gogoproto.IsCastType(field):
var packageName string
Expand All @@ -1875,13 +1875,13 @@ func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescripto
g.Fail(err.Error())
}
if len(packageName) > 0 {
g.customImports = append(g.customImports, packageName)
g.addCustomImport(packageName)
}
case gogoproto.IsStdTime(field):
g.customImports = append(g.customImports, "time")
g.addCustomImport("time")
typ = "time.Time"
case gogoproto.IsStdDuration(field):
g.customImports = append(g.customImports, "time")
g.addCustomImport("time")
typ = "time.Duration"
}
if needsStar(field, g.file.proto3 && field.Extendee == nil, message != nil && message.allowOneof()) {
Expand All @@ -1893,6 +1893,16 @@ func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescripto
return
}

// addCustomImport adds unique imports to the customImports list.
func (g *Generator) addCustomImport(packageName string) {
for _, existing := range g.customImports {
if existing == packageName {
return
}
}
g.customImports = append(g.customImports, packageName)
}

// GoMapDescriptor is a full description of the map output struct.
type GoMapDescriptor struct {
GoType string
Expand Down Expand Up @@ -1937,7 +1947,7 @@ func (g *Generator) GoMapType(d *Descriptor, field *descriptor.FieldDescriptorPr
g.Fail(err.Error())
}
if len(packageName) > 0 {
g.customImports = append(g.customImports, packageName)
g.addCustomImport(packageName)
}
m.GoType = typ
return m
Expand Down
2 changes: 1 addition & 1 deletion protoc-gen-gogo/generator/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,6 @@ func (d *Descriptor) Path() string {

func (g *Generator) useTypes() string {
pkg := strings.Map(badToUnderscore, "github.com/gogo/protobuf/types")
g.customImports = append(g.customImports, "github.com/gogo/protobuf/types")
g.addCustomImport("github.com/gogo/protobuf/types")
return pkg
}