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/fileinit/fileinit_test.go b/internal/fileinit/fileinit_test.go
index b6ba1e1..a02036b 100644
--- a/internal/fileinit/fileinit_test.go
+++ b/internal/fileinit/fileinit_test.go
@@ -20,7 +20,7 @@
// 2. The protoc-generated wire-encoded message.
//
// This serves as a test of both fileinit and protodesc.
- got := protodesc.ToFileDescriptorProto(testpb.ProtoFile_test)
+ got := protodesc.ToFileDescriptorProto(testpb.File_test_proto)
want := &descriptorpb.FileDescriptorProto{}
zb, _ := (&testpb.TestAllTypes{}).Descriptor()
@@ -60,7 +60,7 @@
"ServiceDescriptorProto",
"MethodDescriptorProto",
} {
- message := descriptorpb.ProtoFile_google_protobuf_descriptor.Messages().ByName(messageName)
+ message := descriptorpb.File_google_protobuf_descriptor_proto.Messages().ByName(messageName)
for i, fields := 0, message.Fields(); i < fields.Len(); i++ {
if name := fields.Get(i).FullName(); !seen[name] && !ignore[name] {
t.Errorf("No test for descriptor field: %v", name)
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index 0d35481..37e45e4 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -26,7 +26,7 @@
)
func (e ForeignEnum) Type() protoreflect.EnumType {
- return xxx_ProtoFile_test_enumTypes[0]
+ return xxx_File_test_proto_enumTypes[0]
}
func (e ForeignEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(e)
@@ -64,7 +64,7 @@
}
func (ForeignEnum) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{0}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{0}
}
type TestReservedEnumFields int32
@@ -74,7 +74,7 @@
)
func (e TestReservedEnumFields) Type() protoreflect.EnumType {
- return xxx_ProtoFile_test_enumTypes[1]
+ return xxx_File_test_proto_enumTypes[1]
}
func (e TestReservedEnumFields) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(e)
@@ -108,7 +108,7 @@
}
func (TestReservedEnumFields) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{1}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{1}
}
type TestAllTypes_NestedEnum int32
@@ -121,7 +121,7 @@
)
func (e TestAllTypes_NestedEnum) Type() protoreflect.EnumType {
- return xxx_ProtoFile_test_enumTypes[2]
+ return xxx_File_test_proto_enumTypes[2]
}
func (e TestAllTypes_NestedEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(e)
@@ -161,7 +161,7 @@
}
func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{0, 0}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{0, 0}
}
type TestDeprecatedMessage_DeprecatedEnum int32 // Deprecated: Do not use.
@@ -170,7 +170,7 @@
)
func (e TestDeprecatedMessage_DeprecatedEnum) Type() protoreflect.EnumType {
- return xxx_ProtoFile_test_enumTypes[3]
+ return xxx_File_test_proto_enumTypes[3]
}
func (e TestDeprecatedMessage_DeprecatedEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(e)
@@ -204,7 +204,7 @@
}
func (TestDeprecatedMessage_DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{1, 0}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{1, 0}
}
type TestAllTypes struct {
@@ -304,13 +304,13 @@
}
func (m *TestAllTypes) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[0].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[0].MessageOf(m)
}
func (m *TestAllTypes) Reset() { *m = TestAllTypes{} }
func (m *TestAllTypes) String() string { return proto.CompactTextString(m) }
func (*TestAllTypes) ProtoMessage() {}
func (*TestAllTypes) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{0}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{0}
}
func (m *TestAllTypes) XXX_Unmarshal(b []byte) error {
@@ -1052,13 +1052,13 @@
}
func (m *TestDeprecatedMessage) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[1].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[1].MessageOf(m)
}
func (m *TestDeprecatedMessage) Reset() { *m = TestDeprecatedMessage{} }
func (m *TestDeprecatedMessage) String() string { return proto.CompactTextString(m) }
func (*TestDeprecatedMessage) ProtoMessage() {}
func (*TestDeprecatedMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{1}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{1}
}
func (m *TestDeprecatedMessage) XXX_Unmarshal(b []byte) error {
@@ -1128,13 +1128,13 @@
}
func (m *ForeignMessage) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[2].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[2].MessageOf(m)
}
func (m *ForeignMessage) Reset() { *m = ForeignMessage{} }
func (m *ForeignMessage) String() string { return proto.CompactTextString(m) }
func (*ForeignMessage) ProtoMessage() {}
func (*ForeignMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{2}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{2}
}
func (m *ForeignMessage) XXX_Unmarshal(b []byte) error {
@@ -1176,13 +1176,13 @@
}
func (m *TestReservedFields) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[3].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[3].MessageOf(m)
}
func (m *TestReservedFields) Reset() { *m = TestReservedFields{} }
func (m *TestReservedFields) String() string { return proto.CompactTextString(m) }
func (*TestReservedFields) ProtoMessage() {}
func (*TestReservedFields) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{3}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{3}
}
func (m *TestReservedFields) XXX_Unmarshal(b []byte) error {
@@ -1211,13 +1211,13 @@
}
func (m *TestAllExtensions) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[4].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[4].MessageOf(m)
}
func (m *TestAllExtensions) Reset() { *m = TestAllExtensions{} }
func (m *TestAllExtensions) String() string { return proto.CompactTextString(m) }
func (*TestAllExtensions) ProtoMessage() {}
func (*TestAllExtensions) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{4}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{4}
}
var extRange_TestAllExtensions = []proto.ExtensionRange{
@@ -1254,13 +1254,13 @@
}
func (m *OptionalGroupExtension) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[5].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[5].MessageOf(m)
}
func (m *OptionalGroupExtension) Reset() { *m = OptionalGroupExtension{} }
func (m *OptionalGroupExtension) String() string { return proto.CompactTextString(m) }
func (*OptionalGroupExtension) ProtoMessage() {}
func (*OptionalGroupExtension) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{5}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{5}
}
func (m *OptionalGroupExtension) XXX_Unmarshal(b []byte) error {
@@ -1296,13 +1296,13 @@
}
func (m *RepeatedGroupExtension) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[6].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[6].MessageOf(m)
}
func (m *RepeatedGroupExtension) Reset() { *m = RepeatedGroupExtension{} }
func (m *RepeatedGroupExtension) String() string { return proto.CompactTextString(m) }
func (*RepeatedGroupExtension) ProtoMessage() {}
func (*RepeatedGroupExtension) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{6}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{6}
}
func (m *RepeatedGroupExtension) XXX_Unmarshal(b []byte) error {
@@ -1337,13 +1337,13 @@
}
func (m *TestNestedExtension) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[7].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[7].MessageOf(m)
}
func (m *TestNestedExtension) Reset() { *m = TestNestedExtension{} }
func (m *TestNestedExtension) String() string { return proto.CompactTextString(m) }
func (*TestNestedExtension) ProtoMessage() {}
func (*TestNestedExtension) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{7}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{7}
}
func (m *TestNestedExtension) XXX_Unmarshal(b []byte) error {
@@ -1372,13 +1372,13 @@
}
func (m *FooRequest) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[8].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[8].MessageOf(m)
}
func (m *FooRequest) Reset() { *m = FooRequest{} }
func (m *FooRequest) String() string { return proto.CompactTextString(m) }
func (*FooRequest) ProtoMessage() {}
func (*FooRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{8}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{8}
}
func (m *FooRequest) XXX_Unmarshal(b []byte) error {
@@ -1406,13 +1406,13 @@
}
func (m *FooResponse) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[9].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[9].MessageOf(m)
}
func (m *FooResponse) Reset() { *m = FooResponse{} }
func (m *FooResponse) String() string { return proto.CompactTextString(m) }
func (*FooResponse) ProtoMessage() {}
func (*FooResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{9}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{9}
}
func (m *FooResponse) XXX_Unmarshal(b []byte) error {
@@ -1442,13 +1442,13 @@
}
func (m *TestAllTypes_NestedMessage) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[10].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[10].MessageOf(m)
}
func (m *TestAllTypes_NestedMessage) Reset() { *m = TestAllTypes_NestedMessage{} }
func (m *TestAllTypes_NestedMessage) String() string { return proto.CompactTextString(m) }
func (*TestAllTypes_NestedMessage) ProtoMessage() {}
func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{0, 0}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{0, 0}
}
func (m *TestAllTypes_NestedMessage) XXX_Unmarshal(b []byte) error {
@@ -1491,13 +1491,13 @@
}
func (m *TestAllTypes_OptionalGroup) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[11].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[11].MessageOf(m)
}
func (m *TestAllTypes_OptionalGroup) Reset() { *m = TestAllTypes_OptionalGroup{} }
func (m *TestAllTypes_OptionalGroup) String() string { return proto.CompactTextString(m) }
func (*TestAllTypes_OptionalGroup) ProtoMessage() {}
func (*TestAllTypes_OptionalGroup) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{0, 1}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{0, 1}
}
func (m *TestAllTypes_OptionalGroup) XXX_Unmarshal(b []byte) error {
@@ -1533,13 +1533,13 @@
}
func (m *TestAllTypes_RepeatedGroup) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_messageTypes[12].MessageOf(m)
+ return xxx_File_test_proto_messageTypes[12].MessageOf(m)
}
func (m *TestAllTypes_RepeatedGroup) Reset() { *m = TestAllTypes_RepeatedGroup{} }
func (m *TestAllTypes_RepeatedGroup) String() string { return proto.CompactTextString(m) }
func (*TestAllTypes_RepeatedGroup) ProtoMessage() {}
func (*TestAllTypes_RepeatedGroup) Descriptor() ([]byte, []int) {
- return fileDescriptor_c161fcfdc0c3ff1e_gzipped, []int{0, 2}
+ return xxx_File_test_proto_rawdesc_gzipped, []int{0, 2}
}
func (m *TestAllTypes_RepeatedGroup) XXX_Unmarshal(b []byte) error {
@@ -1901,7 +1901,7 @@
}
func init() {
- proto.RegisterFile("test.proto", fileDescriptor_c161fcfdc0c3ff1e_gzipped)
+ proto.RegisterFile("test.proto", xxx_File_test_proto_rawdesc_gzipped)
proto.RegisterEnum("goproto.proto.test.ForeignEnum", ForeignEnum_name, ForeignEnum_value)
proto.RegisterEnum("goproto.proto.test.TestReservedEnumFields", TestReservedEnumFields_name, TestReservedEnumFields_value)
proto.RegisterEnum("goproto.proto.test.TestAllTypes_NestedEnum", TestAllTypes_NestedEnum_name, TestAllTypes_NestedEnum_value)
@@ -1975,7 +1975,7 @@
proto.RegisterExtension(E_TestNestedExtension_NestedStringExtension)
}
-var fileDescriptor_c161fcfdc0c3ff1e = []byte{
+var xxx_File_test_proto_rawdesc = []byte{
// 12054 bytes of the wire-encoded FileDescriptorProto
0x0a, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74,
@@ -2733,15 +2733,15 @@
0x73, 0x74, 0x50, 0x01, 0x58, 0x02,
}
-var fileDescriptor_c161fcfdc0c3ff1e_gzipped = protoapi.CompressGZIP(fileDescriptor_c161fcfdc0c3ff1e)
+var xxx_File_test_proto_rawdesc_gzipped = protoapi.CompressGZIP(xxx_File_test_proto_rawdesc)
const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
-var ProtoFile_test protoreflect.FileDescriptor
+var File_test_proto protoreflect.FileDescriptor
-var xxx_ProtoFile_test_enumTypes [4]protoreflect.EnumType
-var xxx_ProtoFile_test_messageTypes [30]protoimpl.MessageType
-var xxx_ProtoFile_test_goTypes = []interface{}{
+var xxx_File_test_proto_enumTypes [4]protoreflect.EnumType
+var xxx_File_test_proto_messageTypes [30]protoimpl.MessageType
+var xxx_File_test_proto_goTypes = []interface{}{
(ForeignEnum)(0), // 0: goproto.proto.test.ForeignEnum
(TestReservedEnumFields)(0), // 1: goproto.proto.test.TestReservedEnumFields
(TestAllTypes_NestedEnum)(0), // 2: goproto.proto.test.TestAllTypes.NestedEnum
@@ -2779,7 +2779,7 @@
(*ImportMessage)(nil), // 34: goproto.proto.test.ImportMessage
(ImportEnum)(0), // 35: goproto.proto.test.ImportEnum
}
-var xxx_ProtoFile_test_depIdxs = []int32{
+var xxx_File_test_proto_depIdxs = []int32{
8, // goproto.proto.test.optional_int32_extension:extendee -> goproto.proto.test.TestAllExtensions
8, // goproto.proto.test.optional_int64_extension:extendee -> goproto.proto.test.TestAllExtensions
8, // goproto.proto.test.optional_uint32_extension:extendee -> goproto.proto.test.TestAllExtensions
@@ -2872,18 +2872,18 @@
func init() {
var messageTypes [30]protoreflect.MessageType
var extensionTypes [37]protoreflect.ExtensionType
- ProtoFile_test = protoimpl.FileBuilder{
- RawDescriptor: fileDescriptor_c161fcfdc0c3ff1e,
- GoTypes: xxx_ProtoFile_test_goTypes,
- DependencyIndexes: xxx_ProtoFile_test_depIdxs,
- EnumOutputTypes: xxx_ProtoFile_test_enumTypes[:],
+ File_test_proto = protoimpl.FileBuilder{
+ RawDescriptor: xxx_File_test_proto_rawdesc,
+ GoTypes: xxx_File_test_proto_goTypes,
+ DependencyIndexes: xxx_File_test_proto_depIdxs,
+ EnumOutputTypes: xxx_File_test_proto_enumTypes[:],
MessageOutputTypes: messageTypes[:],
ExtensionOutputTypes: extensionTypes[:],
}.Init()
- messageGoTypes := xxx_ProtoFile_test_goTypes[4:][:30]
+ messageGoTypes := xxx_File_test_proto_goTypes[4:][:30]
for i, mt := range messageTypes[:] {
- xxx_ProtoFile_test_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
- xxx_ProtoFile_test_messageTypes[i].PBType = mt
+ xxx_File_test_proto_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
+ xxx_File_test_proto_messageTypes[i].PBType = mt
}
E_OptionalInt32Extension.Type = extensionTypes[0]
E_OptionalInt64Extension.Type = extensionTypes[1]
@@ -2922,6 +2922,6 @@
E_RepeatedNestedMessageExtension.Type = extensionTypes[34]
E_RepeatedNestedEnumExtension.Type = extensionTypes[35]
E_TestNestedExtension_NestedStringExtension.Type = extensionTypes[36]
- xxx_ProtoFile_test_goTypes = nil
- xxx_ProtoFile_test_depIdxs = nil
+ xxx_File_test_proto_goTypes = nil
+ xxx_File_test_proto_depIdxs = nil
}
diff --git a/internal/testprotos/test/test_import.pb.go b/internal/testprotos/test/test_import.pb.go
index c0f25b3..71ac2fb 100644
--- a/internal/testprotos/test/test_import.pb.go
+++ b/internal/testprotos/test/test_import.pb.go
@@ -24,7 +24,7 @@
)
func (e ImportEnum) Type() protoreflect.EnumType {
- return xxx_ProtoFile_test_import_enumTypes[0]
+ return xxx_File_test_import_proto_enumTypes[0]
}
func (e ImportEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(e)
@@ -58,7 +58,7 @@
}
func (ImportEnum) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_89be98e26346f54e_gzipped, []int{0}
+ return xxx_File_test_import_proto_rawdesc_gzipped, []int{0}
}
type ImportMessage struct {
@@ -68,13 +68,13 @@
}
func (m *ImportMessage) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_import_messageTypes[0].MessageOf(m)
+ return xxx_File_test_import_proto_messageTypes[0].MessageOf(m)
}
func (m *ImportMessage) Reset() { *m = ImportMessage{} }
func (m *ImportMessage) String() string { return proto.CompactTextString(m) }
func (*ImportMessage) ProtoMessage() {}
func (*ImportMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_89be98e26346f54e_gzipped, []int{0}
+ return xxx_File_test_import_proto_rawdesc_gzipped, []int{0}
}
func (m *ImportMessage) XXX_Unmarshal(b []byte) error {
@@ -96,12 +96,12 @@
var xxx_messageInfo_ImportMessage proto.InternalMessageInfo
func init() {
- proto.RegisterFile("test_import.proto", fileDescriptor_89be98e26346f54e_gzipped)
+ proto.RegisterFile("test_import.proto", xxx_File_test_import_proto_rawdesc_gzipped)
proto.RegisterEnum("goproto.proto.test.ImportEnum", ImportEnum_name, ImportEnum_value)
proto.RegisterType((*ImportMessage)(nil), "goproto.proto.test.ImportMessage")
}
-var fileDescriptor_89be98e26346f54e = []byte{
+var xxx_File_test_import_proto_rawdesc = []byte{
// 145 bytes of the wire-encoded FileDescriptorProto
0x0a, 0x11, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
@@ -115,34 +115,34 @@
0x74,
}
-var fileDescriptor_89be98e26346f54e_gzipped = protoapi.CompressGZIP(fileDescriptor_89be98e26346f54e)
+var xxx_File_test_import_proto_rawdesc_gzipped = protoapi.CompressGZIP(xxx_File_test_import_proto_rawdesc)
const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
-var ProtoFile_test_import protoreflect.FileDescriptor
+var File_test_import_proto protoreflect.FileDescriptor
-var xxx_ProtoFile_test_import_enumTypes [1]protoreflect.EnumType
-var xxx_ProtoFile_test_import_messageTypes [1]protoimpl.MessageType
-var xxx_ProtoFile_test_import_goTypes = []interface{}{
+var xxx_File_test_import_proto_enumTypes [1]protoreflect.EnumType
+var xxx_File_test_import_proto_messageTypes [1]protoimpl.MessageType
+var xxx_File_test_import_proto_goTypes = []interface{}{
(ImportEnum)(0), // 0: goproto.proto.test.ImportEnum
(*ImportMessage)(nil), // 1: goproto.proto.test.ImportMessage
}
-var xxx_ProtoFile_test_import_depIdxs = []int32{}
+var xxx_File_test_import_proto_depIdxs = []int32{}
func init() {
var messageTypes [1]protoreflect.MessageType
- ProtoFile_test_import = protoimpl.FileBuilder{
- RawDescriptor: fileDescriptor_89be98e26346f54e,
- GoTypes: xxx_ProtoFile_test_import_goTypes,
- DependencyIndexes: xxx_ProtoFile_test_import_depIdxs,
- EnumOutputTypes: xxx_ProtoFile_test_import_enumTypes[:],
+ File_test_import_proto = protoimpl.FileBuilder{
+ RawDescriptor: xxx_File_test_import_proto_rawdesc,
+ GoTypes: xxx_File_test_import_proto_goTypes,
+ DependencyIndexes: xxx_File_test_import_proto_depIdxs,
+ EnumOutputTypes: xxx_File_test_import_proto_enumTypes[:],
MessageOutputTypes: messageTypes[:],
}.Init()
- messageGoTypes := xxx_ProtoFile_test_import_goTypes[1:][:1]
+ messageGoTypes := xxx_File_test_import_proto_goTypes[1:][:1]
for i, mt := range messageTypes[:] {
- xxx_ProtoFile_test_import_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
- xxx_ProtoFile_test_import_messageTypes[i].PBType = mt
+ xxx_File_test_import_proto_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
+ xxx_File_test_import_proto_messageTypes[i].PBType = mt
}
- xxx_ProtoFile_test_import_goTypes = nil
- xxx_ProtoFile_test_import_depIdxs = nil
+ xxx_File_test_import_proto_goTypes = nil
+ xxx_File_test_import_proto_depIdxs = nil
}
diff --git a/internal/testprotos/test/test_public.pb.go b/internal/testprotos/test/test_public.pb.go
index c75905d..f9bbf3a 100644
--- a/internal/testprotos/test/test_public.pb.go
+++ b/internal/testprotos/test/test_public.pb.go
@@ -24,13 +24,13 @@
}
func (m *PublicImportMessage) ProtoReflect() protoreflect.Message {
- return xxx_ProtoFile_test_public_messageTypes[0].MessageOf(m)
+ return xxx_File_test_public_proto_messageTypes[0].MessageOf(m)
}
func (m *PublicImportMessage) Reset() { *m = PublicImportMessage{} }
func (m *PublicImportMessage) String() string { return proto.CompactTextString(m) }
func (*PublicImportMessage) ProtoMessage() {}
func (*PublicImportMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_36dd44afd5b47374_gzipped, []int{0}
+ return xxx_File_test_public_proto_rawdesc_gzipped, []int{0}
}
func (m *PublicImportMessage) XXX_Unmarshal(b []byte) error {
@@ -52,11 +52,11 @@
var xxx_messageInfo_PublicImportMessage proto.InternalMessageInfo
func init() {
- proto.RegisterFile("test_public.proto", fileDescriptor_36dd44afd5b47374_gzipped)
+ proto.RegisterFile("test_public.proto", xxx_File_test_public_proto_rawdesc_gzipped)
proto.RegisterType((*PublicImportMessage)(nil), "goproto.proto.test.PublicImportMessage")
}
-var fileDescriptor_36dd44afd5b47374 = []byte{
+var xxx_File_test_public_proto_rawdesc = []byte{
// 120 bytes of the wire-encoded FileDescriptorProto
0x0a, 0x11, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x12, 0x12, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f,
@@ -68,31 +68,31 @@
0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
}
-var fileDescriptor_36dd44afd5b47374_gzipped = protoapi.CompressGZIP(fileDescriptor_36dd44afd5b47374)
+var xxx_File_test_public_proto_rawdesc_gzipped = protoapi.CompressGZIP(xxx_File_test_public_proto_rawdesc)
const _ = protoimpl.EnforceVersion(protoimpl.Version - 0)
-var ProtoFile_test_public protoreflect.FileDescriptor
+var File_test_public_proto protoreflect.FileDescriptor
-var xxx_ProtoFile_test_public_messageTypes [1]protoimpl.MessageType
-var xxx_ProtoFile_test_public_goTypes = []interface{}{
+var xxx_File_test_public_proto_messageTypes [1]protoimpl.MessageType
+var xxx_File_test_public_proto_goTypes = []interface{}{
(*PublicImportMessage)(nil), // 0: goproto.proto.test.PublicImportMessage
}
-var xxx_ProtoFile_test_public_depIdxs = []int32{}
+var xxx_File_test_public_proto_depIdxs = []int32{}
func init() {
var messageTypes [1]protoreflect.MessageType
- ProtoFile_test_public = protoimpl.FileBuilder{
- RawDescriptor: fileDescriptor_36dd44afd5b47374,
- GoTypes: xxx_ProtoFile_test_public_goTypes,
- DependencyIndexes: xxx_ProtoFile_test_public_depIdxs,
+ File_test_public_proto = protoimpl.FileBuilder{
+ RawDescriptor: xxx_File_test_public_proto_rawdesc,
+ GoTypes: xxx_File_test_public_proto_goTypes,
+ DependencyIndexes: xxx_File_test_public_proto_depIdxs,
MessageOutputTypes: messageTypes[:],
}.Init()
- messageGoTypes := xxx_ProtoFile_test_public_goTypes[0:][:1]
+ messageGoTypes := xxx_File_test_public_proto_goTypes[0:][:1]
for i, mt := range messageTypes[:] {
- xxx_ProtoFile_test_public_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
- xxx_ProtoFile_test_public_messageTypes[i].PBType = mt
+ xxx_File_test_public_proto_messageTypes[i].GoType = reflect.TypeOf(messageGoTypes[i])
+ xxx_File_test_public_proto_messageTypes[i].PBType = mt
}
- xxx_ProtoFile_test_public_goTypes = nil
- xxx_ProtoFile_test_public_depIdxs = nil
+ xxx_File_test_public_proto_goTypes = nil
+ xxx_File_test_public_proto_depIdxs = nil
}
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
}