Sync changes from internal repo. (#96)

* Added enumValues to FieldInfo. Fixes google/protobuf.dart#63.

Author: jakobr-google

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.8 - 2017-10-25
+
+* Added enumValues to FieldInfo.
+
 ## 0.7.7 - 2017-09-25
 
 * Avoid name clashes between import prefix and field names.

lib/code_generator.dart

@@ -46,7 +46,8 @@ class CodeGenerator extends ProtobufContainer {
     Dart_options.registerAllExtensions(extensions);
 
     _streamIn
-        .fold(new BytesBuilder(), (builder, data) => builder..add(data))
+        .fold(new BytesBuilder(),
+            (BytesBuilder builder, data) => builder..add(data))
         .then((builder) => builder.takeBytes())
         .then((List<int> bytes) {
       var request = new CodeGeneratorRequest.fromBuffer(bytes, extensions);

lib/extension_generator.dart

@@ -85,7 +85,8 @@ class ExtensionGenerator {
       if (type.isMessage || type.isGroup) {
         out.println(', $dartType.$checkItem, $dartType.create);');
       } else if (type.isEnum) {
-        out.println(', $dartType.$checkItem, null, $dartType.valueOf);');
+        out.println(', $dartType.$checkItem, null, '
+            '$dartType.valueOf, $dartType.values);');
       } else {
         out.println(", getCheckFunction(${_field.typeConstant}));");
       }
@@ -102,8 +103,8 @@ class ExtensionGenerator {
       out.println(', $initializer, $dartType.create);');
     } else if (type.isEnum) {
       var dartEnum = type.getDartType(package);
-      String valueOf = '(var v) => $dartEnum.valueOf(v)';
-      out.println(", $initializer, null, $valueOf);");
+      String enumParams = '(var v) => $dartEnum.valueOf(v), $dartEnum.values';
+      out.println(", $initializer, null, $enumParams);");
     } else if (initializer != null) {
       out.println(", $initializer);");
     } else {

lib/protobuf_field.dart

@@ -110,17 +110,17 @@ class ProtobufField {
             ' $type.$checkItem, $type.create)';
       } else if (baseType.isEnum) {
         return '..pp<$type>($number, $quotedName, $typeConstant,'
-            ' $type.$checkItem, null, $type.valueOf)';
+            ' $type.$checkItem, null, $type.valueOf, $type.values)';
       } else {
         return '..p<$type>($number, $quotedName, $typeConstant)';
       }
     }
 
     String makeDefault = generateDefaultFunction(package);
     if (baseType.isEnum) {
-      String valueOf = '$type.valueOf';
+      String enumParams = '$type.valueOf, $type.values';
       return '..e<$type>('
-          '$number, $quotedName, $typeConstant, $makeDefault, $valueOf)';
+          '$number, $quotedName, $typeConstant, $makeDefault, $enumParams)';
     }
 
     String prefix = '..a<$type>($number, $quotedName, $typeConstant';

lib/src/descriptor.pb.dart

@@ -1,5 +1,5 @@
 name: protoc_plugin
-version: 0.7.7
+version: 0.7.8
 author: Dart Team <[email protected]>
 description: Protoc compiler plugin to generate Dart code
 homepage: https://github.com/dart-lang/dart-protoc-plugin
@@ -8,7 +8,7 @@ environment:
 dependencies:
   fixnum: ^0.10.5
   path: ^1.0.0
-  protobuf: ^0.5.5
+  protobuf: ^0.6.0
   dart_style: ^1.0.6
 dev_dependencies:
   browser: any

pubspec.yaml

@@ -44,7 +44,7 @@ class PhoneNumber_PhoneType extends ProtobufEnum {
 class PhoneNumber extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('PhoneNumber')
     ..a<String>(1, 'number', PbFieldType.QS)
-    ..e<PhoneNumber_PhoneType>(2, 'type', PbFieldType.OE, PhoneNumber_PhoneType.MOBILE, PhoneNumber_PhoneType.valueOf)
+    ..e<PhoneNumber_PhoneType>(2, 'type', PbFieldType.OE, PhoneNumber_PhoneType.MOBILE, PhoneNumber_PhoneType.valueOf, PhoneNumber_PhoneType.values)
     ..a<String>(3, 'name', PbFieldType.OS, '\$')
   ;