Format proto files

Author: AdrienVannson

betterproto2_compiler/tests/inputs/conformance/conformance.proto

@@ -35,14 +35,14 @@ enum WireFormat {
   UNSPECIFIED = 0;
   PROTOBUF = 1;
   JSON = 2;
-  JSPB = 3;  // Only used inside Google. Opensource testees just skip it.
+  JSPB = 3; // Only used inside Google. Opensource testees just skip it.
   TEXT_FORMAT = 4;
 }
 
 enum TestCategory {
   UNSPECIFIED_TEST = 0;
-  BINARY_TEST = 1;  // Test binary wire format.
-  JSON_TEST = 2;    // Test json wire format.
+  BINARY_TEST = 1; // Test binary wire format.
+  JSON_TEST = 2; // Test json wire format.
   // Similar to JSON_TEST. However, during parsing json, testee should ignore
   // unknown fields. This feature is optional. Each implementation can decide
   // whether to support it.  See
@@ -169,4 +169,4 @@ message ConformanceResponse {
 message JspbEncodingConfig {
   // Encode the value field of Any as jspb array if true, otherwise binary.
   bool use_jspb_array_any_format = 1;
-}
+}

betterproto2_compiler/tests/inputs/conformance/test_messages_proto3.proto

@@ -16,12 +16,6 @@ syntax = "proto3";
 
 package protobuf_test_messages.proto3;
 
-option java_package = "com.google.protobuf_test_messages.proto3";
-option objc_class_prefix = "Proto3";
-
-// This is the default, but we specify it here explicitly.
-option optimize_for = SPEED;
-
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/field_mask.proto";
@@ -30,6 +24,10 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
 option cc_enable_arenas = true;
+option java_package = "com.google.protobuf_test_messages.proto3";
+option objc_class_prefix = "Proto3";
+// This is the default, but we specify it here explicitly.
+option optimize_for = SPEED;
 
 // This proto includes every type of field in both singular and repeated
 // forms.
@@ -48,7 +46,7 @@ message TestAllTypesProto3 {
     FOO = 0;
     BAR = 1;
     BAZ = 2;
-    NEG = -1;  // Intentionally negative.
+    NEG = -1; // Intentionally negative.
   }
 
   enum AliasedEnum {
@@ -266,4 +264,4 @@ message EnumOnlyProto3 {
     kFalse = 0;
     kTrue = 1;
   }
-}
+}