Merge pull request #5921 from haon4/contributing

Down integrate to Github

11 files changed, 139 insertions, 142 deletions

diff --git a/js/data.proto b/js/data.proto
index 74a8a994c..ca815caf6 100644
--- a/js/data.proto
+++ b/js/data.proto
@@ -32,11 +32,11 @@
 
 syntax = "proto2";
 
+package jspb.test;
+
 option java_package = "com.google.apps.jspb.proto";
 option java_multiple_files = true;
 
-package jspb.test;
-
 // legacy data, must be nested
 message data {
   message NestedData {
@@ -48,4 +48,3 @@ message data {
 message UnnestedData {
   required string str = 1;
 }
-
diff --git a/js/proto3_test.proto b/js/proto3_test.proto
index 0d073ea03..f23e19c9d 100644
--- a/js/proto3_test.proto
+++ b/js/proto3_test.proto
@@ -35,43 +35,43 @@ import "testbinary.proto";
 package jspb.test;
 
 message TestProto3 {
-     int32 optional_int32    =  1;
-     int64 optional_int64    =  2;
-    uint32 optional_uint32   =  3;
-    uint64 optional_uint64   =  4;
-    sint32 optional_sint32   =  5;
-    sint64 optional_sint64   =  6;
-   fixed32 optional_fixed32  =  7;
-   fixed64 optional_fixed64  =  8;
-  sfixed32 optional_sfixed32 =  9;
+  int32 optional_int32 = 1;
+  int64 optional_int64 = 2;
+  uint32 optional_uint32 = 3;
+  uint64 optional_uint64 = 4;
+  sint32 optional_sint32 = 5;
+  sint64 optional_sint64 = 6;
+  fixed32 optional_fixed32 = 7;
+  fixed64 optional_fixed64 = 8;
+  sfixed32 optional_sfixed32 = 9;
   sfixed64 optional_sfixed64 = 10;
-     float optional_float    = 11;
-    double optional_double   = 12;
-      bool optional_bool     = 13;
-    string optional_string   = 14;
-     bytes optional_bytes    = 15;
+  float optional_float = 11;
+  double optional_double = 12;
+  bool optional_bool = 13;
+  string optional_string = 14;
+  bytes optional_bytes = 15;
 
   ForeignMessage optional_foreign_message = 19;
-  Proto3Enum     optional_foreign_enum    = 22;
+  Proto3Enum optional_foreign_enum = 22;
 
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
+  repeated int32 repeated_int32 = 31;
+  repeated int64 repeated_int64 = 32;
+  repeated uint32 repeated_uint32 = 33;
+  repeated uint64 repeated_uint64 = 34;
+  repeated sint32 repeated_sint32 = 35;
+  repeated sint64 repeated_sint64 = 36;
+  repeated fixed32 repeated_fixed32 = 37;
+  repeated fixed64 repeated_fixed64 = 38;
   repeated sfixed32 repeated_sfixed32 = 39;
   repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
+  repeated float repeated_float = 41;
+  repeated double repeated_double = 42;
+  repeated bool repeated_bool = 43;
+  repeated string repeated_string = 44;
+  repeated bytes repeated_bytes = 45;
 
   repeated ForeignMessage repeated_foreign_message = 49;
-  repeated Proto3Enum     repeated_foreign_enum    = 52;
+  repeated Proto3Enum repeated_foreign_enum = 52;
 
 
   oneof oneof_field {
diff --git a/js/test13.proto b/js/test13.proto
index 4f9d272b6..b9895d87a 100644
--- a/js/test13.proto
+++ b/js/test13.proto
@@ -47,24 +47,24 @@ enum TestEnum {
 
 message TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName1 {
   optional TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName2
-    a = 1;
+      a = 1;
   optional int32 b = 2;
 }
 
 message TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName2 {
   optional TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName3
-    a = 1;
+      a = 1;
   optional int32 b = 2;
 }
 
 message TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName3 {
   optional TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName4
-    a = 1;
+      a = 1;
   optional int32 b = 2;
 }
 
 message TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName4 {
   optional TestLooooooooooooooooooooooooooooooooooooooooooooooooooooooongName1
-    a = 1;
+      a = 1;
   optional int32 b = 2;
 }
diff --git a/js/test15.proto b/js/test15.proto
index 602cc2da4..b48111651 100644
--- a/js/test15.proto
+++ b/js/test15.proto
@@ -30,10 +30,10 @@
 
 syntax = "proto2";
 
-import "test13.proto";
-
 package jspb.filenametest.package1;
 
+import "test13.proto";
+
 extend TestMessage {
   optional int32 b = 2;
 }
diff --git a/js/test2.proto b/js/test2.proto
index b67f93fa9..e9457e7c7 100644
--- a/js/test2.proto
+++ b/js/test2.proto
@@ -30,13 +30,13 @@
 
 syntax = "proto2";
 
-option java_package = "com.google.apps.jspb.proto";
-option java_multiple_files = true;
-
 package jspb.test;
 
 import "test.proto";
 
+option java_package = "com.google.apps.jspb.proto";
+option java_multiple_files = true;
+
 message TestExtensionsMessage {
   optional int32 intfield = 1;
   extensions 100 to max;
diff --git a/js/test3.proto b/js/test3.proto
index 940a552ed..3fa037dfb 100644
--- a/js/test3.proto
+++ b/js/test3.proto
@@ -30,11 +30,11 @@
 
 syntax = "proto2";
 
+package jspb.exttest;
+
 option java_package = "com.google.apps.jspb.proto";
 option java_multiple_files = true;
 
-package jspb.exttest;
-
 message TestExtensionsMessage {
   optional int32 intfield = 1;
   extensions 100 to max;
diff --git a/js/test4.proto b/js/test4.proto
index cf2451e9c..c3c834241 100644
--- a/js/test4.proto
+++ b/js/test4.proto
@@ -30,13 +30,13 @@
 
 syntax = "proto2";
 
-option java_package = "com.google.apps.jspb.proto";
-option java_multiple_files = true;
-
 package jspb.exttest;
 
 import "test3.proto";
 
+option java_package = "com.google.apps.jspb.proto";
+option java_multiple_files = true;
+
 extend TestExtensionsMessage {
   optional ExtensionMessage floating_msg_field_two = 103;
 }
diff --git a/js/test5.proto b/js/test5.proto
index 34979517e..db297213a 100644
--- a/js/test5.proto
+++ b/js/test5.proto
@@ -30,11 +30,11 @@
 
 syntax = "proto2";
 
+package jspb.exttest.beta;
+
 option java_package = "com.google.apps.jspb.proto";
 option java_multiple_files = true;
 
-package jspb.exttest.beta;
-
 message TestBetaExtensionsMessage {
   extensions 100 to max;
 }
diff --git a/js/test8.proto b/js/test8.proto
index 2ae80dab6..7dbb6eff1 100644
--- a/js/test8.proto
+++ b/js/test8.proto
@@ -30,11 +30,11 @@
 
 syntax = "proto2";
 
+package jspb.exttest.nested;
+
 option java_package = "com.google.apps.jspb.proto";
 option java_multiple_files = true;
 
-package jspb.exttest.nested;
-
 message TestNestedExtensionsMessage {
   optional int32 intfield = 1;
   extensions 100 to max;
diff --git a/js/testbinary.proto b/js/testbinary.proto
index ee4d2dfac..2e548454d 100644
--- a/js/testbinary.proto
+++ b/js/testbinary.proto
@@ -39,66 +39,66 @@ package jspb.test;
 // to ensure that the binary-format support will handle all field types
 // properly.
 message TestAllTypes {
-  optional    int32 optional_int32    =  1;
-  optional    int64 optional_int64    =  2;
-  optional   uint32 optional_uint32   =  3;
-  optional   uint64 optional_uint64   =  4;
-  optional   sint32 optional_sint32   =  5;
-  optional   sint64 optional_sint64   =  6;
-  optional  fixed32 optional_fixed32  =  7;
-  optional  fixed64 optional_fixed64  =  8;
-  optional sfixed32 optional_sfixed32 =  9;
+  optional int32 optional_int32 = 1;
+  optional int64 optional_int64 = 2;
+  optional uint32 optional_uint32 = 3;
+  optional uint64 optional_uint64 = 4;
+  optional sint32 optional_sint32 = 5;
+  optional sint64 optional_sint64 = 6;
+  optional fixed32 optional_fixed32 = 7;
+  optional fixed64 optional_fixed64 = 8;
+  optional sfixed32 optional_sfixed32 = 9;
   optional sfixed64 optional_sfixed64 = 10;
-  optional    float optional_float    = 11;
-  optional   double optional_double   = 12;
-  optional     bool optional_bool     = 13;
-  optional   string optional_string   = 14;
-  optional    bytes optional_bytes    = 15;
+  optional float optional_float = 11;
+  optional double optional_double = 12;
+  optional bool optional_bool = 13;
+  optional string optional_string = 14;
+  optional bytes optional_bytes = 15;
   optional group OptionalGroup = 16 {
     optional int32 a = 17;
   }
 
-  optional ForeignMessage                       optional_foreign_message = 19;
-  optional ForeignEnum                          optional_foreign_enum    = 22;
+  optional ForeignMessage optional_foreign_message = 19;
+  optional ForeignEnum optional_foreign_enum = 22;
 
   // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
+  repeated int32 repeated_int32 = 31;
+  repeated int64 repeated_int64 = 32;
+  repeated uint32 repeated_uint32 = 33;
+  repeated uint64 repeated_uint64 = 34;
+  repeated sint32 repeated_sint32 = 35;
+  repeated sint64 repeated_sint64 = 36;
+  repeated fixed32 repeated_fixed32 = 37;
+  repeated fixed64 repeated_fixed64 = 38;
   repeated sfixed32 repeated_sfixed32 = 39;
   repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
+  repeated float repeated_float = 41;
+  repeated double repeated_double = 42;
+  repeated bool repeated_bool = 43;
+  repeated string repeated_string = 44;
+  repeated bytes repeated_bytes = 45;
 
   repeated group RepeatedGroup = 46 {
     optional int32 a = 47;
   }
 
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
+  repeated ForeignMessage repeated_foreign_message = 49;
+  repeated ForeignEnum repeated_foreign_enum = 52;
 
   // Packed repeated
-  repeated    int32 packed_repeated_int32    = 61 [packed=true];
-  repeated    int64 packed_repeated_int64    = 62 [packed=true];
-  repeated   uint32 packed_repeated_uint32   = 63 [packed=true];
-  repeated   uint64 packed_repeated_uint64   = 64 [packed=true];
-  repeated   sint32 packed_repeated_sint32   = 65 [packed=true];
-  repeated   sint64 packed_repeated_sint64   = 66 [packed=true];
-  repeated  fixed32 packed_repeated_fixed32  = 67 [packed=true];
-  repeated  fixed64 packed_repeated_fixed64  = 68 [packed=true];
-  repeated sfixed32 packed_repeated_sfixed32 = 69 [packed=true];
-  repeated sfixed64 packed_repeated_sfixed64 = 70 [packed=true];
-  repeated    float packed_repeated_float    = 71 [packed=true];
-  repeated   double packed_repeated_double   = 72 [packed=true];
-  repeated     bool packed_repeated_bool     = 73 [packed=true];
+  repeated int32 packed_repeated_int32 = 61 [packed = true];
+  repeated int64 packed_repeated_int64 = 62 [packed = true];
+  repeated uint32 packed_repeated_uint32 = 63 [packed = true];
+  repeated uint64 packed_repeated_uint64 = 64 [packed = true];
+  repeated sint32 packed_repeated_sint32 = 65 [packed = true];
+  repeated sint64 packed_repeated_sint64 = 66 [packed = true];
+  repeated fixed32 packed_repeated_fixed32 = 67 [packed = true];
+  repeated fixed64 packed_repeated_fixed64 = 68 [packed = true];
+  repeated sfixed32 packed_repeated_sfixed32 = 69 [packed = true];
+  repeated sfixed64 packed_repeated_sfixed64 = 70 [packed = true];
+  repeated float packed_repeated_float = 71 [packed = true];
+  repeated double packed_repeated_double = 72 [packed = true];
+  repeated bool packed_repeated_bool = 73 [packed = true];
 
   oneof oneof_field {
     uint32 oneof_uint32 = 111;
@@ -132,55 +132,54 @@ message ExtendsWithMessage {
 }
 
 extend TestExtendable {
-  optional    int32 extend_optional_int32    =  1;
-  optional    int64 extend_optional_int64    =  2;
-  optional   uint32 extend_optional_uint32   =  3;
-  optional   uint64 extend_optional_uint64   =  4;
-  optional   sint32 extend_optional_sint32   =  5;
-  optional   sint64 extend_optional_sint64   =  6;
-  optional  fixed32 extend_optional_fixed32  =  7;
-  optional  fixed64 extend_optional_fixed64  =  8;
-  optional sfixed32 extend_optional_sfixed32 =  9;
+  optional int32 extend_optional_int32 = 1;
+  optional int64 extend_optional_int64 = 2;
+  optional uint32 extend_optional_uint32 = 3;
+  optional uint64 extend_optional_uint64 = 4;
+  optional sint32 extend_optional_sint32 = 5;
+  optional sint64 extend_optional_sint64 = 6;
+  optional fixed32 extend_optional_fixed32 = 7;
+  optional fixed64 extend_optional_fixed64 = 8;
+  optional sfixed32 extend_optional_sfixed32 = 9;
   optional sfixed64 extend_optional_sfixed64 = 10;
-  optional    float extend_optional_float    = 11;
-  optional   double extend_optional_double   = 12;
-  optional     bool extend_optional_bool     = 13;
-  optional   string extend_optional_string   = 14;
-  optional    bytes extend_optional_bytes    = 15;
-  optional ForeignEnum extend_optional_foreign_enum    = 22;
-
-  repeated    int32 extend_repeated_int32    = 31;
-  repeated    int64 extend_repeated_int64    = 32;
-  repeated   uint32 extend_repeated_uint32   = 33;
-  repeated   uint64 extend_repeated_uint64   = 34;
-  repeated   sint32 extend_repeated_sint32   = 35;
-  repeated   sint64 extend_repeated_sint64   = 36;
-  repeated  fixed32 extend_repeated_fixed32  = 37;
-  repeated  fixed64 extend_repeated_fixed64  = 38;
+  optional float extend_optional_float = 11;
+  optional double extend_optional_double = 12;
+  optional bool extend_optional_bool = 13;
+  optional string extend_optional_string = 14;
+  optional bytes extend_optional_bytes = 15;
+  optional ForeignEnum extend_optional_foreign_enum = 22;
+
+  repeated int32 extend_repeated_int32 = 31;
+  repeated int64 extend_repeated_int64 = 32;
+  repeated uint32 extend_repeated_uint32 = 33;
+  repeated uint64 extend_repeated_uint64 = 34;
+  repeated sint32 extend_repeated_sint32 = 35;
+  repeated sint64 extend_repeated_sint64 = 36;
+  repeated fixed32 extend_repeated_fixed32 = 37;
+  repeated fixed64 extend_repeated_fixed64 = 38;
   repeated sfixed32 extend_repeated_sfixed32 = 39;
   repeated sfixed64 extend_repeated_sfixed64 = 40;
-  repeated    float extend_repeated_float    = 41;
-  repeated   double extend_repeated_double   = 42;
-  repeated     bool extend_repeated_bool     = 43;
-  repeated   string extend_repeated_string   = 44;
-  repeated    bytes extend_repeated_bytes    = 45;
-  repeated ForeignEnum extend_repeated_foreign_enum    = 52;
-
-  repeated    int32 extend_packed_repeated_int32    = 61 [packed=true];
-  repeated    int64 extend_packed_repeated_int64    = 62 [packed=true];
-  repeated   uint32 extend_packed_repeated_uint32   = 63 [packed=true];
-  repeated   uint64 extend_packed_repeated_uint64   = 64 [packed=true];
-  repeated   sint32 extend_packed_repeated_sint32   = 65 [packed=true];
-  repeated   sint64 extend_packed_repeated_sint64   = 66 [packed=true];
-  repeated  fixed32 extend_packed_repeated_fixed32  = 67 [packed=true];
-  repeated  fixed64 extend_packed_repeated_fixed64  = 68 [packed=true];
-  repeated sfixed32 extend_packed_repeated_sfixed32 = 69 [packed=true];
-  repeated sfixed64 extend_packed_repeated_sfixed64 = 70 [packed=true];
-  repeated    float extend_packed_repeated_float    = 71 [packed=true];
-  repeated   double extend_packed_repeated_double   = 72 [packed=true];
-  repeated     bool extend_packed_repeated_bool     = 73 [packed=true];
-  repeated ForeignEnum extend_packed_repeated_foreign_enum    = 82
-      [packed=true];
+  repeated float extend_repeated_float = 41;
+  repeated double extend_repeated_double = 42;
+  repeated bool extend_repeated_bool = 43;
+  repeated string extend_repeated_string = 44;
+  repeated bytes extend_repeated_bytes = 45;
+  repeated ForeignEnum extend_repeated_foreign_enum = 52;
+
+  repeated int32 extend_packed_repeated_int32 = 61 [packed = true];
+  repeated int64 extend_packed_repeated_int64 = 62 [packed = true];
+  repeated uint32 extend_packed_repeated_uint32 = 63 [packed = true];
+  repeated uint64 extend_packed_repeated_uint64 = 64 [packed = true];
+  repeated sint32 extend_packed_repeated_sint32 = 65 [packed = true];
+  repeated sint64 extend_packed_repeated_sint64 = 66 [packed = true];
+  repeated fixed32 extend_packed_repeated_fixed32 = 67 [packed = true];
+  repeated fixed64 extend_packed_repeated_fixed64 = 68 [packed = true];
+  repeated sfixed32 extend_packed_repeated_sfixed32 = 69 [packed = true];
+  repeated sfixed64 extend_packed_repeated_sfixed64 = 70 [packed = true];
+  repeated float extend_packed_repeated_float = 71 [packed = true];
+  repeated double extend_packed_repeated_double = 72 [packed = true];
+  repeated bool extend_packed_repeated_bool = 73 [packed = true];
+  repeated ForeignEnum extend_packed_repeated_foreign_enum = 82 [packed = true];
 
 }
 
@@ -226,7 +225,7 @@ message MapEntryOptionalKeysBoolKey {
 
 message TestMapFieldsOptionalKeys {
   optional MapEntryOptionalKeysStringKey map_string_string = 1;
-  optional MapEntryOptionalKeysInt32Key map_int32_string= 8;
+  optional MapEntryOptionalKeysInt32Key map_int32_string = 8;
   optional MapEntryOptionalKeysInt64Key map_int64_string = 9;
   optional MapEntryOptionalKeysBoolKey map_bool_string = 10;
 }
diff --git a/js/testempty.proto b/js/testempty.proto
index 960bce4e5..6161753fd 100644
--- a/js/testempty.proto
+++ b/js/testempty.proto
@@ -31,4 +31,3 @@
 syntax = "proto2";
 
 package javatests.com.google.apps.jspb;
-