C#: Fix discovery of oneof declarations in descriptor protos.

PiperOrigin-RevId: 627384633
protocolbuffers · Apr 23, 2024 · b50ff60 · b50ff60
1 parent b618f67
commit b50ff60
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs
@@ -137,6 +137,16 @@ public void NestedEnumValueComments()
             Assert.AreEqual(" Zero value comment\n", value.Declaration.LeadingComments);
         }
 
+        [Test]
+        public void OneofComments()
+        {
+            // CommentMessage doesn't have an enum, but we can use TestAllTypes.
+            var message = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("TestAllTypes");
+            var oneof = message.Oneofs.Single(o => o.Name == "oneof_field");
+            Assert.NotNull(oneof.Declaration);
+            Assert.AreEqual(" For oneof test\n", oneof.Declaration.LeadingComments);
+        }
+
         private static FileDescriptor LoadProtos()
         {
             var type = typeof(DescriptorDeclarationTest);

diff --git a/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
@@ -119,6 +119,7 @@ internal override IReadOnlyList<DescriptorBase> GetNestedDescriptorListForField(
                 DescriptorProto.FieldFieldNumber => (IReadOnlyList<DescriptorBase>)fieldsInDeclarationOrder,
                 DescriptorProto.NestedTypeFieldNumber => (IReadOnlyList<DescriptorBase>)NestedTypes,
                 DescriptorProto.EnumTypeFieldNumber => (IReadOnlyList<DescriptorBase>)EnumTypes,
+                DescriptorProto.OneofDeclFieldNumber => (IReadOnlyList<DescriptorBase>)Oneofs,
                 _ => null,
             };