encoding/jsonpb: add support for marshaling well-known types
Also, changed MarshalOptions.Compact to Indent for consistency with v1
and to make compact as the default.
Change-Id: Id08aaa5ca5656f18e7925d2eabc0b6b055b1cebb
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168352
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/encoding/testprotos/pb2/test.proto b/encoding/testprotos/pb2/test.proto
index d41583a..1b4f8d0 100644
--- a/encoding/testprotos/pb2/test.proto
+++ b/encoding/testprotos/pb2/test.proto
@@ -10,6 +10,7 @@
import "google/protobuf/any.proto";
import "google/protobuf/empty.proto";
+import "google/protobuf/field_mask.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/struct.proto";
import "google/protobuf/timestamp.proto";
@@ -217,4 +218,6 @@
optional google.protobuf.Value opt_value = 27;
optional google.protobuf.Empty opt_empty = 30;
optional google.protobuf.Any opt_any = 32;
+
+ optional google.protobuf.FieldMask opt_fieldmask = 40;
}