protobuf: fix handling of delimited extensions in editions

Change-Id: I5207e3e1d51e55147a7ec8374548aeb6a5312172 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/595337 Reviewed-by: Lasse Folger <[email protected]> Reviewed-by: Michael Stapelberg <[email protected]> Auto-Submit: Michael Stapelberg <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
protocolbuffers · Jul 2, 2024 · eea33cd · eea33cd
1 parent d462176
commit eea33cd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/internal/testprotos/conformance/editions/test_messages_edition2023.pb.go b/internal/testprotos/conformance/editions/test_messages_edition2023.pb.go
diff --git a/internal/testprotos/conformance/editionsmigration/test_messages_proto2_editions.pb.go b/internal/testprotos/conformance/editionsmigration/test_messages_proto2_editions.pb.go
diff --git a/internal/testprotos/testeditions/test_extension.pb.go b/internal/testprotos/testeditions/test_extension.pb.go
diff --git a/reflect/protodesc/desc_init.go b/reflect/protodesc/desc_init.go
@@ -214,6 +214,9 @@ func (r descsByName) initExtensionDeclarations(xds []*descriptorpb.FieldDescript
 		if xd.JsonName != nil {
 			x.L2.StringName.InitJSON(xd.GetJsonName())
 		}
+		if x.L1.Kind == protoreflect.MessageKind && x.L1.EditionFeatures.IsDelimitedEncoded {
+			x.L1.Kind = protoreflect.GroupKind
+		}
 	}
 	return xs, nil
 }