fix: field name and method conflict

cmd/protoc-gen-go-pulsar/main.go

@@ -3,13 +3,15 @@ package main
 import (
 	"flag"
 	"fmt"
+	"log"
 	"strings"
 
 	_ "github.com/cosmos/cosmos-proto/features/fastreflection"
 	_ "github.com/cosmos/cosmos-proto/features/grpc"
 	_ "github.com/cosmos/cosmos-proto/features/pool"
 	_ "github.com/cosmos/cosmos-proto/features/protoc"
 	"github.com/cosmos/cosmos-proto/generator"
+	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/types/pluginpb"
@@ -44,6 +46,15 @@ func main() {
 	f.StringVar(&features, "features", "all", "list of features to generate (separated by '+')")
 
 	protogen.Options{ParamFunc: f.Set}.Run(func(plugin *protogen.Plugin) error {
+		processedMessages := make(map[protoreflect.FullName]struct{})
+		for _, file := range plugin.Files {
+			if !file.Generate {
+				continue
+			}
+			for _, message := range file.Messages {
+				rewriteMessageField(message, processedMessages)
+			}
+		}
 		return generateAllFiles(plugin, strings.Split(features, "+"), poolable)
 	})
 }
@@ -72,3 +83,47 @@ func generateAllFiles(plugin *protogen.Plugin, featureNames []string, poolable O
 	// plugin.SupportedFeatures = SupportedFeatures
 	return nil
 }
+
+var reservedFieldNames = map[string]struct{}{
+	"Descriptor":   {},
+	"Type":         {},
+	"New":          {},
+	"Interface":    {},
+	"Range":        {},
+	"Has":          {},
+	"Clear":        {},
+	"Get":          {},
+	"Set":          {},
+	"Mutable":      {},
+	"NewField":     {},
+	"WhichOneof":   {},
+	"GetUnknown":   {},
+	"SetUnknown":   {},
+	"IsValid":      {},
+	"ProtoMethods": {},
+}
+
+func rewriteMessageField(message *protogen.Message, processed map[protoreflect.FullName]struct{}) {
+	// skip already processed messages, useful for recursive messages
+	if _, done := processed[message.Desc.FullName()]; done {
+		return
+	}
+	// skip map entries
+	if message.Desc.IsMapEntry() {
+		return
+	}
+
+	for _, field := range message.Fields {
+		_, reserved := reservedFieldNames[field.GoName]
+		if !reserved {
+			continue
+		}
+		log.Printf("Message %s contains the reserved field name %s which conflicts with protoreflect.Message interface implementation.\nThis field will be suffixed with an underscore '_'.\nIf you can change the message field name, please do so.\nIn a future iteration of pulsar we will make a breaking change to this practice in order to be compliant with field naming of the original golang protobuf implementation.", message.Desc.FullName(), field.Desc.FullName())
+		field.GoName = field.GoName + "_"
+	}
+	processed[message.Desc.FullName()] = struct{}{}
+
+	for _, nestedMessage := range message.Messages {
+		rewriteMessageField(nestedMessage, processed)
+	}
+}

internal/testprotos/test3/test.pulsar.go

@@ -11221,7 +11221,7 @@ func (x *fastReflection_ForeignMessage) ProtoMethods() *protoiface.Methods {
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.0
-// 	protoc        v3.15.7
+// 	protoc        v3.18.1
 // source: internal/testprotos/test3/test.proto
 
 const (

internal/testprotos/test3/test_import.pulsar.go

@@ -374,7 +374,7 @@ func (x *fastReflection_ImportMessage) ProtoMethods() *protoiface.Methods {
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.0
-// 	protoc        v3.15.7
+// 	protoc        v3.18.1
 // source: internal/testprotos/test3/test_import.proto
 
 const (

testpb/1.proto

@@ -1,8 +1,8 @@
 syntax="proto3";
 
-option go_package = "github.com/cosmos/cosmos-proto/testpb";
+import "testpb/2.proto";
 
-import "google/protobuf/descriptor.proto";
+option go_package = "github.com/cosmos/cosmos-proto/testpb";
 
 enum Enumeration {
   One = 0;
@@ -34,7 +34,8 @@ message A {
     string ONEOF_STRING = 21;
   };
   repeated Enumeration LIST_ENUM = 22;
-  google.protobuf.FileDescriptorProto imported = 23;
+  ImportedMessage imported = 23;
+  string type = 24;
 }
 
 message B {