protogen: use full path for generated file variable name
Use the full path (including the extension) for the generation of
the per-file variable name. Several reasons for this:
* The current logic is buggy in the case where pathType == pathTypeImport
since the prefix variable will be mangled with the Go import path.
* The extension is technically part of the path.
Thus, "path/to/foo.proto" and "path/to/foo.protodevel" are two
distinctly different imports.
* Style-wise, it subjectively looks better. Rather than being a mixture
of camelCase and snake_case, it is all snake_case for the common case:
before: ProtoFile_google_protobuf_any
after: File_google_protobuf_any_proto
* Since the extension is almost always ".proto", this results in a
suffix of "_proto", which provides an additional layer of protection
against possible name conflicts. The previous approach could possibly
have a conflict between "Foo.proto" and a message named ProtoFile
with a sub-message called Foo.
Also, use the per-file variable name for the raw descriptor variables
instead of the hashed version.
Change-Id: Ic91e326b7593e5985cee6ececc60539c27fe32fe
Reviewed-on: https://go-review.googlesource.com/c/164379
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/testprotos/test/test_weak.pb.go b/internal/testprotos/test/test_weak.pb.go
index 98632fc..9b0583f 100644
--- a/internal/testprotos/test/test_weak.pb.go
+++ b/internal/testprotos/test/test_weak.pb.go
@@ -24,13 +24,13 @@
}
func (m *WeakImportMessage) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_weak_messageTypes[0].MessageOf(m)
+ return xxx_File_test_weak_proto_messageTypes[0].MessageOf(m)
}
func (m *WeakImportMessage) Reset() { *m = WeakImportMessage{} }
func (m *WeakImportMessage) String() string { return proto.CompactTextString(m) }
func (*WeakImportMessage) ProtoMessage() {}
func (*WeakImportMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_c2b8edfebc4f71b3_gzipped, []int{0}
+ return xxx_File_test_weak_proto_rawdesc_gzipped, []int{0}
}
func (m *WeakImportMessage) XXX_Unmarshal(b []byte) error {
@@ -52,11 +52,11 @@
var xxx_messageInfo_WeakImportMessage proto.InternalMessageInfo
func init() {
- proto.RegisterFile("test_weak.proto", fileDescriptor_c2b8edfebc4f71b3_gzipped)
+ proto.RegisterFile("test_weak.proto", xxx_File_test_weak_proto_rawdesc_gzipped)
proto.RegisterType((*WeakImportMessage)(nil), "goproto.proto.test.WeakImportMessage")
}
-var fileDescriptor_c2b8edfebc4f71b3 = []byte{
+var xxx_File_test_weak_proto_rawdesc = []byte{
// 116 bytes of the wire-encoded FileDescriptorProto
0x0a, 0x0f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x77, 0x65, 0x61, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x12, 0x12, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
@@ -68,31 +68,31 @@
0x74, 0x65, 0x73, 0x74,
}
-var fileDescriptor_c2b8edfebc4f71b3_gzipped = protoapi.CompressGZIP(fileDescriptor_c2b8edfebc4f71b3)
+var xxx_File_test_weak_proto_rawdesc_gzipped = protoapi.CompressGZIP(xxx_File_test_weak_proto_rawdesc)
const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
-var ProtoFile_test_weak protoreflect.FileDescriptor
+var File_test_weak_proto protoreflect.FileDescriptor
-var xxx_ProtoFile_test_weak_messageTypes [1]protoimpl.MessageType
-var xxx_ProtoFile_test_weak_goTypes = []interface{}{
+var xxx_File_test_weak_proto_messageTypes [1]protoimpl.MessageType
+var xxx_File_test_weak_proto_goTypes = []interface{}{
(*WeakImportMessage)(nil), // 0: goproto.proto.test.WeakImportMessage
}
-var xxx_ProtoFile_test_weak_depIdxs = []int32{}
+var xxx_File_test_weak_proto_depIdxs = []int32{}
func init() {
var messageTypes [1]protoreflect.MessageType
- ProtoFile_test_weak = protoimpl.FileBuilder{
- RawDescriptor: fileDescriptor_c2b8edfebc4f71b3,
- GoTypes: xxx_ProtoFile_test_weak_goTypes,
- DependencyIndexes: xxx_ProtoFile_test_weak_depIdxs,
+ File_test_weak_proto = protoimpl.FileBuilder{
+ RawDescriptor: xxx_File_test_weak_proto_rawdesc,
+ GoTypes: xxx_File_test_weak_proto_goTypes,
+ DependencyIndexes: xxx_File_test_weak_proto_depIdxs,
MessageOutputTypes: messageTypes[:],
}.Init()
- messageGoTypes := xxx_ProtoFile_test_weak_goTypes[0:][:1]
+ messageGoTypes := xxx_File_test_weak_proto_goTypes[0:][:1]
for i, mt := range messageTypes[:] {
- xxx_ProtoFile_test_weak_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
- xxx_ProtoFile_test_weak_messageTypes[i].PBType = mt
+ xxx_File_test_weak_proto_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
+ xxx_File_test_weak_proto_messageTypes[i].PBType = mt
}
- xxx_ProtoFile_test_weak_goTypes = nil
- xxx_ProtoFile_test_weak_depIdxs = nil
+ xxx_File_test_weak_proto_goTypes = nil
+ xxx_File_test_weak_proto_depIdxs = nil
}