Remove usage of the proto Syntax call. (#792)

robshakir · web-flow · commit dba644ff4cc9 · 2023-03-09T17:18:22.000-08:00
* Remove usage of the proto Syntax call.

* Fix `gofmt`.
diff --git a/protomap/proto.go b/protomap/proto.go
@@ -141,9 +141,7 @@ func (m unpopRange) Range(f func(protoreflect.FieldDescriptor, protoreflect.Valu
 		}
 
 		v := m.Get(fd)
-		isProto2Scalar := fd.Syntax() == protoreflect.Proto2 && fd.Default().IsValid()
-		isSingularMessage := fd.Cardinality() != protoreflect.Repeated && fd.Kind() == protoreflect.MessageKind
-		if isProto2Scalar || isSingularMessage {
+		if fd.HasPresence() {
 			v = protoreflect.Value{} // use invalid value to emit null
 		}
 		if !f(fd, v) {

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,7 @@ func (m unpopRange) Range(f func(protoreflect.FieldDescriptor, protoreflect.Valu`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`v := m.Get(fd)`
`144`		`- isProto2Scalar := fd.Syntax() == protoreflect.Proto2 && fd.Default().IsValid()`
`145`		`- isSingularMessage := fd.Cardinality() != protoreflect.Repeated && fd.Kind() == protoreflect.MessageKind`
`146`		`- if isProto2Scalar \|\| isSingularMessage {`
	`144`	`+ if fd.HasPresence() {`
`147`	`145`	`v = protoreflect.Value{} // use invalid value to emit null`
`148`	`146`	`}`
`149`	`147`	`if !f(fd, v) {`