commit b6438881465fbee36863f2fac6bcbbacab8ef76a
author Michael Stapelberg <stapelberg@golang.org> Mon Aug 19 16:48:09 2024 +0200
committer Michael Stapelberg <stapelberg@golang.org> Tue Aug 20 08:10:26 2024 +0000
tree ec91ce5957ddc6a3fd9a5743e6c93eb96436c2ea
parent 94ecbc26168965a670a0f7cf86f658131c790a9c

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 <hoeppi@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

encoding/protojson/encode.go

diff --git a/encoding/protojson/encode.go b/encoding/protojson/encode.go
index 29846df..0e72d85 100644
--- a/encoding/protojson/encode.go
+++ b/encoding/protojson/encode.go
@@ -216,9 +216,7 @@
 		}
 
 		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
 			}