fix: invalid syntax in descriptor.proto (#2092)

josephharrington · web-flow · commit 5a3769a465fe · 2025-08-15T16:09:59.000-07:00
A recent change (#2075) edited descriptor.proto to include a `reserved` statement that combines a field number and field name in the same line. This is specifically called out in the proto language guide as invalid. https://protobuf.dev/programming-guides/editions/#reserved > Note that you can’t mix field names and numeric values in the same > `reserved` statement. Protobuf.js itself seems to handle this syntax just fine, but other tools like protoc will choke on it.
diff --git a/google/protobuf/descriptor.json b/google/protobuf/descriptor.json
@@ -588,11 +588,11 @@
                   42,
                   42
                 ],
-                "php_generic_services",
                 [
                   38,
                   38
-                ]
+                ],
+                "php_generic_services"
               ],
               "nested": {
                 "OptimizeMode": {
diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto
@@ -229,7 +229,8 @@ message FileOptions {
 
     extensions 1000 to max;
 
-    reserved 42, "php_generic_services", 38;
+    reserved 42, 38;
+    reserved "php_generic_services";
 }
 
 message MessageOptions {

Original file line number	Diff line number	Diff line change
`@@ -588,11 +588,11 @@`
`588`	`588`	`42,`
`589`	`589`	`42`
`590`	`590`	`],`
`591`		`- "php_generic_services",`
`592`	`591`	`[`
`593`	`592`	`38,`
`594`	`593`	`38`
`595`		`- ]`
	`594`	`+ ],`
	`595`	`+ "php_generic_services"`
`596`	`596`	`],`
`597`	`597`	`"nested": {`
`598`	`598`	`"OptimizeMode": {`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,8 @@ message FileOptions {`
`229`	`229`
`230`	`230`	`extensions 1000 to max;`
`231`	`231`
`232`		`- reserved 42, "php_generic_services", 38;`
	`232`	`+ reserved 42, 38;`
	`233`	`+ reserved "php_generic_services";`
`233`	`234`	`}`
`234`	`235`
`235`	`236`	`message MessageOptions {`