cmd/protoc-gen-go: replicate v1 generator behavior for MessageSet extensions
Given:
package foo
extend proto2.bridge.MessageSet {
optional Message message_set_extension = 100;
}
Register the extension as a message set extension and give it the name
"foo.".
We really shouldn't do this in this case; the special-case treatment of
extensions to MessageSet is only for extensions nested in a parent
message. However, this is consistent with the behavior of the v1 generator.
Match that for now.
Change-Id: I919c409605a197904fd3227efc920192d484f431
Reviewed-on: https://go-review.googlesource.com/c/145957
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go
index 96b27fb..b5b6655 100644
--- a/cmd/protoc-gen-go/internal_gengo/main.go
+++ b/cmd/protoc-gen-go/internal_gengo/main.go
@@ -824,8 +824,8 @@
// differently in other languages:
// https://github.com/google/protobuf/blob/aff10976/src/google/protobuf/text_format.cc#L1560
name := extension.Desc.FullName()
- if isExtensionMessageSetElement(gen, extension) {
- name = name.Parent()
+ if n, ok := isExtensionMessageSetElement(extension); ok {
+ name = n
}
g.P("var ", extensionVar(f.File, extension), " = &", protogen.GoIdent{
@@ -846,10 +846,27 @@
g.P()
}
-func isExtensionMessageSetElement(gen *protogen.Plugin, extension *protogen.Extension) bool {
- return extension.ParentMessage != nil &&
- extension.ExtendedType.Desc.Options().(*descpb.MessageOptions).GetMessageSetWireFormat() &&
- extension.Desc.Name() == "message_set_extension"
+// isExtensionMessageSetELement returns the adjusted name of an extension
+// which extends proto2.bridge.MessageSet.
+func isExtensionMessageSetElement(extension *protogen.Extension) (name protoreflect.FullName, ok bool) {
+ opts := extension.ExtendedType.Desc.Options().(*descpb.MessageOptions)
+ if !opts.GetMessageSetWireFormat() || extension.Desc.Name() != "message_set_extension" {
+ return "", false
+ }
+ if extension.ParentMessage == nil {
+ // This case shouldn't be given special handling at all--we're
+ // only supposed to drop the ".message_set_extension" for
+ // extensions defined within a message (i.e., the extension
+ // takes the message's name).
+ //
+ // This matches the behavior of the v1 generator, however.
+ //
+ // TODO: See if we can drop this case.
+ name = extension.Desc.FullName()
+ name = name[:len(name)-len("message_set_extension")]
+ return name, true
+ }
+ return extension.Desc.FullName().Parent(), true
}
// extensionVar returns the var holding the ExtensionDesc for an extension.
@@ -928,7 +945,7 @@
GoImportPath: protoPackage,
GoName: "RegisterExtension",
}, "(", extensionVar(f.File, extension), ")")
- if isExtensionMessageSetElement(gen, extension) {
+ if name, ok := isExtensionMessageSetElement(extension); ok {
goType, pointer := fieldGoType(g, extension)
if pointer {
goType = "*" + goType
@@ -936,7 +953,7 @@
g.P(protogen.GoIdent{
GoImportPath: protoPackage,
GoName: "RegisterMessageSetType",
- }, "((", goType, ")(nil), ", extension.Desc.Number(), ",", strconv.Quote(string(extension.Desc.FullName().Parent())), ")")
+ }, "((", goType, ")(nil), ", extension.Desc.Number(), ",", strconv.Quote(string(name)), ")")
}
}
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
index e205a86..4170822 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
@@ -734,6 +734,15 @@
Filename: "extensions/ext/ext.proto",
}
+var E_MessageSetExtension = &proto.ExtensionDesc{
+ ExtendedType: (*base.MessageSetWireFormatMessage)(nil),
+ ExtensionType: (*MessageSetWireFormatExtension)(nil),
+ Field: 101,
+ Name: "goproto.protoc.extension.ext.",
+ Tag: "bytes,101,opt,name=message_set_extension",
+ Filename: "extensions/ext/ext.proto",
+}
+
func init() {
proto.RegisterEnum("goproto.protoc.extension.ext.Enum", Enum_name, Enum_value)
proto.RegisterType((*Message)(nil), "goproto.protoc.extension.ext.Message")
@@ -788,80 +797,82 @@
proto.RegisterExtension(E_Repeatedgroup)
proto.RegisterExtension(E_ExtendableField)
proto.RegisterExtension(E_ExtendableStringField)
+ proto.RegisterExtension(E_MessageSetExtension)
+ proto.RegisterMessageSetType((*MessageSetWireFormatExtension)(nil), 101, "goproto.protoc.extension.ext.")
}
func init() { proto.RegisterFile("extensions/ext/ext.proto", fileDescriptor_bf470ef4907b23cb) }
var fileDescriptor_bf470ef4907b23cb = []byte{
- // 1111 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0xcb, 0x6e, 0xdb, 0x46,
+ // 1120 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0xcb, 0x6e, 0xdb, 0x46,
0x14, 0x86, 0x3b, 0x92, 0x12, 0x2b, 0x53, 0xcb, 0x96, 0x18, 0x24, 0x15, 0x04, 0x17, 0x18, 0x08,
0x28, 0x32, 0x75, 0x1b, 0x09, 0x60, 0x05, 0x01, 0x65, 0x77, 0x46, 0xed, 0xc0, 0x0b, 0xa1, 0x28,
0x0d, 0xc3, 0x4e, 0xba, 0x60, 0x29, 0x73, 0xc4, 0xb0, 0x95, 0x48, 0x97, 0x97, 0x44, 0x5d, 0x34,
0x10, 0xfa, 0x04, 0x7d, 0x8f, 0xa2, 0xf7, 0x5b, 0x7a, 0xdf, 0xb6, 0x8b, 0x6e, 0xfa, 0x44, 0xc1,
- 0xcc, 0xf0, 0x32, 0xa4, 0x64, 0x59, 0xc3, 0x85, 0x04, 0x72, 0x48, 0x7d, 0xe7, 0xf0, 0x3f, 0x47,
- 0xfc, 0x0f, 0x09, 0xdb, 0x64, 0x1e, 0x12, 0x37, 0x70, 0x3c, 0x37, 0xe8, 0x93, 0x79, 0x48, 0x3f,
- 0xbd, 0x4b, 0xdf, 0x0b, 0x3d, 0x65, 0xcf, 0xf6, 0xd8, 0x06, 0xdf, 0xbd, 0xe8, 0xa5, 0x27, 0xd2,
- 0xad, 0x4e, 0x47, 0xf8, 0xdd, 0xd8, 0x0c, 0x08, 0xfb, 0xe2, 0xa7, 0x76, 0xf6, 0xf2, 0x4c, 0xdf,
- 0xe4, 0xdf, 0xfc, 0x68, 0xb7, 0x0b, 0xb7, 0x46, 0x24, 0x08, 0x4c, 0x9b, 0x28, 0x0a, 0xac, 0x59,
- 0x66, 0x68, 0xb6, 0x01, 0x02, 0x78, 0x5b, 0x67, 0xdb, 0x9d, 0x2a, 0x04, 0xa3, 0xee, 0xdb, 0x70,
- 0xe7, 0x30, 0x61, 0x3c, 0xf0, 0xbd, 0xe8, 0x52, 0xb9, 0x07, 0x77, 0x53, 0xaa, 0x61, 0xd3, 0xa5,
- 0xf6, 0x1c, 0x01, 0x7c, 0x4b, 0xdf, 0x21, 0xb9, 0x13, 0xbb, 0xff, 0x57, 0x60, 0x93, 0xfd, 0xd6,
- 0x72, 0x5c, 0x3b, 0x0e, 0xd4, 0xd9, 0x83, 0x9d, 0xe2, 0xda, 0x49, 0x34, 0x9e, 0xf1, 0x2d, 0x95,
- 0xc4, 0x2a, 0xd0, 0xa3, 0x46, 0xbc, 0x68, 0x04, 0xa1, 0xef, 0xb8, 0xb6, 0xb2, 0xdf, 0xbb, 0x52,
- 0x06, 0x76, 0xc5, 0x07, 0x66, 0x40, 0x62, 0x62, 0xfb, 0x1f, 0xc0, 0x32, 0xba, 0x4b, 0x8a, 0xa1,
- 0x18, 0x4a, 0x7d, 0x0e, 0xe0, 0xde, 0x8a, 0x38, 0x69, 0x1e, 0x52, 0xb1, 0xfe, 0xa5, 0xb1, 0x5e,
- 0x56, 0x8f, 0x7b, 0xeb, 0xaa, 0xd4, 0x2b, 0x5e, 0x74, 0xef, 0x6a, 0x15, 0xf4, 0x0e, 0xb9, 0xf2,
- 0x58, 0x57, 0x83, 0x0d, 0x9d, 0x5c, 0x12, 0x33, 0x24, 0x16, 0x2f, 0xc7, 0xeb, 0xb0, 0xe9, 0xc7,
- 0x0b, 0xc6, 0x3c, 0xae, 0xc7, 0xdf, 0x15, 0x54, 0xa5, 0x05, 0x49, 0x0e, 0x9c, 0xf3, 0x82, 0xdc,
- 0x85, 0x90, 0x47, 0x35, 0xc7, 0x53, 0xb2, 0x5f, 0xaf, 0x83, 0xe6, 0x62, 0xb1, 0x58, 0x54, 0xba,
- 0xff, 0x01, 0xf8, 0x6a, 0x12, 0x89, 0x84, 0x67, 0x8e, 0x4f, 0x8e, 0x3c, 0x7f, 0x66, 0x86, 0x69,
- 0xe1, 0xd5, 0x2f, 0x01, 0xbc, 0x93, 0xca, 0x44, 0x42, 0x23, 0xbd, 0x36, 0x45, 0xbb, 0x46, 0xa9,
- 0x55, 0xdc, 0x44, 0x39, 0x8b, 0x09, 0xf7, 0xce, 0x7a, 0xe1, 0xd6, 0x26, 0xa6, 0xdf, 0x9e, 0xa5,
- 0x87, 0xd3, 0xc5, 0xfd, 0x26, 0xac, 0x1d, 0xba, 0xd1, 0x4c, 0xa9, 0xc3, 0xda, 0xa3, 0x43, 0xfd,
- 0xbd, 0xe6, 0x4b, 0xda, 0xfb, 0x30, 0x6b, 0x4e, 0x63, 0xec, 0x79, 0x53, 0xa9, 0x0a, 0x13, 0x04,
- 0x70, 0x5d, 0x6f, 0xa4, 0x67, 0x1c, 0x78, 0xde, 0x54, 0x8b, 0x44, 0x24, 0xa1, 0xe1, 0x64, 0x90,
- 0x13, 0x04, 0xf0, 0x8e, 0xda, 0xbd, 0xa6, 0x67, 0xdc, 0x68, 0x26, 0x84, 0xa5, 0xbb, 0xda, 0x89,
- 0xf8, 0xef, 0x73, 0xdc, 0xf0, 0x2d, 0x55, 0x2a, 0xae, 0x8d, 0x00, 0xbe, 0x21, 0xfc, 0x53, 0x8f,
- 0x29, 0x41, 0x3b, 0x85, 0xcd, 0x0c, 0x1a, 0xc8, 0x53, 0x1f, 0x23, 0x80, 0x5b, 0x7a, 0x96, 0xd8,
- 0x89, 0xb3, 0x8c, 0x8d, 0xe4, 0xb1, 0x0e, 0x02, 0xb8, 0x21, 0x60, 0x4f, 0x39, 0xb6, 0x28, 0xc1,
- 0x70, 0x20, 0x45, 0xfd, 0x08, 0x01, 0x5c, 0xcd, 0x4b, 0x30, 0x1c, 0x2c, 0x4b, 0x20, 0x49, 0xfd,
- 0x18, 0x01, 0xac, 0x14, 0x24, 0x28, 0x62, 0x23, 0x79, 0xec, 0x14, 0x01, 0x5c, 0x2b, 0x48, 0x30,
- 0x1c, 0x68, 0x0f, 0xa1, 0x22, 0x64, 0x3b, 0x71, 0xe6, 0xc4, 0x92, 0xd4, 0x76, 0x86, 0x00, 0xde,
- 0xd5, 0x5b, 0x59, 0xbe, 0x31, 0x44, 0x3b, 0x83, 0xd9, 0xa2, 0x51, 0x86, 0xec, 0x22, 0x80, 0xb7,
- 0xf4, 0xec, 0xb2, 0x8f, 0x62, 0x70, 0xae, 0x6c, 0x93, 0xa9, 0x67, 0x86, 0x52, 0x58, 0x0f, 0x01,
- 0x5c, 0x11, 0xca, 0x76, 0x44, 0x09, 0xab, 0x84, 0x90, 0x54, 0xf8, 0x12, 0x01, 0xdc, 0x5c, 0x12,
- 0x62, 0x38, 0x58, 0x21, 0x84, 0x24, 0xf9, 0x13, 0x04, 0xf0, 0xcd, 0xa2, 0x10, 0xc5, 0x9e, 0xb0,
- 0xbc, 0x68, 0x3c, 0x95, 0x33, 0x1c, 0x1f, 0x01, 0x0c, 0x84, 0x9e, 0x78, 0x97, 0x21, 0x0a, 0x1d,
- 0x2c, 0xef, 0x99, 0x01, 0xb3, 0x4c, 0xa1, 0x83, 0x19, 0x22, 0x5f, 0xb6, 0xf1, 0xa7, 0x21, 0x09,
- 0xa4, 0xa8, 0x21, 0x1b, 0x28, 0xb2, 0xb2, 0x1d, 0x50, 0x82, 0xf6, 0x4c, 0xd4, 0x76, 0x54, 0xc2,
- 0x74, 0x23, 0x66, 0x1d, 0xaf, 0x6d, 0x64, 0x1d, 0x42, 0x09, 0xe2, 0x15, 0xed, 0x73, 0x20, 0xf6,
- 0x4d, 0xbc, 0x3a, 0x92, 0xca, 0xe0, 0x09, 0xcb, 0xe0, 0xde, 0x46, 0x19, 0xf4, 0x46, 0x42, 0x83,
- 0x25, 0xd1, 0xb4, 0x05, 0x10, 0x2c, 0x84, 0x19, 0xb7, 0x54, 0x02, 0x4f, 0x11, 0xc0, 0x50, 0x7d,
- 0x73, 0x83, 0xb1, 0x23, 0x1d, 0xc9, 0xf4, 0x42, 0x3c, 0xed, 0x33, 0xd8, 0x60, 0x03, 0xa1, 0x51,
- 0x66, 0xf0, 0xb9, 0xc5, 0x14, 0x58, 0x9f, 0x80, 0x6f, 0xd2, 0x14, 0x7c, 0x33, 0x29, 0xc5, 0x36,
- 0x11, 0xf6, 0x68, 0x6f, 0x09, 0xb3, 0x8b, 0xb4, 0x2f, 0x7f, 0x45, 0xc7, 0x9c, 0xba, 0xde, 0x48,
- 0xc7, 0x1c, 0x66, 0xcc, 0x4f, 0x73, 0x50, 0x69, 0x67, 0xfe, 0x9a, 0x42, 0x37, 0xb4, 0xe6, 0x34,
- 0x30, 0xb3, 0xe6, 0xd3, 0xdc, 0x24, 0x26, 0x6f, 0x77, 0xdf, 0xd0, 0xc8, 0x37, 0x84, 0xa9, 0x8d,
- 0x9b, 0xf3, 0x19, 0x6c, 0x09, 0xd8, 0x12, 0xee, 0xfc, 0x2d, 0xe5, 0xb6, 0xf4, 0x54, 0x95, 0xf3,
- 0xd8, 0x9e, 0xf3, 0xe0, 0x12, 0xfe, 0xfc, 0x1d, 0x05, 0x37, 0x04, 0xf0, 0x69, 0xea, 0xfb, 0x79,
- 0x21, 0x24, 0x6f, 0x9c, 0xdf, 0x53, 0x6e, 0x35, 0x2f, 0x04, 0xbf, 0x21, 0x17, 0x84, 0x90, 0xe4,
- 0xfe, 0x40, 0xb9, 0x4a, 0x41, 0x88, 0x25, 0x70, 0x09, 0x97, 0xfe, 0x91, 0x82, 0x6b, 0x05, 0x21,
- 0x86, 0x03, 0xed, 0x03, 0x78, 0x5b, 0xcc, 0xb8, 0x8c, 0x9b, 0xfe, 0x44, 0xd1, 0xbb, 0x7a, 0x2b,
- 0xcb, 0x39, 0x31, 0xea, 0x87, 0x50, 0x11, 0xe0, 0x65, 0xd8, 0x3f, 0x53, 0xf6, 0x96, 0x9e, 0x16,
- 0xeb, 0x3c, 0xb1, 0xea, 0x7c, 0x01, 0xe5, 0xbd, 0xfa, 0x17, 0x0a, 0xae, 0x08, 0x05, 0xe4, 0x66,
- 0xbd, 0x4a, 0x0e, 0x49, 0xa5, 0x9f, 0x53, 0x72, 0x73, 0x49, 0x0e, 0x3e, 0x12, 0x15, 0xe5, 0x90,
- 0x64, 0xff, 0x4a, 0xd9, 0x37, 0x8b, 0x72, 0x2c, 0xf5, 0x47, 0x09, 0xc7, 0xfe, 0x8d, 0x92, 0x81,
- 0xd0, 0x1f, 0xb1, 0x65, 0x17, 0x3a, 0x5a, 0xde, 0xb3, 0x7f, 0xe7, 0x0f, 0x7a, 0x42, 0x47, 0x73,
- 0xd3, 0xce, 0x17, 0x50, 0xde, 0xb5, 0xff, 0xa0, 0xdc, 0x6d, 0xa1, 0x80, 0xdc, 0xb6, 0x17, 0x20,
- 0x27, 0x72, 0x19, 0xe3, 0xfe, 0x93, 0x92, 0x37, 0x77, 0xee, 0x34, 0x81, 0xc4, 0x32, 0x9e, 0xc1,
- 0xf4, 0xae, 0x2b, 0x6f, 0x99, 0x7f, 0xd1, 0xe0, 0x50, 0x7d, 0x63, 0x7d, 0xf0, 0xdc, 0xf3, 0xb5,
- 0x9e, 0x0f, 0x47, 0x25, 0xe0, 0xe3, 0x04, 0x7b, 0x88, 0x36, 0x26, 0x0e, 0x99, 0x5a, 0x52, 0x39,
- 0x7c, 0x51, 0x65, 0xb6, 0x89, 0x37, 0x79, 0x5d, 0x40, 0x43, 0xc4, 0x13, 0x19, 0xdb, 0x3e, 0xa2,
- 0xd1, 0xb4, 0x0f, 0xe1, 0x2b, 0x42, 0x06, 0xbc, 0x6b, 0xe2, 0x44, 0x36, 0xa6, 0xb6, 0xf9, 0x0b,
- 0x92, 0x3b, 0x19, 0x88, 0x77, 0x0e, 0x8b, 0x70, 0x70, 0xfc, 0xe8, 0x81, 0xed, 0x84, 0x8f, 0xa3,
- 0x71, 0xef, 0xc2, 0x9b, 0xf5, 0x6d, 0x6f, 0x6a, 0xba, 0x76, 0x9f, 0x11, 0xc7, 0xd1, 0xa4, 0xff,
- 0x44, 0xed, 0x5f, 0xcc, 0x2c, 0xbe, 0x7f, 0x71, 0xdf, 0x26, 0xee, 0x7d, 0xdb, 0xeb, 0x87, 0x24,
- 0x08, 0x2d, 0x33, 0x64, 0x2f, 0x98, 0x84, 0x37, 0x4e, 0x2f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc4,
- 0xeb, 0x05, 0x33, 0xd6, 0x12, 0x00, 0x00,
+ 0xcc, 0xf0, 0x32, 0xa4, 0x64, 0x45, 0x43, 0x20, 0x0b, 0x09, 0xe4, 0x90, 0xfa, 0xce, 0xe1, 0x7f,
+ 0x8e, 0xf8, 0x1f, 0x12, 0xb6, 0xc9, 0x3c, 0x24, 0x6e, 0xe0, 0x78, 0x6e, 0xd0, 0x27, 0xf3, 0x90,
+ 0x7e, 0x7a, 0x97, 0xbe, 0x17, 0x7a, 0xca, 0x9e, 0xed, 0xb1, 0x0d, 0xbe, 0x7b, 0xd1, 0x4b, 0x4f,
+ 0xa4, 0x5b, 0x9d, 0x8e, 0xf0, 0xbb, 0xb1, 0x19, 0x10, 0xf6, 0xc5, 0x4f, 0xed, 0xec, 0xe5, 0x99,
+ 0xbe, 0xc9, 0xbf, 0xf9, 0xd1, 0x6e, 0x17, 0x6e, 0x8d, 0x48, 0x10, 0x98, 0x36, 0x51, 0x14, 0x58,
+ 0xb3, 0xcc, 0xd0, 0x6c, 0x03, 0x04, 0xf0, 0xb6, 0xce, 0xb6, 0x3b, 0x55, 0x08, 0x46, 0xdd, 0xb7,
+ 0xe1, 0xce, 0x61, 0xc2, 0xb8, 0xe7, 0x7b, 0xd1, 0xa5, 0x72, 0x07, 0xee, 0xa6, 0x54, 0xc3, 0xa6,
+ 0x4b, 0xed, 0x39, 0x02, 0xf8, 0x86, 0xbe, 0x43, 0x72, 0x27, 0x76, 0xff, 0xaf, 0xc0, 0x26, 0xfb,
+ 0xad, 0xe5, 0xb8, 0x76, 0x1c, 0xa8, 0xb3, 0x07, 0x3b, 0xc5, 0xb5, 0x93, 0x68, 0x3c, 0xe3, 0x5b,
+ 0x2a, 0x89, 0x55, 0xa0, 0x47, 0x8d, 0x78, 0xd1, 0x08, 0x42, 0xdf, 0x71, 0x6d, 0x65, 0xbf, 0x77,
+ 0xa5, 0x0c, 0xec, 0x8a, 0x0f, 0xcc, 0x80, 0xc4, 0xc4, 0xf6, 0x3f, 0x80, 0x65, 0x74, 0x9b, 0x14,
+ 0x43, 0x31, 0x94, 0xfa, 0x14, 0xc0, 0xbd, 0x15, 0x71, 0xd2, 0x3c, 0xa4, 0x62, 0xfd, 0x4b, 0x63,
+ 0xbd, 0xac, 0x1e, 0xf7, 0xd6, 0x55, 0xa9, 0x57, 0xbc, 0xe8, 0xde, 0xd5, 0x2a, 0xe8, 0x1d, 0x72,
+ 0xe5, 0xb1, 0xae, 0x06, 0x1b, 0x3a, 0xb9, 0x24, 0x66, 0x48, 0x2c, 0x5e, 0x8e, 0xd7, 0x61, 0xd3,
+ 0x8f, 0x17, 0x8c, 0x79, 0x5c, 0x8f, 0xbf, 0x2b, 0xa8, 0x4a, 0x0b, 0x92, 0x1c, 0x38, 0xe7, 0x05,
+ 0xb9, 0x0d, 0x21, 0x8f, 0x6a, 0x8e, 0xa7, 0x64, 0xbf, 0x5e, 0x07, 0xcd, 0xc5, 0x62, 0xb1, 0xa8,
+ 0x74, 0xff, 0x03, 0xf0, 0xd5, 0x24, 0x12, 0x09, 0xcf, 0x1c, 0x9f, 0x1c, 0x79, 0xfe, 0xcc, 0x0c,
+ 0xd3, 0xc2, 0xab, 0x5f, 0x02, 0x78, 0x2b, 0x95, 0x89, 0x84, 0x46, 0x7a, 0x6d, 0x8a, 0xf6, 0x1c,
+ 0xa5, 0x56, 0x71, 0x13, 0xe5, 0x2c, 0x26, 0xdc, 0x3b, 0xeb, 0x85, 0x5b, 0x9b, 0x98, 0x7e, 0x73,
+ 0x96, 0x1e, 0x4e, 0x17, 0xf7, 0x9b, 0xb0, 0x76, 0xe8, 0x46, 0x33, 0xa5, 0x0e, 0x6b, 0x0f, 0x0e,
+ 0xf5, 0xf7, 0x9a, 0x2f, 0x69, 0xef, 0xc3, 0xac, 0x39, 0x8d, 0xb1, 0xe7, 0x4d, 0xa5, 0x2a, 0x4c,
+ 0x10, 0xc0, 0x75, 0xbd, 0x91, 0x9e, 0x71, 0xe0, 0x79, 0x53, 0x2d, 0x12, 0x91, 0x84, 0x86, 0x93,
+ 0x41, 0x4e, 0x10, 0xc0, 0x3b, 0x6a, 0xf7, 0x39, 0x3d, 0xe3, 0x46, 0x33, 0x21, 0x2c, 0xdd, 0xd5,
+ 0x4e, 0xc4, 0x7f, 0x9f, 0xe3, 0x86, 0x6f, 0xa9, 0x52, 0x71, 0x6d, 0x04, 0xf0, 0x35, 0xe1, 0x9f,
+ 0x7a, 0x4c, 0x09, 0xda, 0x29, 0x6c, 0x66, 0xd0, 0x40, 0x9e, 0xfa, 0x10, 0x01, 0xdc, 0xd2, 0xb3,
+ 0xc4, 0x4e, 0x9c, 0x65, 0x6c, 0x24, 0x8f, 0x75, 0x10, 0xc0, 0x0d, 0x01, 0x7b, 0xca, 0xb1, 0x45,
+ 0x09, 0x86, 0x03, 0x29, 0xea, 0x47, 0x08, 0xe0, 0x6a, 0x5e, 0x82, 0xe1, 0x60, 0x59, 0x02, 0x49,
+ 0xea, 0xc7, 0x08, 0x60, 0xa5, 0x20, 0x41, 0x11, 0x1b, 0xc9, 0x63, 0xa7, 0x08, 0xe0, 0x5a, 0x41,
+ 0x82, 0xe1, 0x40, 0xbb, 0x0f, 0x15, 0x21, 0xdb, 0x89, 0x33, 0x27, 0x96, 0xa4, 0xb6, 0x33, 0x04,
+ 0xf0, 0xae, 0xde, 0xca, 0xf2, 0x8d, 0x21, 0xda, 0x19, 0xcc, 0x16, 0x8d, 0x32, 0x64, 0x17, 0x01,
+ 0xbc, 0xa5, 0x67, 0x97, 0x7d, 0x14, 0x83, 0x73, 0x65, 0x9b, 0x4c, 0x3d, 0x33, 0x94, 0xc2, 0x7a,
+ 0x08, 0xe0, 0x8a, 0x50, 0xb6, 0x23, 0x4a, 0x58, 0x25, 0x84, 0xa4, 0xc2, 0x97, 0x08, 0xe0, 0xe6,
+ 0x92, 0x10, 0xc3, 0xc1, 0x0a, 0x21, 0x24, 0xc9, 0x9f, 0x20, 0x80, 0xaf, 0x17, 0x85, 0x28, 0xf6,
+ 0x84, 0xe5, 0x45, 0xe3, 0xa9, 0x9c, 0xe1, 0xf8, 0x08, 0x60, 0x20, 0xf4, 0xc4, 0xbb, 0x0c, 0x51,
+ 0xe8, 0x60, 0x79, 0xcf, 0x0c, 0x98, 0x65, 0x0a, 0x1d, 0xcc, 0x10, 0xf9, 0xb2, 0x8d, 0x3f, 0x0d,
+ 0x49, 0x20, 0x45, 0x0d, 0xd9, 0x40, 0x91, 0x95, 0xed, 0x80, 0x12, 0xb4, 0x27, 0xa2, 0xb6, 0xa3,
+ 0x12, 0xa6, 0x1b, 0x31, 0xeb, 0x78, 0x6d, 0x23, 0xeb, 0x10, 0x4a, 0x10, 0xaf, 0x68, 0x9f, 0x03,
+ 0xb1, 0x6f, 0xe2, 0xd5, 0x91, 0x54, 0x06, 0x8f, 0x58, 0x06, 0x77, 0x36, 0xca, 0xa0, 0x37, 0x12,
+ 0x1a, 0x2c, 0x89, 0xa6, 0x2d, 0x80, 0x60, 0x21, 0xcc, 0xb8, 0xa5, 0x12, 0x78, 0x8c, 0x00, 0x86,
+ 0xea, 0x9b, 0x1b, 0x8c, 0x1d, 0xe9, 0x48, 0xa6, 0x17, 0xe2, 0x69, 0x9f, 0xc1, 0x06, 0x1b, 0x08,
+ 0x8d, 0x32, 0x83, 0xcf, 0x0d, 0xa6, 0xc0, 0xfa, 0x04, 0x7c, 0x93, 0xa6, 0xe0, 0x9b, 0x49, 0x29,
+ 0xb6, 0x89, 0xb0, 0x47, 0x7b, 0x4b, 0x98, 0x5d, 0xa4, 0x7d, 0xf9, 0x2b, 0x3a, 0xe6, 0xd4, 0xf5,
+ 0x46, 0x3a, 0xe6, 0x30, 0x63, 0x7e, 0x9c, 0x83, 0x4a, 0x3b, 0xf3, 0xd7, 0x14, 0xba, 0xa1, 0x35,
+ 0xa7, 0x81, 0x99, 0x35, 0x9f, 0xe6, 0x26, 0x31, 0x79, 0xbb, 0xfb, 0x86, 0x46, 0xbe, 0x26, 0x4c,
+ 0x6d, 0xdc, 0x9c, 0xcf, 0x60, 0x4b, 0xc0, 0x96, 0x70, 0xe7, 0x6f, 0x29, 0xb7, 0xa5, 0xa7, 0xaa,
+ 0x9c, 0xc7, 0xf6, 0x9c, 0x07, 0x97, 0xf0, 0xe7, 0xef, 0x28, 0xb8, 0x21, 0x80, 0x4f, 0x53, 0xdf,
+ 0xcf, 0x0b, 0x21, 0x79, 0xe3, 0xfc, 0x9e, 0x72, 0xab, 0x79, 0x21, 0xf8, 0x0d, 0xb9, 0x20, 0x84,
+ 0x24, 0xf7, 0x07, 0xca, 0x55, 0x0a, 0x42, 0x2c, 0x81, 0x4b, 0xb8, 0xf4, 0x8f, 0x14, 0x5c, 0x2b,
+ 0x08, 0x31, 0x1c, 0x68, 0x1f, 0xc0, 0x9b, 0x62, 0xc6, 0x65, 0xdc, 0xf4, 0x27, 0x8a, 0xde, 0xd5,
+ 0x5b, 0x59, 0xce, 0x89, 0x51, 0xdf, 0x87, 0x8a, 0x00, 0x2f, 0xc3, 0xfe, 0x99, 0xb2, 0xb7, 0xf4,
+ 0xb4, 0x58, 0xe7, 0x89, 0x55, 0xe7, 0x0b, 0x28, 0xef, 0xd5, 0xbf, 0x50, 0x70, 0x45, 0x28, 0x20,
+ 0x37, 0xeb, 0x55, 0x72, 0x48, 0x2a, 0xfd, 0x94, 0x92, 0x9b, 0x4b, 0x72, 0xf0, 0x91, 0xa8, 0x28,
+ 0x87, 0x24, 0xfb, 0x57, 0xca, 0xbe, 0x5e, 0x94, 0x63, 0xa9, 0x3f, 0x4a, 0x38, 0xf6, 0x6f, 0x94,
+ 0x0c, 0x84, 0xfe, 0x88, 0x2d, 0xbb, 0xd0, 0xd1, 0xf2, 0x9e, 0xfd, 0x3b, 0x7f, 0xd0, 0x13, 0x3a,
+ 0x9a, 0x9b, 0x76, 0xbe, 0x80, 0xf2, 0xae, 0xfd, 0x07, 0xe5, 0x6e, 0x0b, 0x05, 0xe4, 0xb6, 0xbd,
+ 0x00, 0x39, 0x91, 0xcb, 0x18, 0xf7, 0x9f, 0x94, 0xbc, 0xb9, 0x73, 0xa7, 0x09, 0x24, 0x96, 0xf1,
+ 0x04, 0xa6, 0x77, 0x5d, 0x79, 0xcb, 0xfc, 0x8b, 0x06, 0x87, 0xea, 0x1b, 0xeb, 0x83, 0xe7, 0x9e,
+ 0xaf, 0xf5, 0x7c, 0x38, 0x2a, 0x01, 0x1f, 0x27, 0xd8, 0x43, 0xb4, 0x31, 0x71, 0xc8, 0xd4, 0x92,
+ 0xca, 0xe1, 0x8b, 0x2a, 0xb3, 0x4d, 0xbc, 0xc9, 0xeb, 0x02, 0x1a, 0x22, 0x9e, 0xc8, 0xd8, 0xf6,
+ 0x11, 0x8d, 0xa6, 0x7d, 0x08, 0x5f, 0x11, 0x32, 0xe0, 0x5d, 0x13, 0x27, 0xb2, 0x31, 0xb5, 0xcd,
+ 0x5f, 0x90, 0xdc, 0xca, 0x40, 0xbc, 0x73, 0x78, 0x84, 0x17, 0xf3, 0xb8, 0x4f, 0x5e, 0xcc, 0xe3,
+ 0xfe, 0xc1, 0xf1, 0x83, 0x7b, 0xb6, 0x13, 0x3e, 0x8c, 0xc6, 0xbd, 0x0b, 0x6f, 0xd6, 0xb7, 0xbd,
+ 0xa9, 0xe9, 0xda, 0x7d, 0x06, 0x1f, 0x47, 0x93, 0xfe, 0x23, 0xb5, 0x7f, 0x31, 0xb3, 0xf8, 0xfe,
+ 0xc5, 0x5d, 0x9b, 0xb8, 0x77, 0x6d, 0xaf, 0x1f, 0x92, 0x20, 0xb4, 0xcc, 0x90, 0xbd, 0x0e, 0x13,
+ 0xde, 0x8f, 0x3d, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x33, 0x5c, 0xd7, 0x84, 0x13, 0x00, 0x00,
}
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
index 0bb263a..9997a84 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
@@ -101,3 +101,8 @@
optional MessageSetWireFormatExtension message_set_extension = 100;
}
}
+
+// Message set extension, not nested in a message.
+extend goproto.protoc.extension.base.MessageSetWireFormatMessage {
+ optional MessageSetWireFormatExtension message_set_extension = 101;
+}