Correct type_resolver_util to set syntax=proto3 instead of syntax=proto2 on proto3 files.

protobuf-github-bot · copybara-github · commit 040dde7e37cc · 2024-01-22T09:05:58.000-08:00
PiperOrigin-RevId: 600473754
diff --git a/src/google/protobuf/util/type_resolver_util.cc b/src/google/protobuf/util/type_resolver_util.cc
@@ -252,11 +252,14 @@ void ConvertFieldDescriptor(absl::string_view url_prefix,
 }
 
 Syntax ConvertSyntax(Edition edition) {
-  if (edition >= Edition::EDITION_2023) {
-    return Syntax::SYNTAX_EDITIONS;
+  switch (edition) {
+    case Edition::EDITION_PROTO2:
+      return Syntax::SYNTAX_PROTO2;
+    case Edition::EDITION_PROTO3:
+      return Syntax::SYNTAX_PROTO3;
+    default:
+      return Syntax::SYNTAX_EDITIONS;
   }
-  // TODO This should propagate proto3 as expected.
-  return Syntax::SYNTAX_PROTO2;
 }
 
 void ConvertEnumDescriptor(const EnumDescriptor& descriptor, Enum* enum_type) {
diff --git a/src/google/protobuf/util/type_resolver_util_test.cc b/src/google/protobuf/util/type_resolver_util_test.cc
@@ -460,8 +460,7 @@ TEST_F(DescriptorPoolTypeResolverSyntaxTest, SyntaxProto3) {
   Type type;
   ASSERT_TRUE(
       resolver_->ResolveMessageType(GetTypeUrl("test.MyMessage"), &type).ok());
-  // TODO This should be proto3.
-  EXPECT_EQ(type.syntax(), Syntax::SYNTAX_PROTO2);
+  EXPECT_EQ(type.syntax(), Syntax::SYNTAX_PROTO3);
   EXPECT_EQ(type.edition(), "");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -252,11 +252,14 @@ void ConvertFieldDescriptor(absl::string_view url_prefix,`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`Syntax ConvertSyntax(Edition edition) {`
`255`		`- if (edition >= Edition::EDITION_2023) {`
`256`		`- return Syntax::SYNTAX_EDITIONS;`
	`255`	`+ switch (edition) {`
	`256`	`+ case Edition::EDITION_PROTO2:`
	`257`	`+ return Syntax::SYNTAX_PROTO2;`
	`258`	`+ case Edition::EDITION_PROTO3:`
	`259`	`+ return Syntax::SYNTAX_PROTO3;`
	`260`	`+ default:`
	`261`	`+ return Syntax::SYNTAX_EDITIONS;`
`257`	`262`	`}`
`258`		`- // TODO This should propagate proto3 as expected.`
`259`		`- return Syntax::SYNTAX_PROTO2;`
`260`	`263`	`}`
`261`	`264`
`262`	`265`	`void ConvertEnumDescriptor(const EnumDescriptor& descriptor, Enum* enum_type) {`
Original file line number	Diff line number	Diff line change
`@@ -460,8 +460,7 @@ TEST_F(DescriptorPoolTypeResolverSyntaxTest, SyntaxProto3) {`
`460`	`460`	`Type type;`
`461`	`461`	`ASSERT_TRUE(`
`462`	`462`	`resolver_->ResolveMessageType(GetTypeUrl("test.MyMessage"), &type).ok());`
`463`		`- // TODO This should be proto3.`
`464`		`- EXPECT_EQ(type.syntax(), Syntax::SYNTAX_PROTO2);`
	`463`	`+ EXPECT_EQ(type.syntax(), Syntax::SYNTAX_PROTO3);`
`465`	`464`	`EXPECT_EQ(type.edition(), "");`
`466`	`465`	`}`
`467`	`466`