Down-integrate internal changes to github. (#5566)
* Down-integrate internal changes to github.
* fix csharp conformance test
* add comments in conformance.proto for text format
* fix comments
* fix comments, re-generated csharp file
* fix comments, re-generated csharp file
diff --git a/js/test.proto b/js/test.proto
index 454fd83..bc1a9b6 100644
--- a/js/test.proto
+++ b/js/test.proto
@@ -39,8 +39,7 @@
package jspb.test;
-message Empty {
-}
+message Empty {}
enum OuterEnum {
FOO = 1;
@@ -137,12 +136,13 @@
E1 = 13;
E2 = 77;
}
- optional string string_field = 1 [default="default<>\'\"abc"];
- optional bool bool_field = 2 [default=true];
- optional int64 int_field = 3 [default=11];
- optional Enum enum_field = 4 [default=E1];
- optional string empty_field = 6 [default=""];
- optional bytes bytes_field = 8 [default="moo"]; // Base64 encoding is "bW9v"
+ optional string string_field = 1 [default = "default<>\'\"abc"];
+ optional bool bool_field = 2 [default = true];
+ optional int64 int_field = 3 [default = 11];
+ optional Enum enum_field = 4 [default = E1];
+ optional string empty_field = 6 [default = ""];
+ optional bytes bytes_field = 8
+ [default = "moo"]; // Base64 encoding is "bW9v"
}
message FloatingPointFields {
@@ -254,9 +254,9 @@
message Int64Types {
- optional int64 int64_normal = 1 [jstype=JS_NORMAL];
- optional sint64 int64_string = 2 [jstype=JS_STRING];
- optional uint64 int64_number = 3 [jstype=JS_NUMBER];
+ optional int64 int64_normal = 1 [jstype = JS_NORMAL];
+ optional sint64 int64_string = 2 [jstype = JS_STRING];
+ optional uint64 int64_number = 3 [jstype = JS_NUMBER];
}
@@ -297,3 +297,4 @@
}
}
+
