fix-range-primitives (#9)

solo-io · Dec 1, 2020 · b238255 · b238255
1 parent 2656a8e
commit b238255
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 78 deletions.
diff --git a/templates/equal/render.go b/templates/equal/render.go
@@ -19,15 +19,15 @@ type Value struct {
 func (fns goSharedFuncs) render(field pgs.Field) (string, error) {
 	var tpl *template.Template
 
-	if field.Type().ProtoType().IsNumeric() ||
+	if field.Type().IsRepeated() {
+		return fns.renderRepeated(field)
+	} else if field.Type().IsMap() {
+		return fns.renderMap(field)
+	} else if field.Type().ProtoType().IsNumeric() ||
 		field.Type().ProtoType() == pgs.BoolT ||
 		field.Type().IsEnum() {
 
 		tpl = template.Must(fns.tpl.New("primitive").Parse(primitiveTmpl))
-	} else if field.Type().IsMap() {
-		return fns.renderMap(field)
-	} else if field.Type().IsRepeated() {
-		return fns.renderRepeated(field)
 	} else {
 		switch field.Type().ProtoType() {
 		case pgs.BytesT:

diff --git a/tests/api/hello.pb.equal.go b/tests/api/hello.pb.equal.go
diff --git a/tests/api/hello.pb.go b/tests/api/hello.pb.go
diff --git a/tests/api/hello.pb.hash.go b/tests/api/hello.pb.hash.go
diff --git a/tests/api/hello.pb.merge.go b/tests/api/hello.pb.merge.go
diff --git a/tests/api/hello.proto b/tests/api/hello.proto
@@ -43,14 +43,15 @@ enum Test {
 message Nested {
     Simple simple = 1;
 
-    google.protobuf.Struct details = 5;
 
     Test test = 2;
 
     Empty empty = 3 [(extproto.sensitive) = true];
 
     repeated string hello = 4;
 
+    google.protobuf.Struct details = 5;
+
     Simple skipper = 6 [(extproto.skip_hashing) = true];
 
     repeated Simple x = 7 [(extproto.sensitive) = true];
@@ -63,6 +64,8 @@ message Nested {
         Empty empty_one_of = 11;
         NestedEmpty nested_one_of = 12;
     }
+
+    repeated uint64 repeated_primitive = 13;
 }