fix fldDescriptor.TextName

bufbuild · May 2, 2024 · f6814f9 · f6814f9
1 parent 5ff9915
commit f6814f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/linker/descriptors.go b/linker/descriptors.go
@@ -1153,6 +1153,10 @@ func (f *fldDescriptor) TextName() string {
 	if f.IsExtension() {
 		return fmt.Sprintf("[%s]", f.FullName())
 	}
+	if f.proto.GetType() == descriptorpb.FieldDescriptorProto_TYPE_GROUP {
+		// proto2 groups (that aren't extensions) use the type name
+		return string(protoreflect.FullName(f.proto.GetTypeName()).Name())
+	}
 	return string(f.Name())
 }
 

diff --git a/linker/descriptors_ext_test.go b/linker/descriptors_ext_test.go
@@ -154,6 +154,7 @@ func checkAttributesInFields(t *testing.T, exp, actual protoreflect.ExtensionDes
 		assert.Equal(t, expFld.IsList(), actFld.IsList(), "%s: field is list at index %d (%s)", where, i, expFld.Name())
 		assert.Equal(t, expFld.IsMap(), actFld.IsMap(), "%s: field is map at index %d (%s)", where, i, expFld.Name())
 		assert.Equal(t, expFld.JSONName(), actFld.JSONName(), "%s: field json name at index %d (%s)", where, i, expFld.Name())
+		assert.Equal(t, expFld.TextName(), actFld.TextName(), "%s: field text name at index %d (%s)", where, i, expFld.Name())
 		assert.Equal(t, expFld.HasJSONName(), actFld.HasJSONName(), "%s: field has json name at index %d (%s)", where, i, expFld.Name())
 		assert.Equal(t, expFld.IsExtension(), actFld.IsExtension(), "%s: field is extension at index %d (%s)", where, i, expFld.Name())
 		assert.Equal(t, expFld.IsPacked(), actFld.IsPacked(), "%s: field is packed at index %d (%s)", where, i, expFld.Name())