encoding/protojson: use fd.HasPresence() for editions compatibility

This change was originally done by Mike Kruskal in Google-internal cl/515091827. Change-Id: I5d1588193663249964cf8bc9b9fe9f61d29c98a6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/606756 Reviewed-by: Christian Höppner <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
protocolbuffers · Aug 20, 2024 · b643888 · b643888
1 parent 94ecbc2
commit b643888
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/encoding/protojson/encode.go b/encoding/protojson/encode.go
@@ -216,9 +216,7 @@ func (m unpopulatedFieldRanger) Range(f func(protoreflect.FieldDescriptor, proto
 		}
 
 		v := m.Get(fd)
-		isProto2Scalar := fd.Syntax() == protoreflect.Proto2 && fd.Default().IsValid()
-		isSingularMessage := fd.Cardinality() != protoreflect.Repeated && fd.Message() != nil
-		if isProto2Scalar || isSingularMessage {
+		if fd.HasPresence() {
 			if m.skipNull {
 				continue
 			}