diff options
| author | Yilun Chong <chongyilun250@sina.com> | 2019-01-11 11:40:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:40:52 -0800 |
| commit | cb95a7f6a8b66315969b74fa00b439f8f259fc8c (patch) | |
| tree | 86fdf41e975147d74f213d7b1a0ab312b17b7fe2 /js | |
| parent | b1b9eaa6c7630c8588a47d9f0cc2ec0823c173ba (diff) | |
| download | protobuf-cb95a7f6a8b66315969b74fa00b439f8f259fc8c.tar.gz | |
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
Diffstat (limited to 'js')
| -rw-r--r-- | js/test.proto | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/js/test.proto b/js/test.proto index 454fd8396..bc1a9b64c 100644 --- a/js/test.proto +++ b/js/test.proto @@ -39,8 +39,7 @@ import "google/protobuf/descriptor.proto"; package jspb.test; -message Empty { -} +message Empty {} enum OuterEnum { FOO = 1; @@ -137,12 +136,13 @@ message DefaultValues { 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 @@ extend TestLastFieldBeforePivot { 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 @@ message Deeply { } } + |