Ran dartfmt. (#81)

diff --git a/lib/src/dart_options.pb.dart b/lib/src/dart_options.pb.dart
index f6882d1..83c3fb9 100644
--- a/lib/src/dart_options.pb.dart
+++ b/lib/src/dart_options.pb.dart
@@ -14,12 +14,14 @@
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
     ..a/*<String>*/(2, 'importFrom', PbFieldType.OS)
     ..a/*<String>*/(3, 'parent', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   DartMixin() : super();
-  DartMixin.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  DartMixin.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  DartMixin.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  DartMixin.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   DartMixin clone() => new DartMixin()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static DartMixin create() => new DartMixin();
@@ -28,23 +30,33 @@
     if (_defaultInstance == null) _defaultInstance = new _ReadonlyDartMixin();
     return _defaultInstance;
   }
+
   static DartMixin _defaultInstance;
   static void $checkItem(DartMixin v) {
-    if (v is !DartMixin) checkItemFailed(v, 'DartMixin');
+    if (v is! DartMixin) checkItemFailed(v, 'DartMixin');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   String get importFrom => $_get(1, 2, '');
-  set importFrom(String v) { $_setString(1, 2, v); }
+  set importFrom(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasImportFrom() => $_has(1, 2);
   void clearImportFrom() => clearField(2);
 
   String get parent => $_get(2, 3, '');
-  set parent(String v) { $_setString(2, 3, v); }
+  set parent(String v) {
+    $_setString(2, 3, v);
+  }
+
   bool hasParent() => $_has(2, 3);
   void clearParent() => clearField(3);
 }
@@ -53,13 +65,16 @@
 
 class Imports extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('Imports')
-    ..pp/*<DartMixin>*/(1, 'mixins', PbFieldType.PM, DartMixin.$checkItem, DartMixin.create)
-    ..hasRequiredFields = false
-  ;
+    ..pp/*<DartMixin>*/(
+        1, 'mixins', PbFieldType.PM, DartMixin.$checkItem, DartMixin.create)
+    ..hasRequiredFields = false;
 
   Imports() : super();
-  Imports.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Imports.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  Imports.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  Imports.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   Imports clone() => new Imports()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static Imports create() => new Imports();
@@ -68,9 +83,10 @@
     if (_defaultInstance == null) _defaultInstance = new _ReadonlyImports();
     return _defaultInstance;
   }
+
   static Imports _defaultInstance;
   static void $checkItem(Imports v) {
-    if (v is !Imports) checkItemFailed(v, 'Imports');
+    if (v is! Imports) checkItemFailed(v, 'Imports');
   }
 
   List<DartMixin> get mixins => $_get(0, 1, null);
@@ -79,14 +95,22 @@
 class _ReadonlyImports extends Imports with ReadonlyMessageMixin {}
 
 class Dart_options {
-  static final Extension imports = new Extension<Imports>('FileOptions', 'imports', 28125061, PbFieldType.OM, Imports.getDefault, Imports.create);
-  static final Extension defaultMixin = new Extension<String>('FileOptions', 'defaultMixin', 96128839, PbFieldType.OS);
-  static final Extension mixin = new Extension<String>('MessageOptions', 'mixin', 96128839, PbFieldType.OS);
-  static final Extension overrideGetter = new Extension<bool>('FieldOptions', 'overrideGetter', 28205290, PbFieldType.OB);
-  static final Extension overrideSetter = new Extension<bool>('FieldOptions', 'overrideSetter', 28937366, PbFieldType.OB);
-  static final Extension overrideHasMethod = new Extension<bool>('FieldOptions', 'overrideHasMethod', 28937461, PbFieldType.OB);
-  static final Extension overrideClearMethod = new Extension<bool>('FieldOptions', 'overrideClearMethod', 28907907, PbFieldType.OB);
-  static final Extension dartName = new Extension<String>('FieldOptions', 'dartName', 28700919, PbFieldType.OS);
+  static final Extension imports = new Extension<Imports>('FileOptions',
+      'imports', 28125061, PbFieldType.OM, Imports.getDefault, Imports.create);
+  static final Extension defaultMixin = new Extension<String>(
+      'FileOptions', 'defaultMixin', 96128839, PbFieldType.OS);
+  static final Extension mixin = new Extension<String>(
+      'MessageOptions', 'mixin', 96128839, PbFieldType.OS);
+  static final Extension overrideGetter = new Extension<bool>(
+      'FieldOptions', 'overrideGetter', 28205290, PbFieldType.OB);
+  static final Extension overrideSetter = new Extension<bool>(
+      'FieldOptions', 'overrideSetter', 28937366, PbFieldType.OB);
+  static final Extension overrideHasMethod = new Extension<bool>(
+      'FieldOptions', 'overrideHasMethod', 28937461, PbFieldType.OB);
+  static final Extension overrideClearMethod = new Extension<bool>(
+      'FieldOptions', 'overrideClearMethod', 28907907, PbFieldType.OB);
+  static final Extension dartName = new Extension<String>(
+      'FieldOptions', 'dartName', 28700919, PbFieldType.OS);
   static void registerAllExtensions(ExtensionRegistry registry) {
     registry.add(imports);
     registry.add(defaultMixin);
@@ -98,4 +122,3 @@
     registry.add(dartName);
   }
 }
-
diff --git a/lib/src/descriptor.pb.dart b/lib/src/descriptor.pb.dart
index 1f2adf6..8587408 100644
--- a/lib/src/descriptor.pb.dart
+++ b/lib/src/descriptor.pb.dart
@@ -16,69 +16,96 @@
 
 class FileDescriptorSet extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('FileDescriptorSet')
-    ..pp/*<FileDescriptorProto>*/(1, 'file', PbFieldType.PM, FileDescriptorProto.$checkItem, FileDescriptorProto.create)
-  ;
+    ..pp/*<FileDescriptorProto>*/(1, 'file', PbFieldType.PM,
+        FileDescriptorProto.$checkItem, FileDescriptorProto.create);
 
   FileDescriptorSet() : super();
-  FileDescriptorSet.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FileDescriptorSet.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  FileDescriptorSet.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  FileDescriptorSet.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   FileDescriptorSet clone() => new FileDescriptorSet()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static FileDescriptorSet create() => new FileDescriptorSet();
-  static PbList<FileDescriptorSet> createRepeated() => new PbList<FileDescriptorSet>();
+  static PbList<FileDescriptorSet> createRepeated() =>
+      new PbList<FileDescriptorSet>();
   static FileDescriptorSet getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFileDescriptorSet();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyFileDescriptorSet();
     return _defaultInstance;
   }
+
   static FileDescriptorSet _defaultInstance;
   static void $checkItem(FileDescriptorSet v) {
-    if (v is !FileDescriptorSet) checkItemFailed(v, 'FileDescriptorSet');
+    if (v is! FileDescriptorSet) checkItemFailed(v, 'FileDescriptorSet');
   }
 
   List<FileDescriptorProto> get file => $_get(0, 1, null);
 }
 
-class _ReadonlyFileDescriptorSet extends FileDescriptorSet with ReadonlyMessageMixin {}
+class _ReadonlyFileDescriptorSet extends FileDescriptorSet
+    with ReadonlyMessageMixin {}
 
 class FileDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('FileDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
     ..a/*<String>*/(2, 'package', PbFieldType.OS)
     ..p/*<String>*/(3, 'dependency', PbFieldType.PS)
-    ..pp/*<DescriptorProto>*/(4, 'messageType', PbFieldType.PM, DescriptorProto.$checkItem, DescriptorProto.create)
-    ..pp/*<EnumDescriptorProto>*/(5, 'enumType', PbFieldType.PM, EnumDescriptorProto.$checkItem, EnumDescriptorProto.create)
-    ..pp/*<ServiceDescriptorProto>*/(6, 'service', PbFieldType.PM, ServiceDescriptorProto.$checkItem, ServiceDescriptorProto.create)
-    ..pp/*<FieldDescriptorProto>*/(7, 'extension', PbFieldType.PM, FieldDescriptorProto.$checkItem, FieldDescriptorProto.create)
-    ..a/*<FileOptions>*/(8, 'options', PbFieldType.OM, FileOptions.getDefault, FileOptions.create)
-    ..a/*<SourceCodeInfo>*/(9, 'sourceCodeInfo', PbFieldType.OM, SourceCodeInfo.getDefault, SourceCodeInfo.create)
+    ..pp/*<DescriptorProto>*/(4, 'messageType', PbFieldType.PM,
+        DescriptorProto.$checkItem, DescriptorProto.create)
+    ..pp/*<EnumDescriptorProto>*/(5, 'enumType', PbFieldType.PM,
+        EnumDescriptorProto.$checkItem, EnumDescriptorProto.create)
+    ..pp/*<ServiceDescriptorProto>*/(6, 'service', PbFieldType.PM,
+        ServiceDescriptorProto.$checkItem, ServiceDescriptorProto.create)
+    ..pp/*<FieldDescriptorProto>*/(7, 'extension', PbFieldType.PM,
+        FieldDescriptorProto.$checkItem, FieldDescriptorProto.create)
+    ..a/*<FileOptions>*/(8, 'options', PbFieldType.OM, FileOptions.getDefault,
+        FileOptions.create)
+    ..a/*<SourceCodeInfo>*/(9, 'sourceCodeInfo', PbFieldType.OM,
+        SourceCodeInfo.getDefault, SourceCodeInfo.create)
     ..p/*<int>*/(10, 'publicDependency', PbFieldType.P3)
     ..p/*<int>*/(11, 'weakDependency', PbFieldType.P3)
-    ..a/*<String>*/(12, 'syntax', PbFieldType.OS)
-  ;
+    ..a/*<String>*/(12, 'syntax', PbFieldType.OS);
 
   FileDescriptorProto() : super();
-  FileDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FileDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  FileDescriptorProto clone() => new FileDescriptorProto()..mergeFromMessage(this);
+  FileDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  FileDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  FileDescriptorProto clone() =>
+      new FileDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static FileDescriptorProto create() => new FileDescriptorProto();
-  static PbList<FileDescriptorProto> createRepeated() => new PbList<FileDescriptorProto>();
+  static PbList<FileDescriptorProto> createRepeated() =>
+      new PbList<FileDescriptorProto>();
   static FileDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFileDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyFileDescriptorProto();
     return _defaultInstance;
   }
+
   static FileDescriptorProto _defaultInstance;
   static void $checkItem(FileDescriptorProto v) {
-    if (v is !FileDescriptorProto) checkItemFailed(v, 'FileDescriptorProto');
+    if (v is! FileDescriptorProto) checkItemFailed(v, 'FileDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   String get package => $_get(1, 2, '');
-  set package(String v) { $_setString(1, 2, v); }
+  set package(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasPackage() => $_has(1, 2);
   void clearPackage() => clearField(2);
 
@@ -93,12 +120,18 @@
   List<FieldDescriptorProto> get extension => $_get(6, 7, null);
 
   FileOptions get options => $_get(7, 8, null);
-  set options(FileOptions v) { setField(8, v); }
+  set options(FileOptions v) {
+    setField(8, v);
+  }
+
   bool hasOptions() => $_has(7, 8);
   void clearOptions() => clearField(8);
 
   SourceCodeInfo get sourceCodeInfo => $_get(8, 9, null);
-  set sourceCodeInfo(SourceCodeInfo v) { setField(9, v); }
+  set sourceCodeInfo(SourceCodeInfo v) {
+    setField(9, v);
+  }
+
   bool hasSourceCodeInfo() => $_has(8, 9);
   void clearSourceCodeInfo() => clearField(9);
 
@@ -107,117 +140,179 @@
   List<int> get weakDependency => $_get(10, 11, null);
 
   String get syntax => $_get(11, 12, '');
-  set syntax(String v) { $_setString(11, 12, v); }
+  set syntax(String v) {
+    $_setString(11, 12, v);
+  }
+
   bool hasSyntax() => $_has(11, 12);
   void clearSyntax() => clearField(12);
 }
 
-class _ReadonlyFileDescriptorProto extends FileDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyFileDescriptorProto extends FileDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class DescriptorProto_ExtensionRange extends GeneratedMessage {
-  static final BuilderInfo _i = new BuilderInfo('DescriptorProto_ExtensionRange')
-    ..a/*<int>*/(1, 'start', PbFieldType.O3)
-    ..a/*<int>*/(2, 'end', PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+  static final BuilderInfo _i =
+      new BuilderInfo('DescriptorProto_ExtensionRange')
+        ..a/*<int>*/(1, 'start', PbFieldType.O3)
+        ..a/*<int>*/(2, 'end', PbFieldType.O3)
+        ..hasRequiredFields = false;
 
   DescriptorProto_ExtensionRange() : super();
-  DescriptorProto_ExtensionRange.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  DescriptorProto_ExtensionRange.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  DescriptorProto_ExtensionRange clone() => new DescriptorProto_ExtensionRange()..mergeFromMessage(this);
+  DescriptorProto_ExtensionRange.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  DescriptorProto_ExtensionRange.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  DescriptorProto_ExtensionRange clone() =>
+      new DescriptorProto_ExtensionRange()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
-  static DescriptorProto_ExtensionRange create() => new DescriptorProto_ExtensionRange();
-  static PbList<DescriptorProto_ExtensionRange> createRepeated() => new PbList<DescriptorProto_ExtensionRange>();
+  static DescriptorProto_ExtensionRange create() =>
+      new DescriptorProto_ExtensionRange();
+  static PbList<DescriptorProto_ExtensionRange> createRepeated() =>
+      new PbList<DescriptorProto_ExtensionRange>();
   static DescriptorProto_ExtensionRange getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyDescriptorProto_ExtensionRange();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyDescriptorProto_ExtensionRange();
     return _defaultInstance;
   }
+
   static DescriptorProto_ExtensionRange _defaultInstance;
   static void $checkItem(DescriptorProto_ExtensionRange v) {
-    if (v is !DescriptorProto_ExtensionRange) checkItemFailed(v, 'DescriptorProto_ExtensionRange');
+    if (v is! DescriptorProto_ExtensionRange)
+      checkItemFailed(v, 'DescriptorProto_ExtensionRange');
   }
 
   int get start => $_get(0, 1, 0);
-  set start(int v) { $_setUnsignedInt32(0, 1, v); }
+  set start(int v) {
+    $_setUnsignedInt32(0, 1, v);
+  }
+
   bool hasStart() => $_has(0, 1);
   void clearStart() => clearField(1);
 
   int get end => $_get(1, 2, 0);
-  set end(int v) { $_setUnsignedInt32(1, 2, v); }
+  set end(int v) {
+    $_setUnsignedInt32(1, 2, v);
+  }
+
   bool hasEnd() => $_has(1, 2);
   void clearEnd() => clearField(2);
 }
 
-class _ReadonlyDescriptorProto_ExtensionRange extends DescriptorProto_ExtensionRange with ReadonlyMessageMixin {}
+class _ReadonlyDescriptorProto_ExtensionRange
+    extends DescriptorProto_ExtensionRange with ReadonlyMessageMixin {}
 
 class DescriptorProto_ReservedRange extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('DescriptorProto_ReservedRange')
     ..a/*<int>*/(1, 'start', PbFieldType.O3)
     ..a/*<int>*/(2, 'end', PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   DescriptorProto_ReservedRange() : super();
-  DescriptorProto_ReservedRange.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  DescriptorProto_ReservedRange.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  DescriptorProto_ReservedRange clone() => new DescriptorProto_ReservedRange()..mergeFromMessage(this);
+  DescriptorProto_ReservedRange.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  DescriptorProto_ReservedRange.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  DescriptorProto_ReservedRange clone() =>
+      new DescriptorProto_ReservedRange()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
-  static DescriptorProto_ReservedRange create() => new DescriptorProto_ReservedRange();
-  static PbList<DescriptorProto_ReservedRange> createRepeated() => new PbList<DescriptorProto_ReservedRange>();
+  static DescriptorProto_ReservedRange create() =>
+      new DescriptorProto_ReservedRange();
+  static PbList<DescriptorProto_ReservedRange> createRepeated() =>
+      new PbList<DescriptorProto_ReservedRange>();
   static DescriptorProto_ReservedRange getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyDescriptorProto_ReservedRange();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyDescriptorProto_ReservedRange();
     return _defaultInstance;
   }
+
   static DescriptorProto_ReservedRange _defaultInstance;
   static void $checkItem(DescriptorProto_ReservedRange v) {
-    if (v is !DescriptorProto_ReservedRange) checkItemFailed(v, 'DescriptorProto_ReservedRange');
+    if (v is! DescriptorProto_ReservedRange)
+      checkItemFailed(v, 'DescriptorProto_ReservedRange');
   }
 
   int get start => $_get(0, 1, 0);
-  set start(int v) { $_setUnsignedInt32(0, 1, v); }
+  set start(int v) {
+    $_setUnsignedInt32(0, 1, v);
+  }
+
   bool hasStart() => $_has(0, 1);
   void clearStart() => clearField(1);
 
   int get end => $_get(1, 2, 0);
-  set end(int v) { $_setUnsignedInt32(1, 2, v); }
+  set end(int v) {
+    $_setUnsignedInt32(1, 2, v);
+  }
+
   bool hasEnd() => $_has(1, 2);
   void clearEnd() => clearField(2);
 }
 
-class _ReadonlyDescriptorProto_ReservedRange extends DescriptorProto_ReservedRange with ReadonlyMessageMixin {}
+class _ReadonlyDescriptorProto_ReservedRange
+    extends DescriptorProto_ReservedRange with ReadonlyMessageMixin {}
 
 class DescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('DescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
-    ..pp/*<FieldDescriptorProto>*/(2, 'field', PbFieldType.PM, FieldDescriptorProto.$checkItem, FieldDescriptorProto.create)
-    ..pp/*<DescriptorProto>*/(3, 'nestedType', PbFieldType.PM, DescriptorProto.$checkItem, DescriptorProto.create)
-    ..pp/*<EnumDescriptorProto>*/(4, 'enumType', PbFieldType.PM, EnumDescriptorProto.$checkItem, EnumDescriptorProto.create)
-    ..pp/*<DescriptorProto_ExtensionRange>*/(5, 'extensionRange', PbFieldType.PM, DescriptorProto_ExtensionRange.$checkItem, DescriptorProto_ExtensionRange.create)
-    ..pp/*<FieldDescriptorProto>*/(6, 'extension', PbFieldType.PM, FieldDescriptorProto.$checkItem, FieldDescriptorProto.create)
-    ..a/*<MessageOptions>*/(7, 'options', PbFieldType.OM, MessageOptions.getDefault, MessageOptions.create)
-    ..pp/*<OneofDescriptorProto>*/(8, 'oneofDecl', PbFieldType.PM, OneofDescriptorProto.$checkItem, OneofDescriptorProto.create)
-    ..pp/*<DescriptorProto_ReservedRange>*/(9, 'reservedRange', PbFieldType.PM, DescriptorProto_ReservedRange.$checkItem, DescriptorProto_ReservedRange.create)
-    ..p/*<String>*/(10, 'reservedName', PbFieldType.PS)
-  ;
+    ..pp/*<FieldDescriptorProto>*/(2, 'field', PbFieldType.PM,
+        FieldDescriptorProto.$checkItem, FieldDescriptorProto.create)
+    ..pp/*<DescriptorProto>*/(3, 'nestedType', PbFieldType.PM,
+        DescriptorProto.$checkItem, DescriptorProto.create)
+    ..pp/*<EnumDescriptorProto>*/(4, 'enumType', PbFieldType.PM,
+        EnumDescriptorProto.$checkItem, EnumDescriptorProto.create)
+    ..pp/*<DescriptorProto_ExtensionRange>*/(
+        5,
+        'extensionRange',
+        PbFieldType.PM,
+        DescriptorProto_ExtensionRange.$checkItem,
+        DescriptorProto_ExtensionRange.create)
+    ..pp/*<FieldDescriptorProto>*/(6, 'extension', PbFieldType.PM,
+        FieldDescriptorProto.$checkItem, FieldDescriptorProto.create)
+    ..a/*<MessageOptions>*/(7, 'options', PbFieldType.OM,
+        MessageOptions.getDefault, MessageOptions.create)
+    ..pp/*<OneofDescriptorProto>*/(8, 'oneofDecl', PbFieldType.PM,
+        OneofDescriptorProto.$checkItem, OneofDescriptorProto.create)
+    ..pp/*<DescriptorProto_ReservedRange>*/(
+        9,
+        'reservedRange',
+        PbFieldType.PM,
+        DescriptorProto_ReservedRange.$checkItem,
+        DescriptorProto_ReservedRange.create)
+    ..p/*<String>*/(10, 'reservedName', PbFieldType.PS);
 
   DescriptorProto() : super();
-  DescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  DescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  DescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  DescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   DescriptorProto clone() => new DescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static DescriptorProto create() => new DescriptorProto();
-  static PbList<DescriptorProto> createRepeated() => new PbList<DescriptorProto>();
+  static PbList<DescriptorProto> createRepeated() =>
+      new PbList<DescriptorProto>();
   static DescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyDescriptorProto();
     return _defaultInstance;
   }
+
   static DescriptorProto _defaultInstance;
   static void $checkItem(DescriptorProto v) {
-    if (v is !DescriptorProto) checkItemFailed(v, 'DescriptorProto');
+    if (v is! DescriptorProto) checkItemFailed(v, 'DescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
@@ -232,7 +327,10 @@
   List<FieldDescriptorProto> get extension => $_get(5, 6, null);
 
   MessageOptions get options => $_get(6, 7, null);
-  set options(MessageOptions v) { setField(7, v); }
+  set options(MessageOptions v) {
+    setField(7, v);
+  }
+
   bool hasOptions() => $_has(6, 7);
   void clearOptions() => clearField(7);
 
@@ -243,307 +341,453 @@
   List<String> get reservedName => $_get(9, 10, null);
 }
 
-class _ReadonlyDescriptorProto extends DescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyDescriptorProto extends DescriptorProto
+    with ReadonlyMessageMixin {}
 
 class FieldDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('FieldDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
     ..a/*<String>*/(2, 'extendee', PbFieldType.OS)
     ..a/*<int>*/(3, 'number', PbFieldType.O3)
-    ..e/*<FieldDescriptorProto_Label>*/(4, 'label', PbFieldType.OE, FieldDescriptorProto_Label.LABEL_OPTIONAL, FieldDescriptorProto_Label.valueOf)
-    ..e/*<FieldDescriptorProto_Type>*/(5, 'type', PbFieldType.OE, FieldDescriptorProto_Type.TYPE_DOUBLE, FieldDescriptorProto_Type.valueOf)
+    ..e/*<FieldDescriptorProto_Label>*/(
+        4,
+        'label',
+        PbFieldType.OE,
+        FieldDescriptorProto_Label.LABEL_OPTIONAL,
+        FieldDescriptorProto_Label.valueOf)
+    ..e/*<FieldDescriptorProto_Type>*/(
+        5,
+        'type',
+        PbFieldType.OE,
+        FieldDescriptorProto_Type.TYPE_DOUBLE,
+        FieldDescriptorProto_Type.valueOf)
     ..a/*<String>*/(6, 'typeName', PbFieldType.OS)
     ..a/*<String>*/(7, 'defaultValue', PbFieldType.OS)
-    ..a/*<FieldOptions>*/(8, 'options', PbFieldType.OM, FieldOptions.getDefault, FieldOptions.create)
+    ..a/*<FieldOptions>*/(8, 'options', PbFieldType.OM, FieldOptions.getDefault,
+        FieldOptions.create)
     ..a/*<int>*/(9, 'oneofIndex', PbFieldType.O3)
-    ..a/*<String>*/(10, 'jsonName', PbFieldType.OS)
-  ;
+    ..a/*<String>*/(10, 'jsonName', PbFieldType.OS);
 
   FieldDescriptorProto() : super();
-  FieldDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FieldDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  FieldDescriptorProto clone() => new FieldDescriptorProto()..mergeFromMessage(this);
+  FieldDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  FieldDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  FieldDescriptorProto clone() =>
+      new FieldDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static FieldDescriptorProto create() => new FieldDescriptorProto();
-  static PbList<FieldDescriptorProto> createRepeated() => new PbList<FieldDescriptorProto>();
+  static PbList<FieldDescriptorProto> createRepeated() =>
+      new PbList<FieldDescriptorProto>();
   static FieldDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFieldDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyFieldDescriptorProto();
     return _defaultInstance;
   }
+
   static FieldDescriptorProto _defaultInstance;
   static void $checkItem(FieldDescriptorProto v) {
-    if (v is !FieldDescriptorProto) checkItemFailed(v, 'FieldDescriptorProto');
+    if (v is! FieldDescriptorProto) checkItemFailed(v, 'FieldDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   String get extendee => $_get(1, 2, '');
-  set extendee(String v) { $_setString(1, 2, v); }
+  set extendee(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasExtendee() => $_has(1, 2);
   void clearExtendee() => clearField(2);
 
   int get number => $_get(2, 3, 0);
-  set number(int v) { $_setUnsignedInt32(2, 3, v); }
+  set number(int v) {
+    $_setUnsignedInt32(2, 3, v);
+  }
+
   bool hasNumber() => $_has(2, 3);
   void clearNumber() => clearField(3);
 
   FieldDescriptorProto_Label get label => $_get(3, 4, null);
-  set label(FieldDescriptorProto_Label v) { setField(4, v); }
+  set label(FieldDescriptorProto_Label v) {
+    setField(4, v);
+  }
+
   bool hasLabel() => $_has(3, 4);
   void clearLabel() => clearField(4);
 
   FieldDescriptorProto_Type get type => $_get(4, 5, null);
-  set type(FieldDescriptorProto_Type v) { setField(5, v); }
+  set type(FieldDescriptorProto_Type v) {
+    setField(5, v);
+  }
+
   bool hasType() => $_has(4, 5);
   void clearType() => clearField(5);
 
   String get typeName => $_get(5, 6, '');
-  set typeName(String v) { $_setString(5, 6, v); }
+  set typeName(String v) {
+    $_setString(5, 6, v);
+  }
+
   bool hasTypeName() => $_has(5, 6);
   void clearTypeName() => clearField(6);
 
   String get defaultValue => $_get(6, 7, '');
-  set defaultValue(String v) { $_setString(6, 7, v); }
+  set defaultValue(String v) {
+    $_setString(6, 7, v);
+  }
+
   bool hasDefaultValue() => $_has(6, 7);
   void clearDefaultValue() => clearField(7);
 
   FieldOptions get options => $_get(7, 8, null);
-  set options(FieldOptions v) { setField(8, v); }
+  set options(FieldOptions v) {
+    setField(8, v);
+  }
+
   bool hasOptions() => $_has(7, 8);
   void clearOptions() => clearField(8);
 
   int get oneofIndex => $_get(8, 9, 0);
-  set oneofIndex(int v) { $_setUnsignedInt32(8, 9, v); }
+  set oneofIndex(int v) {
+    $_setUnsignedInt32(8, 9, v);
+  }
+
   bool hasOneofIndex() => $_has(8, 9);
   void clearOneofIndex() => clearField(9);
 
   String get jsonName => $_get(9, 10, '');
-  set jsonName(String v) { $_setString(9, 10, v); }
+  set jsonName(String v) {
+    $_setString(9, 10, v);
+  }
+
   bool hasJsonName() => $_has(9, 10);
   void clearJsonName() => clearField(10);
 }
 
-class _ReadonlyFieldDescriptorProto extends FieldDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyFieldDescriptorProto extends FieldDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class OneofDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('OneofDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
-    ..a/*<OneofOptions>*/(2, 'options', PbFieldType.OM, OneofOptions.getDefault, OneofOptions.create)
-  ;
+    ..a/*<OneofOptions>*/(2, 'options', PbFieldType.OM, OneofOptions.getDefault,
+        OneofOptions.create);
 
   OneofDescriptorProto() : super();
-  OneofDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  OneofDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  OneofDescriptorProto clone() => new OneofDescriptorProto()..mergeFromMessage(this);
+  OneofDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  OneofDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  OneofDescriptorProto clone() =>
+      new OneofDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static OneofDescriptorProto create() => new OneofDescriptorProto();
-  static PbList<OneofDescriptorProto> createRepeated() => new PbList<OneofDescriptorProto>();
+  static PbList<OneofDescriptorProto> createRepeated() =>
+      new PbList<OneofDescriptorProto>();
   static OneofDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyOneofDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyOneofDescriptorProto();
     return _defaultInstance;
   }
+
   static OneofDescriptorProto _defaultInstance;
   static void $checkItem(OneofDescriptorProto v) {
-    if (v is !OneofDescriptorProto) checkItemFailed(v, 'OneofDescriptorProto');
+    if (v is! OneofDescriptorProto) checkItemFailed(v, 'OneofDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   OneofOptions get options => $_get(1, 2, null);
-  set options(OneofOptions v) { setField(2, v); }
+  set options(OneofOptions v) {
+    setField(2, v);
+  }
+
   bool hasOptions() => $_has(1, 2);
   void clearOptions() => clearField(2);
 }
 
-class _ReadonlyOneofDescriptorProto extends OneofDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyOneofDescriptorProto extends OneofDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class EnumDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('EnumDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
-    ..pp/*<EnumValueDescriptorProto>*/(2, 'value', PbFieldType.PM, EnumValueDescriptorProto.$checkItem, EnumValueDescriptorProto.create)
-    ..a/*<EnumOptions>*/(3, 'options', PbFieldType.OM, EnumOptions.getDefault, EnumOptions.create)
-  ;
+    ..pp/*<EnumValueDescriptorProto>*/(2, 'value', PbFieldType.PM,
+        EnumValueDescriptorProto.$checkItem, EnumValueDescriptorProto.create)
+    ..a/*<EnumOptions>*/(3, 'options', PbFieldType.OM, EnumOptions.getDefault,
+        EnumOptions.create);
 
   EnumDescriptorProto() : super();
-  EnumDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  EnumDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  EnumDescriptorProto clone() => new EnumDescriptorProto()..mergeFromMessage(this);
+  EnumDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  EnumDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  EnumDescriptorProto clone() =>
+      new EnumDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static EnumDescriptorProto create() => new EnumDescriptorProto();
-  static PbList<EnumDescriptorProto> createRepeated() => new PbList<EnumDescriptorProto>();
+  static PbList<EnumDescriptorProto> createRepeated() =>
+      new PbList<EnumDescriptorProto>();
   static EnumDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyEnumDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyEnumDescriptorProto();
     return _defaultInstance;
   }
+
   static EnumDescriptorProto _defaultInstance;
   static void $checkItem(EnumDescriptorProto v) {
-    if (v is !EnumDescriptorProto) checkItemFailed(v, 'EnumDescriptorProto');
+    if (v is! EnumDescriptorProto) checkItemFailed(v, 'EnumDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   List<EnumValueDescriptorProto> get value => $_get(1, 2, null);
 
   EnumOptions get options => $_get(2, 3, null);
-  set options(EnumOptions v) { setField(3, v); }
+  set options(EnumOptions v) {
+    setField(3, v);
+  }
+
   bool hasOptions() => $_has(2, 3);
   void clearOptions() => clearField(3);
 }
 
-class _ReadonlyEnumDescriptorProto extends EnumDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyEnumDescriptorProto extends EnumDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class EnumValueDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('EnumValueDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
     ..a/*<int>*/(2, 'number', PbFieldType.O3)
-    ..a/*<EnumValueOptions>*/(3, 'options', PbFieldType.OM, EnumValueOptions.getDefault, EnumValueOptions.create)
-  ;
+    ..a/*<EnumValueOptions>*/(3, 'options', PbFieldType.OM,
+        EnumValueOptions.getDefault, EnumValueOptions.create);
 
   EnumValueDescriptorProto() : super();
-  EnumValueDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  EnumValueDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  EnumValueDescriptorProto clone() => new EnumValueDescriptorProto()..mergeFromMessage(this);
+  EnumValueDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  EnumValueDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  EnumValueDescriptorProto clone() =>
+      new EnumValueDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static EnumValueDescriptorProto create() => new EnumValueDescriptorProto();
-  static PbList<EnumValueDescriptorProto> createRepeated() => new PbList<EnumValueDescriptorProto>();
+  static PbList<EnumValueDescriptorProto> createRepeated() =>
+      new PbList<EnumValueDescriptorProto>();
   static EnumValueDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyEnumValueDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyEnumValueDescriptorProto();
     return _defaultInstance;
   }
+
   static EnumValueDescriptorProto _defaultInstance;
   static void $checkItem(EnumValueDescriptorProto v) {
-    if (v is !EnumValueDescriptorProto) checkItemFailed(v, 'EnumValueDescriptorProto');
+    if (v is! EnumValueDescriptorProto)
+      checkItemFailed(v, 'EnumValueDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   int get number => $_get(1, 2, 0);
-  set number(int v) { $_setUnsignedInt32(1, 2, v); }
+  set number(int v) {
+    $_setUnsignedInt32(1, 2, v);
+  }
+
   bool hasNumber() => $_has(1, 2);
   void clearNumber() => clearField(2);
 
   EnumValueOptions get options => $_get(2, 3, null);
-  set options(EnumValueOptions v) { setField(3, v); }
+  set options(EnumValueOptions v) {
+    setField(3, v);
+  }
+
   bool hasOptions() => $_has(2, 3);
   void clearOptions() => clearField(3);
 }
 
-class _ReadonlyEnumValueDescriptorProto extends EnumValueDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyEnumValueDescriptorProto extends EnumValueDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class ServiceDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('ServiceDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
-    ..pp/*<MethodDescriptorProto>*/(2, 'method', PbFieldType.PM, MethodDescriptorProto.$checkItem, MethodDescriptorProto.create)
-    ..a/*<ServiceOptions>*/(3, 'options', PbFieldType.OM, ServiceOptions.getDefault, ServiceOptions.create)
-  ;
+    ..pp/*<MethodDescriptorProto>*/(2, 'method', PbFieldType.PM,
+        MethodDescriptorProto.$checkItem, MethodDescriptorProto.create)
+    ..a/*<ServiceOptions>*/(3, 'options', PbFieldType.OM,
+        ServiceOptions.getDefault, ServiceOptions.create);
 
   ServiceDescriptorProto() : super();
-  ServiceDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ServiceDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  ServiceDescriptorProto clone() => new ServiceDescriptorProto()..mergeFromMessage(this);
+  ServiceDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  ServiceDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  ServiceDescriptorProto clone() =>
+      new ServiceDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static ServiceDescriptorProto create() => new ServiceDescriptorProto();
-  static PbList<ServiceDescriptorProto> createRepeated() => new PbList<ServiceDescriptorProto>();
+  static PbList<ServiceDescriptorProto> createRepeated() =>
+      new PbList<ServiceDescriptorProto>();
   static ServiceDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyServiceDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyServiceDescriptorProto();
     return _defaultInstance;
   }
+
   static ServiceDescriptorProto _defaultInstance;
   static void $checkItem(ServiceDescriptorProto v) {
-    if (v is !ServiceDescriptorProto) checkItemFailed(v, 'ServiceDescriptorProto');
+    if (v is! ServiceDescriptorProto)
+      checkItemFailed(v, 'ServiceDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   List<MethodDescriptorProto> get method => $_get(1, 2, null);
 
   ServiceOptions get options => $_get(2, 3, null);
-  set options(ServiceOptions v) { setField(3, v); }
+  set options(ServiceOptions v) {
+    setField(3, v);
+  }
+
   bool hasOptions() => $_has(2, 3);
   void clearOptions() => clearField(3);
 }
 
-class _ReadonlyServiceDescriptorProto extends ServiceDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyServiceDescriptorProto extends ServiceDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class MethodDescriptorProto extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('MethodDescriptorProto')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
     ..a/*<String>*/(2, 'inputType', PbFieldType.OS)
     ..a/*<String>*/(3, 'outputType', PbFieldType.OS)
-    ..a/*<MethodOptions>*/(4, 'options', PbFieldType.OM, MethodOptions.getDefault, MethodOptions.create)
+    ..a/*<MethodOptions>*/(4, 'options', PbFieldType.OM,
+        MethodOptions.getDefault, MethodOptions.create)
     ..a/*<bool>*/(5, 'clientStreaming', PbFieldType.OB)
-    ..a/*<bool>*/(6, 'serverStreaming', PbFieldType.OB)
-  ;
+    ..a/*<bool>*/(6, 'serverStreaming', PbFieldType.OB);
 
   MethodDescriptorProto() : super();
-  MethodDescriptorProto.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MethodDescriptorProto.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  MethodDescriptorProto clone() => new MethodDescriptorProto()..mergeFromMessage(this);
+  MethodDescriptorProto.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  MethodDescriptorProto.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  MethodDescriptorProto clone() =>
+      new MethodDescriptorProto()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static MethodDescriptorProto create() => new MethodDescriptorProto();
-  static PbList<MethodDescriptorProto> createRepeated() => new PbList<MethodDescriptorProto>();
+  static PbList<MethodDescriptorProto> createRepeated() =>
+      new PbList<MethodDescriptorProto>();
   static MethodDescriptorProto getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMethodDescriptorProto();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyMethodDescriptorProto();
     return _defaultInstance;
   }
+
   static MethodDescriptorProto _defaultInstance;
   static void $checkItem(MethodDescriptorProto v) {
-    if (v is !MethodDescriptorProto) checkItemFailed(v, 'MethodDescriptorProto');
+    if (v is! MethodDescriptorProto)
+      checkItemFailed(v, 'MethodDescriptorProto');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   String get inputType => $_get(1, 2, '');
-  set inputType(String v) { $_setString(1, 2, v); }
+  set inputType(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasInputType() => $_has(1, 2);
   void clearInputType() => clearField(2);
 
   String get outputType => $_get(2, 3, '');
-  set outputType(String v) { $_setString(2, 3, v); }
+  set outputType(String v) {
+    $_setString(2, 3, v);
+  }
+
   bool hasOutputType() => $_has(2, 3);
   void clearOutputType() => clearField(3);
 
   MethodOptions get options => $_get(3, 4, null);
-  set options(MethodOptions v) { setField(4, v); }
+  set options(MethodOptions v) {
+    setField(4, v);
+  }
+
   bool hasOptions() => $_has(3, 4);
   void clearOptions() => clearField(4);
 
   bool get clientStreaming => $_get(4, 5, false);
-  set clientStreaming(bool v) { $_setBool(4, 5, v); }
+  set clientStreaming(bool v) {
+    $_setBool(4, 5, v);
+  }
+
   bool hasClientStreaming() => $_has(4, 5);
   void clearClientStreaming() => clearField(5);
 
   bool get serverStreaming => $_get(5, 6, false);
-  set serverStreaming(bool v) { $_setBool(5, 6, v); }
+  set serverStreaming(bool v) {
+    $_setBool(5, 6, v);
+  }
+
   bool hasServerStreaming() => $_has(5, 6);
   void clearServerStreaming() => clearField(6);
 }
 
-class _ReadonlyMethodDescriptorProto extends MethodDescriptorProto with ReadonlyMessageMixin {}
+class _ReadonlyMethodDescriptorProto extends MethodDescriptorProto
+    with ReadonlyMessageMixin {}
 
 class FileOptions extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('FileOptions')
     ..a/*<String>*/(1, 'javaPackage', PbFieldType.OS)
     ..a/*<String>*/(8, 'javaOuterClassname', PbFieldType.OS)
-    ..e/*<FileOptions_OptimizeMode>*/(9, 'optimizeFor', PbFieldType.OE, FileOptions_OptimizeMode.SPEED, FileOptions_OptimizeMode.valueOf)
+    ..e/*<FileOptions_OptimizeMode>*/(9, 'optimizeFor', PbFieldType.OE,
+        FileOptions_OptimizeMode.SPEED, FileOptions_OptimizeMode.valueOf)
     ..a/*<bool>*/(10, 'javaMultipleFiles', PbFieldType.OB)
     ..a/*<String>*/(11, 'goPackage', PbFieldType.OS)
     ..a/*<bool>*/(16, 'ccGenericServices', PbFieldType.OB)
@@ -558,13 +802,17 @@
     ..a/*<String>*/(39, 'swiftPrefix', PbFieldType.OS)
     ..a/*<String>*/(40, 'phpClassPrefix', PbFieldType.OS)
     ..a/*<String>*/(41, 'phpNamespace', PbFieldType.OS)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   FileOptions() : super();
-  FileOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FileOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  FileOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  FileOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   FileOptions clone() => new FileOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static FileOptions create() => new FileOptions();
@@ -573,93 +821,145 @@
     if (_defaultInstance == null) _defaultInstance = new _ReadonlyFileOptions();
     return _defaultInstance;
   }
+
   static FileOptions _defaultInstance;
   static void $checkItem(FileOptions v) {
-    if (v is !FileOptions) checkItemFailed(v, 'FileOptions');
+    if (v is! FileOptions) checkItemFailed(v, 'FileOptions');
   }
 
   String get javaPackage => $_get(0, 1, '');
-  set javaPackage(String v) { $_setString(0, 1, v); }
+  set javaPackage(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasJavaPackage() => $_has(0, 1);
   void clearJavaPackage() => clearField(1);
 
   String get javaOuterClassname => $_get(1, 8, '');
-  set javaOuterClassname(String v) { $_setString(1, 8, v); }
+  set javaOuterClassname(String v) {
+    $_setString(1, 8, v);
+  }
+
   bool hasJavaOuterClassname() => $_has(1, 8);
   void clearJavaOuterClassname() => clearField(8);
 
   FileOptions_OptimizeMode get optimizeFor => $_get(2, 9, null);
-  set optimizeFor(FileOptions_OptimizeMode v) { setField(9, v); }
+  set optimizeFor(FileOptions_OptimizeMode v) {
+    setField(9, v);
+  }
+
   bool hasOptimizeFor() => $_has(2, 9);
   void clearOptimizeFor() => clearField(9);
 
   bool get javaMultipleFiles => $_get(3, 10, false);
-  set javaMultipleFiles(bool v) { $_setBool(3, 10, v); }
+  set javaMultipleFiles(bool v) {
+    $_setBool(3, 10, v);
+  }
+
   bool hasJavaMultipleFiles() => $_has(3, 10);
   void clearJavaMultipleFiles() => clearField(10);
 
   String get goPackage => $_get(4, 11, '');
-  set goPackage(String v) { $_setString(4, 11, v); }
+  set goPackage(String v) {
+    $_setString(4, 11, v);
+  }
+
   bool hasGoPackage() => $_has(4, 11);
   void clearGoPackage() => clearField(11);
 
   bool get ccGenericServices => $_get(5, 16, false);
-  set ccGenericServices(bool v) { $_setBool(5, 16, v); }
+  set ccGenericServices(bool v) {
+    $_setBool(5, 16, v);
+  }
+
   bool hasCcGenericServices() => $_has(5, 16);
   void clearCcGenericServices() => clearField(16);
 
   bool get javaGenericServices => $_get(6, 17, false);
-  set javaGenericServices(bool v) { $_setBool(6, 17, v); }
+  set javaGenericServices(bool v) {
+    $_setBool(6, 17, v);
+  }
+
   bool hasJavaGenericServices() => $_has(6, 17);
   void clearJavaGenericServices() => clearField(17);
 
   bool get pyGenericServices => $_get(7, 18, false);
-  set pyGenericServices(bool v) { $_setBool(7, 18, v); }
+  set pyGenericServices(bool v) {
+    $_setBool(7, 18, v);
+  }
+
   bool hasPyGenericServices() => $_has(7, 18);
   void clearPyGenericServices() => clearField(18);
 
   bool get javaGenerateEqualsAndHash => $_get(8, 20, false);
-  set javaGenerateEqualsAndHash(bool v) { $_setBool(8, 20, v); }
+  set javaGenerateEqualsAndHash(bool v) {
+    $_setBool(8, 20, v);
+  }
+
   bool hasJavaGenerateEqualsAndHash() => $_has(8, 20);
   void clearJavaGenerateEqualsAndHash() => clearField(20);
 
   bool get deprecated => $_get(9, 23, false);
-  set deprecated(bool v) { $_setBool(9, 23, v); }
+  set deprecated(bool v) {
+    $_setBool(9, 23, v);
+  }
+
   bool hasDeprecated() => $_has(9, 23);
   void clearDeprecated() => clearField(23);
 
   bool get javaStringCheckUtf8 => $_get(10, 27, false);
-  set javaStringCheckUtf8(bool v) { $_setBool(10, 27, v); }
+  set javaStringCheckUtf8(bool v) {
+    $_setBool(10, 27, v);
+  }
+
   bool hasJavaStringCheckUtf8() => $_has(10, 27);
   void clearJavaStringCheckUtf8() => clearField(27);
 
   bool get ccEnableArenas => $_get(11, 31, false);
-  set ccEnableArenas(bool v) { $_setBool(11, 31, v); }
+  set ccEnableArenas(bool v) {
+    $_setBool(11, 31, v);
+  }
+
   bool hasCcEnableArenas() => $_has(11, 31);
   void clearCcEnableArenas() => clearField(31);
 
   String get objcClassPrefix => $_get(12, 36, '');
-  set objcClassPrefix(String v) { $_setString(12, 36, v); }
+  set objcClassPrefix(String v) {
+    $_setString(12, 36, v);
+  }
+
   bool hasObjcClassPrefix() => $_has(12, 36);
   void clearObjcClassPrefix() => clearField(36);
 
   String get csharpNamespace => $_get(13, 37, '');
-  set csharpNamespace(String v) { $_setString(13, 37, v); }
+  set csharpNamespace(String v) {
+    $_setString(13, 37, v);
+  }
+
   bool hasCsharpNamespace() => $_has(13, 37);
   void clearCsharpNamespace() => clearField(37);
 
   String get swiftPrefix => $_get(14, 39, '');
-  set swiftPrefix(String v) { $_setString(14, 39, v); }
+  set swiftPrefix(String v) {
+    $_setString(14, 39, v);
+  }
+
   bool hasSwiftPrefix() => $_has(14, 39);
   void clearSwiftPrefix() => clearField(39);
 
   String get phpClassPrefix => $_get(15, 40, '');
-  set phpClassPrefix(String v) { $_setString(15, 40, v); }
+  set phpClassPrefix(String v) {
+    $_setString(15, 40, v);
+  }
+
   bool hasPhpClassPrefix() => $_has(15, 40);
   void clearPhpClassPrefix() => clearField(40);
 
   String get phpNamespace => $_get(16, 41, '');
-  set phpNamespace(String v) { $_setString(16, 41, v); }
+  set phpNamespace(String v) {
+    $_setString(16, 41, v);
+  }
+
   bool hasPhpNamespace() => $_has(16, 41);
   void clearPhpNamespace() => clearField(41);
 
@@ -674,106 +974,152 @@
     ..a/*<bool>*/(2, 'noStandardDescriptorAccessor', PbFieldType.OB)
     ..a/*<bool>*/(3, 'deprecated', PbFieldType.OB)
     ..a/*<bool>*/(7, 'mapEntry', PbFieldType.OB)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   MessageOptions() : super();
-  MessageOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MessageOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  MessageOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  MessageOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   MessageOptions clone() => new MessageOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static MessageOptions create() => new MessageOptions();
-  static PbList<MessageOptions> createRepeated() => new PbList<MessageOptions>();
+  static PbList<MessageOptions> createRepeated() =>
+      new PbList<MessageOptions>();
   static MessageOptions getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMessageOptions();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyMessageOptions();
     return _defaultInstance;
   }
+
   static MessageOptions _defaultInstance;
   static void $checkItem(MessageOptions v) {
-    if (v is !MessageOptions) checkItemFailed(v, 'MessageOptions');
+    if (v is! MessageOptions) checkItemFailed(v, 'MessageOptions');
   }
 
   bool get messageSetWireFormat => $_get(0, 1, false);
-  set messageSetWireFormat(bool v) { $_setBool(0, 1, v); }
+  set messageSetWireFormat(bool v) {
+    $_setBool(0, 1, v);
+  }
+
   bool hasMessageSetWireFormat() => $_has(0, 1);
   void clearMessageSetWireFormat() => clearField(1);
 
   bool get noStandardDescriptorAccessor => $_get(1, 2, false);
-  set noStandardDescriptorAccessor(bool v) { $_setBool(1, 2, v); }
+  set noStandardDescriptorAccessor(bool v) {
+    $_setBool(1, 2, v);
+  }
+
   bool hasNoStandardDescriptorAccessor() => $_has(1, 2);
   void clearNoStandardDescriptorAccessor() => clearField(2);
 
   bool get deprecated => $_get(2, 3, false);
-  set deprecated(bool v) { $_setBool(2, 3, v); }
+  set deprecated(bool v) {
+    $_setBool(2, 3, v);
+  }
+
   bool hasDeprecated() => $_has(2, 3);
   void clearDeprecated() => clearField(3);
 
   bool get mapEntry => $_get(3, 7, false);
-  set mapEntry(bool v) { $_setBool(3, 7, v); }
+  set mapEntry(bool v) {
+    $_setBool(3, 7, v);
+  }
+
   bool hasMapEntry() => $_has(3, 7);
   void clearMapEntry() => clearField(7);
 
   List<UninterpretedOption> get uninterpretedOption => $_get(4, 999, null);
 }
 
-class _ReadonlyMessageOptions extends MessageOptions with ReadonlyMessageMixin {}
+class _ReadonlyMessageOptions extends MessageOptions with ReadonlyMessageMixin {
+}
 
 class FieldOptions extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('FieldOptions')
-    ..e/*<FieldOptions_CType>*/(1, 'ctype', PbFieldType.OE, FieldOptions_CType.STRING, FieldOptions_CType.valueOf)
+    ..e/*<FieldOptions_CType>*/(1, 'ctype', PbFieldType.OE,
+        FieldOptions_CType.STRING, FieldOptions_CType.valueOf)
     ..a/*<bool>*/(2, 'packed', PbFieldType.OB)
     ..a/*<bool>*/(3, 'deprecated', PbFieldType.OB)
     ..a/*<bool>*/(5, 'lazy', PbFieldType.OB)
-    ..e/*<FieldOptions_JSType>*/(6, 'jstype', PbFieldType.OE, FieldOptions_JSType.JS_NORMAL, FieldOptions_JSType.valueOf)
+    ..e/*<FieldOptions_JSType>*/(6, 'jstype', PbFieldType.OE,
+        FieldOptions_JSType.JS_NORMAL, FieldOptions_JSType.valueOf)
     ..a/*<bool>*/(10, 'weak', PbFieldType.OB)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   FieldOptions() : super();
-  FieldOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  FieldOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  FieldOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  FieldOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   FieldOptions clone() => new FieldOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static FieldOptions create() => new FieldOptions();
   static PbList<FieldOptions> createRepeated() => new PbList<FieldOptions>();
   static FieldOptions getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyFieldOptions();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyFieldOptions();
     return _defaultInstance;
   }
+
   static FieldOptions _defaultInstance;
   static void $checkItem(FieldOptions v) {
-    if (v is !FieldOptions) checkItemFailed(v, 'FieldOptions');
+    if (v is! FieldOptions) checkItemFailed(v, 'FieldOptions');
   }
 
   FieldOptions_CType get ctype => $_get(0, 1, null);
-  set ctype(FieldOptions_CType v) { setField(1, v); }
+  set ctype(FieldOptions_CType v) {
+    setField(1, v);
+  }
+
   bool hasCtype() => $_has(0, 1);
   void clearCtype() => clearField(1);
 
   bool get packed => $_get(1, 2, false);
-  set packed(bool v) { $_setBool(1, 2, v); }
+  set packed(bool v) {
+    $_setBool(1, 2, v);
+  }
+
   bool hasPacked() => $_has(1, 2);
   void clearPacked() => clearField(2);
 
   bool get deprecated => $_get(2, 3, false);
-  set deprecated(bool v) { $_setBool(2, 3, v); }
+  set deprecated(bool v) {
+    $_setBool(2, 3, v);
+  }
+
   bool hasDeprecated() => $_has(2, 3);
   void clearDeprecated() => clearField(3);
 
   bool get lazy => $_get(3, 5, false);
-  set lazy(bool v) { $_setBool(3, 5, v); }
+  set lazy(bool v) {
+    $_setBool(3, 5, v);
+  }
+
   bool hasLazy() => $_has(3, 5);
   void clearLazy() => clearField(5);
 
   FieldOptions_JSType get jstype => $_get(4, 6, null);
-  set jstype(FieldOptions_JSType v) { setField(6, v); }
+  set jstype(FieldOptions_JSType v) {
+    setField(6, v);
+  }
+
   bool hasJstype() => $_has(4, 6);
   void clearJstype() => clearField(6);
 
   bool get weak => $_get(5, 10, false);
-  set weak(bool v) { $_setBool(5, 10, v); }
+  set weak(bool v) {
+    $_setBool(5, 10, v);
+  }
+
   bool hasWeak() => $_has(5, 10);
   void clearWeak() => clearField(10);
 
@@ -784,24 +1130,30 @@
 
 class OneofOptions extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('OneofOptions')
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   OneofOptions() : super();
-  OneofOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  OneofOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  OneofOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  OneofOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   OneofOptions clone() => new OneofOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static OneofOptions create() => new OneofOptions();
   static PbList<OneofOptions> createRepeated() => new PbList<OneofOptions>();
   static OneofOptions getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyOneofOptions();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyOneofOptions();
     return _defaultInstance;
   }
+
   static OneofOptions _defaultInstance;
   static void $checkItem(OneofOptions v) {
-    if (v is !OneofOptions) checkItemFailed(v, 'OneofOptions');
+    if (v is! OneofOptions) checkItemFailed(v, 'OneofOptions');
   }
 
   List<UninterpretedOption> get uninterpretedOption => $_get(0, 999, null);
@@ -813,13 +1165,17 @@
   static final BuilderInfo _i = new BuilderInfo('EnumOptions')
     ..a/*<bool>*/(2, 'allowAlias', PbFieldType.OB)
     ..a/*<bool>*/(3, 'deprecated', PbFieldType.OB)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   EnumOptions() : super();
-  EnumOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  EnumOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  EnumOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  EnumOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   EnumOptions clone() => new EnumOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static EnumOptions create() => new EnumOptions();
@@ -828,18 +1184,25 @@
     if (_defaultInstance == null) _defaultInstance = new _ReadonlyEnumOptions();
     return _defaultInstance;
   }
+
   static EnumOptions _defaultInstance;
   static void $checkItem(EnumOptions v) {
-    if (v is !EnumOptions) checkItemFailed(v, 'EnumOptions');
+    if (v is! EnumOptions) checkItemFailed(v, 'EnumOptions');
   }
 
   bool get allowAlias => $_get(0, 2, false);
-  set allowAlias(bool v) { $_setBool(0, 2, v); }
+  set allowAlias(bool v) {
+    $_setBool(0, 2, v);
+  }
+
   bool hasAllowAlias() => $_has(0, 2);
   void clearAllowAlias() => clearField(2);
 
   bool get deprecated => $_get(1, 3, false);
-  set deprecated(bool v) { $_setBool(1, 3, v); }
+  set deprecated(bool v) {
+    $_setBool(1, 3, v);
+  }
+
   bool hasDeprecated() => $_has(1, 3);
   void clearDeprecated() => clearField(3);
 
@@ -851,100 +1214,139 @@
 class EnumValueOptions extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('EnumValueOptions')
     ..a/*<bool>*/(1, 'deprecated', PbFieldType.OB)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   EnumValueOptions() : super();
-  EnumValueOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  EnumValueOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  EnumValueOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  EnumValueOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   EnumValueOptions clone() => new EnumValueOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static EnumValueOptions create() => new EnumValueOptions();
-  static PbList<EnumValueOptions> createRepeated() => new PbList<EnumValueOptions>();
+  static PbList<EnumValueOptions> createRepeated() =>
+      new PbList<EnumValueOptions>();
   static EnumValueOptions getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyEnumValueOptions();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyEnumValueOptions();
     return _defaultInstance;
   }
+
   static EnumValueOptions _defaultInstance;
   static void $checkItem(EnumValueOptions v) {
-    if (v is !EnumValueOptions) checkItemFailed(v, 'EnumValueOptions');
+    if (v is! EnumValueOptions) checkItemFailed(v, 'EnumValueOptions');
   }
 
   bool get deprecated => $_get(0, 1, false);
-  set deprecated(bool v) { $_setBool(0, 1, v); }
+  set deprecated(bool v) {
+    $_setBool(0, 1, v);
+  }
+
   bool hasDeprecated() => $_has(0, 1);
   void clearDeprecated() => clearField(1);
 
   List<UninterpretedOption> get uninterpretedOption => $_get(1, 999, null);
 }
 
-class _ReadonlyEnumValueOptions extends EnumValueOptions with ReadonlyMessageMixin {}
+class _ReadonlyEnumValueOptions extends EnumValueOptions
+    with ReadonlyMessageMixin {}
 
 class ServiceOptions extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('ServiceOptions')
     ..a/*<bool>*/(33, 'deprecated', PbFieldType.OB)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   ServiceOptions() : super();
-  ServiceOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  ServiceOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  ServiceOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  ServiceOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   ServiceOptions clone() => new ServiceOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static ServiceOptions create() => new ServiceOptions();
-  static PbList<ServiceOptions> createRepeated() => new PbList<ServiceOptions>();
+  static PbList<ServiceOptions> createRepeated() =>
+      new PbList<ServiceOptions>();
   static ServiceOptions getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyServiceOptions();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyServiceOptions();
     return _defaultInstance;
   }
+
   static ServiceOptions _defaultInstance;
   static void $checkItem(ServiceOptions v) {
-    if (v is !ServiceOptions) checkItemFailed(v, 'ServiceOptions');
+    if (v is! ServiceOptions) checkItemFailed(v, 'ServiceOptions');
   }
 
   bool get deprecated => $_get(0, 33, false);
-  set deprecated(bool v) { $_setBool(0, 33, v); }
+  set deprecated(bool v) {
+    $_setBool(0, 33, v);
+  }
+
   bool hasDeprecated() => $_has(0, 33);
   void clearDeprecated() => clearField(33);
 
   List<UninterpretedOption> get uninterpretedOption => $_get(1, 999, null);
 }
 
-class _ReadonlyServiceOptions extends ServiceOptions with ReadonlyMessageMixin {}
+class _ReadonlyServiceOptions extends ServiceOptions with ReadonlyMessageMixin {
+}
 
 class MethodOptions extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('MethodOptions')
     ..a/*<bool>*/(33, 'deprecated', PbFieldType.OB)
-    ..e/*<MethodOptions_IdempotencyLevel>*/(34, 'idempotencyLevel', PbFieldType.OE, MethodOptions_IdempotencyLevel.IDEMPOTENCY_UNKNOWN, MethodOptions_IdempotencyLevel.valueOf)
-    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM, UninterpretedOption.$checkItem, UninterpretedOption.create)
-    ..hasExtensions = true
-  ;
+    ..e/*<MethodOptions_IdempotencyLevel>*/(
+        34,
+        'idempotencyLevel',
+        PbFieldType.OE,
+        MethodOptions_IdempotencyLevel.IDEMPOTENCY_UNKNOWN,
+        MethodOptions_IdempotencyLevel.valueOf)
+    ..pp/*<UninterpretedOption>*/(999, 'uninterpretedOption', PbFieldType.PM,
+        UninterpretedOption.$checkItem, UninterpretedOption.create)
+    ..hasExtensions = true;
 
   MethodOptions() : super();
-  MethodOptions.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  MethodOptions.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  MethodOptions.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  MethodOptions.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   MethodOptions clone() => new MethodOptions()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static MethodOptions create() => new MethodOptions();
   static PbList<MethodOptions> createRepeated() => new PbList<MethodOptions>();
   static MethodOptions getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyMethodOptions();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyMethodOptions();
     return _defaultInstance;
   }
+
   static MethodOptions _defaultInstance;
   static void $checkItem(MethodOptions v) {
-    if (v is !MethodOptions) checkItemFailed(v, 'MethodOptions');
+    if (v is! MethodOptions) checkItemFailed(v, 'MethodOptions');
   }
 
   bool get deprecated => $_get(0, 33, false);
-  set deprecated(bool v) { $_setBool(0, 33, v); }
+  set deprecated(bool v) {
+    $_setBool(0, 33, v);
+  }
+
   bool hasDeprecated() => $_has(0, 33);
   void clearDeprecated() => clearField(33);
 
   MethodOptions_IdempotencyLevel get idempotencyLevel => $_get(1, 34, null);
-  set idempotencyLevel(MethodOptions_IdempotencyLevel v) { setField(34, v); }
+  set idempotencyLevel(MethodOptions_IdempotencyLevel v) {
+    setField(34, v);
+  }
+
   bool hasIdempotencyLevel() => $_has(1, 34);
   void clearIdempotencyLevel() => clearField(34);
 
@@ -956,99 +1358,146 @@
 class UninterpretedOption_NamePart extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('UninterpretedOption_NamePart')
     ..a/*<String>*/(1, 'namePart', PbFieldType.QS)
-    ..a/*<bool>*/(2, 'isExtension', PbFieldType.QB)
-  ;
+    ..a/*<bool>*/(2, 'isExtension', PbFieldType.QB);
 
   UninterpretedOption_NamePart() : super();
-  UninterpretedOption_NamePart.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  UninterpretedOption_NamePart.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  UninterpretedOption_NamePart clone() => new UninterpretedOption_NamePart()..mergeFromMessage(this);
+  UninterpretedOption_NamePart.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  UninterpretedOption_NamePart.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  UninterpretedOption_NamePart clone() =>
+      new UninterpretedOption_NamePart()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
-  static UninterpretedOption_NamePart create() => new UninterpretedOption_NamePart();
-  static PbList<UninterpretedOption_NamePart> createRepeated() => new PbList<UninterpretedOption_NamePart>();
+  static UninterpretedOption_NamePart create() =>
+      new UninterpretedOption_NamePart();
+  static PbList<UninterpretedOption_NamePart> createRepeated() =>
+      new PbList<UninterpretedOption_NamePart>();
   static UninterpretedOption_NamePart getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyUninterpretedOption_NamePart();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyUninterpretedOption_NamePart();
     return _defaultInstance;
   }
+
   static UninterpretedOption_NamePart _defaultInstance;
   static void $checkItem(UninterpretedOption_NamePart v) {
-    if (v is !UninterpretedOption_NamePart) checkItemFailed(v, 'UninterpretedOption_NamePart');
+    if (v is! UninterpretedOption_NamePart)
+      checkItemFailed(v, 'UninterpretedOption_NamePart');
   }
 
   String get namePart => $_get(0, 1, '');
-  set namePart(String v) { $_setString(0, 1, v); }
+  set namePart(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasNamePart() => $_has(0, 1);
   void clearNamePart() => clearField(1);
 
   bool get isExtension => $_get(1, 2, false);
-  set isExtension(bool v) { $_setBool(1, 2, v); }
+  set isExtension(bool v) {
+    $_setBool(1, 2, v);
+  }
+
   bool hasIsExtension() => $_has(1, 2);
   void clearIsExtension() => clearField(2);
 }
 
-class _ReadonlyUninterpretedOption_NamePart extends UninterpretedOption_NamePart with ReadonlyMessageMixin {}
+class _ReadonlyUninterpretedOption_NamePart extends UninterpretedOption_NamePart
+    with ReadonlyMessageMixin {}
 
 class UninterpretedOption extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('UninterpretedOption')
-    ..pp/*<UninterpretedOption_NamePart>*/(2, 'name', PbFieldType.PM, UninterpretedOption_NamePart.$checkItem, UninterpretedOption_NamePart.create)
+    ..pp/*<UninterpretedOption_NamePart>*/(
+        2,
+        'name',
+        PbFieldType.PM,
+        UninterpretedOption_NamePart.$checkItem,
+        UninterpretedOption_NamePart.create)
     ..a/*<String>*/(3, 'identifierValue', PbFieldType.OS)
     ..a/*<Int64>*/(4, 'positiveIntValue', PbFieldType.OU6, Int64.ZERO)
     ..a/*<Int64>*/(5, 'negativeIntValue', PbFieldType.O6, Int64.ZERO)
     ..a/*<double>*/(6, 'doubleValue', PbFieldType.OD)
     ..a/*<List<int>>*/(7, 'stringValue', PbFieldType.OY)
-    ..a/*<String>*/(8, 'aggregateValue', PbFieldType.OS)
-  ;
+    ..a/*<String>*/(8, 'aggregateValue', PbFieldType.OS);
 
   UninterpretedOption() : super();
-  UninterpretedOption.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  UninterpretedOption.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  UninterpretedOption clone() => new UninterpretedOption()..mergeFromMessage(this);
+  UninterpretedOption.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  UninterpretedOption.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  UninterpretedOption clone() =>
+      new UninterpretedOption()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static UninterpretedOption create() => new UninterpretedOption();
-  static PbList<UninterpretedOption> createRepeated() => new PbList<UninterpretedOption>();
+  static PbList<UninterpretedOption> createRepeated() =>
+      new PbList<UninterpretedOption>();
   static UninterpretedOption getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyUninterpretedOption();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyUninterpretedOption();
     return _defaultInstance;
   }
+
   static UninterpretedOption _defaultInstance;
   static void $checkItem(UninterpretedOption v) {
-    if (v is !UninterpretedOption) checkItemFailed(v, 'UninterpretedOption');
+    if (v is! UninterpretedOption) checkItemFailed(v, 'UninterpretedOption');
   }
 
   List<UninterpretedOption_NamePart> get name => $_get(0, 2, null);
 
   String get identifierValue => $_get(1, 3, '');
-  set identifierValue(String v) { $_setString(1, 3, v); }
+  set identifierValue(String v) {
+    $_setString(1, 3, v);
+  }
+
   bool hasIdentifierValue() => $_has(1, 3);
   void clearIdentifierValue() => clearField(3);
 
   Int64 get positiveIntValue => $_get(2, 4, null);
-  set positiveIntValue(Int64 v) { $_setInt64(2, 4, v); }
+  set positiveIntValue(Int64 v) {
+    $_setInt64(2, 4, v);
+  }
+
   bool hasPositiveIntValue() => $_has(2, 4);
   void clearPositiveIntValue() => clearField(4);
 
   Int64 get negativeIntValue => $_get(3, 5, null);
-  set negativeIntValue(Int64 v) { $_setInt64(3, 5, v); }
+  set negativeIntValue(Int64 v) {
+    $_setInt64(3, 5, v);
+  }
+
   bool hasNegativeIntValue() => $_has(3, 5);
   void clearNegativeIntValue() => clearField(5);
 
   double get doubleValue => $_get(4, 6, null);
-  set doubleValue(double v) { $_setDouble(4, 6, v); }
+  set doubleValue(double v) {
+    $_setDouble(4, 6, v);
+  }
+
   bool hasDoubleValue() => $_has(4, 6);
   void clearDoubleValue() => clearField(6);
 
   List<int> get stringValue => $_get(5, 7, null);
-  set stringValue(List<int> v) { $_setBytes(5, 7, v); }
+  set stringValue(List<int> v) {
+    $_setBytes(5, 7, v);
+  }
+
   bool hasStringValue() => $_has(5, 7);
   void clearStringValue() => clearField(7);
 
   String get aggregateValue => $_get(6, 8, '');
-  set aggregateValue(String v) { $_setString(6, 8, v); }
+  set aggregateValue(String v) {
+    $_setString(6, 8, v);
+  }
+
   bool hasAggregateValue() => $_has(6, 8);
   void clearAggregateValue() => clearField(8);
 }
 
-class _ReadonlyUninterpretedOption extends UninterpretedOption with ReadonlyMessageMixin {}
+class _ReadonlyUninterpretedOption extends UninterpretedOption
+    with ReadonlyMessageMixin {}
 
 class SourceCodeInfo_Location extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('SourceCodeInfo_Location')
@@ -1057,23 +1506,31 @@
     ..a/*<String>*/(3, 'leadingComments', PbFieldType.OS)
     ..a/*<String>*/(4, 'trailingComments', PbFieldType.OS)
     ..p/*<String>*/(6, 'leadingDetachedComments', PbFieldType.PS)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   SourceCodeInfo_Location() : super();
-  SourceCodeInfo_Location.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  SourceCodeInfo_Location.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  SourceCodeInfo_Location clone() => new SourceCodeInfo_Location()..mergeFromMessage(this);
+  SourceCodeInfo_Location.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  SourceCodeInfo_Location.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  SourceCodeInfo_Location clone() =>
+      new SourceCodeInfo_Location()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static SourceCodeInfo_Location create() => new SourceCodeInfo_Location();
-  static PbList<SourceCodeInfo_Location> createRepeated() => new PbList<SourceCodeInfo_Location>();
+  static PbList<SourceCodeInfo_Location> createRepeated() =>
+      new PbList<SourceCodeInfo_Location>();
   static SourceCodeInfo_Location getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlySourceCodeInfo_Location();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlySourceCodeInfo_Location();
     return _defaultInstance;
   }
+
   static SourceCodeInfo_Location _defaultInstance;
   static void $checkItem(SourceCodeInfo_Location v) {
-    if (v is !SourceCodeInfo_Location) checkItemFailed(v, 'SourceCodeInfo_Location');
+    if (v is! SourceCodeInfo_Location)
+      checkItemFailed(v, 'SourceCodeInfo_Location');
   }
 
   List<int> get path => $_get(0, 1, null);
@@ -1081,46 +1538,61 @@
   List<int> get span => $_get(1, 2, null);
 
   String get leadingComments => $_get(2, 3, '');
-  set leadingComments(String v) { $_setString(2, 3, v); }
+  set leadingComments(String v) {
+    $_setString(2, 3, v);
+  }
+
   bool hasLeadingComments() => $_has(2, 3);
   void clearLeadingComments() => clearField(3);
 
   String get trailingComments => $_get(3, 4, '');
-  set trailingComments(String v) { $_setString(3, 4, v); }
+  set trailingComments(String v) {
+    $_setString(3, 4, v);
+  }
+
   bool hasTrailingComments() => $_has(3, 4);
   void clearTrailingComments() => clearField(4);
 
   List<String> get leadingDetachedComments => $_get(4, 6, null);
 }
 
-class _ReadonlySourceCodeInfo_Location extends SourceCodeInfo_Location with ReadonlyMessageMixin {}
+class _ReadonlySourceCodeInfo_Location extends SourceCodeInfo_Location
+    with ReadonlyMessageMixin {}
 
 class SourceCodeInfo extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('SourceCodeInfo')
-    ..pp/*<SourceCodeInfo_Location>*/(1, 'location', PbFieldType.PM, SourceCodeInfo_Location.$checkItem, SourceCodeInfo_Location.create)
-    ..hasRequiredFields = false
-  ;
+    ..pp/*<SourceCodeInfo_Location>*/(1, 'location', PbFieldType.PM,
+        SourceCodeInfo_Location.$checkItem, SourceCodeInfo_Location.create)
+    ..hasRequiredFields = false;
 
   SourceCodeInfo() : super();
-  SourceCodeInfo.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  SourceCodeInfo.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  SourceCodeInfo.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  SourceCodeInfo.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   SourceCodeInfo clone() => new SourceCodeInfo()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static SourceCodeInfo create() => new SourceCodeInfo();
-  static PbList<SourceCodeInfo> createRepeated() => new PbList<SourceCodeInfo>();
+  static PbList<SourceCodeInfo> createRepeated() =>
+      new PbList<SourceCodeInfo>();
   static SourceCodeInfo getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlySourceCodeInfo();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlySourceCodeInfo();
     return _defaultInstance;
   }
+
   static SourceCodeInfo _defaultInstance;
   static void $checkItem(SourceCodeInfo v) {
-    if (v is !SourceCodeInfo) checkItemFailed(v, 'SourceCodeInfo');
+    if (v is! SourceCodeInfo) checkItemFailed(v, 'SourceCodeInfo');
   }
 
   List<SourceCodeInfo_Location> get location => $_get(0, 1, null);
 }
 
-class _ReadonlySourceCodeInfo extends SourceCodeInfo with ReadonlyMessageMixin {}
+class _ReadonlySourceCodeInfo extends SourceCodeInfo with ReadonlyMessageMixin {
+}
 
 class GeneratedCodeInfo_Annotation extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('GeneratedCodeInfo_Annotation')
@@ -1128,69 +1600,99 @@
     ..a/*<String>*/(2, 'sourceFile', PbFieldType.OS)
     ..a/*<int>*/(3, 'begin', PbFieldType.O3)
     ..a/*<int>*/(4, 'end', PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   GeneratedCodeInfo_Annotation() : super();
-  GeneratedCodeInfo_Annotation.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  GeneratedCodeInfo_Annotation.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  GeneratedCodeInfo_Annotation clone() => new GeneratedCodeInfo_Annotation()..mergeFromMessage(this);
+  GeneratedCodeInfo_Annotation.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  GeneratedCodeInfo_Annotation.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  GeneratedCodeInfo_Annotation clone() =>
+      new GeneratedCodeInfo_Annotation()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
-  static GeneratedCodeInfo_Annotation create() => new GeneratedCodeInfo_Annotation();
-  static PbList<GeneratedCodeInfo_Annotation> createRepeated() => new PbList<GeneratedCodeInfo_Annotation>();
+  static GeneratedCodeInfo_Annotation create() =>
+      new GeneratedCodeInfo_Annotation();
+  static PbList<GeneratedCodeInfo_Annotation> createRepeated() =>
+      new PbList<GeneratedCodeInfo_Annotation>();
   static GeneratedCodeInfo_Annotation getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyGeneratedCodeInfo_Annotation();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyGeneratedCodeInfo_Annotation();
     return _defaultInstance;
   }
+
   static GeneratedCodeInfo_Annotation _defaultInstance;
   static void $checkItem(GeneratedCodeInfo_Annotation v) {
-    if (v is !GeneratedCodeInfo_Annotation) checkItemFailed(v, 'GeneratedCodeInfo_Annotation');
+    if (v is! GeneratedCodeInfo_Annotation)
+      checkItemFailed(v, 'GeneratedCodeInfo_Annotation');
   }
 
   List<int> get path => $_get(0, 1, null);
 
   String get sourceFile => $_get(1, 2, '');
-  set sourceFile(String v) { $_setString(1, 2, v); }
+  set sourceFile(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasSourceFile() => $_has(1, 2);
   void clearSourceFile() => clearField(2);
 
   int get begin => $_get(2, 3, 0);
-  set begin(int v) { $_setUnsignedInt32(2, 3, v); }
+  set begin(int v) {
+    $_setUnsignedInt32(2, 3, v);
+  }
+
   bool hasBegin() => $_has(2, 3);
   void clearBegin() => clearField(3);
 
   int get end => $_get(3, 4, 0);
-  set end(int v) { $_setUnsignedInt32(3, 4, v); }
+  set end(int v) {
+    $_setUnsignedInt32(3, 4, v);
+  }
+
   bool hasEnd() => $_has(3, 4);
   void clearEnd() => clearField(4);
 }
 
-class _ReadonlyGeneratedCodeInfo_Annotation extends GeneratedCodeInfo_Annotation with ReadonlyMessageMixin {}
+class _ReadonlyGeneratedCodeInfo_Annotation extends GeneratedCodeInfo_Annotation
+    with ReadonlyMessageMixin {}
 
 class GeneratedCodeInfo extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('GeneratedCodeInfo')
-    ..pp/*<GeneratedCodeInfo_Annotation>*/(1, 'annotation', PbFieldType.PM, GeneratedCodeInfo_Annotation.$checkItem, GeneratedCodeInfo_Annotation.create)
-    ..hasRequiredFields = false
-  ;
+    ..pp/*<GeneratedCodeInfo_Annotation>*/(
+        1,
+        'annotation',
+        PbFieldType.PM,
+        GeneratedCodeInfo_Annotation.$checkItem,
+        GeneratedCodeInfo_Annotation.create)
+    ..hasRequiredFields = false;
 
   GeneratedCodeInfo() : super();
-  GeneratedCodeInfo.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  GeneratedCodeInfo.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  GeneratedCodeInfo.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  GeneratedCodeInfo.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   GeneratedCodeInfo clone() => new GeneratedCodeInfo()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static GeneratedCodeInfo create() => new GeneratedCodeInfo();
-  static PbList<GeneratedCodeInfo> createRepeated() => new PbList<GeneratedCodeInfo>();
+  static PbList<GeneratedCodeInfo> createRepeated() =>
+      new PbList<GeneratedCodeInfo>();
   static GeneratedCodeInfo getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyGeneratedCodeInfo();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyGeneratedCodeInfo();
     return _defaultInstance;
   }
+
   static GeneratedCodeInfo _defaultInstance;
   static void $checkItem(GeneratedCodeInfo v) {
-    if (v is !GeneratedCodeInfo) checkItemFailed(v, 'GeneratedCodeInfo');
+    if (v is! GeneratedCodeInfo) checkItemFailed(v, 'GeneratedCodeInfo');
   }
 
   List<GeneratedCodeInfo_Annotation> get annotation => $_get(0, 1, null);
 }
 
-class _ReadonlyGeneratedCodeInfo extends GeneratedCodeInfo with ReadonlyMessageMixin {}
-
+class _ReadonlyGeneratedCodeInfo extends GeneratedCodeInfo
+    with ReadonlyMessageMixin {}
diff --git a/lib/src/descriptor.pbenum.dart b/lib/src/descriptor.pbenum.dart
index 0f9ddb6..674f0fa 100644
--- a/lib/src/descriptor.pbenum.dart
+++ b/lib/src/descriptor.pbenum.dart
@@ -10,26 +10,45 @@
 import 'package:protobuf/protobuf.dart';
 
 class FieldDescriptorProto_Type extends ProtobufEnum {
-  static const FieldDescriptorProto_Type TYPE_DOUBLE = const FieldDescriptorProto_Type._(1, 'TYPE_DOUBLE');
-  static const FieldDescriptorProto_Type TYPE_FLOAT = const FieldDescriptorProto_Type._(2, 'TYPE_FLOAT');
-  static const FieldDescriptorProto_Type TYPE_INT64 = const FieldDescriptorProto_Type._(3, 'TYPE_INT64');
-  static const FieldDescriptorProto_Type TYPE_UINT64 = const FieldDescriptorProto_Type._(4, 'TYPE_UINT64');
-  static const FieldDescriptorProto_Type TYPE_INT32 = const FieldDescriptorProto_Type._(5, 'TYPE_INT32');
-  static const FieldDescriptorProto_Type TYPE_FIXED64 = const FieldDescriptorProto_Type._(6, 'TYPE_FIXED64');
-  static const FieldDescriptorProto_Type TYPE_FIXED32 = const FieldDescriptorProto_Type._(7, 'TYPE_FIXED32');
-  static const FieldDescriptorProto_Type TYPE_BOOL = const FieldDescriptorProto_Type._(8, 'TYPE_BOOL');
-  static const FieldDescriptorProto_Type TYPE_STRING = const FieldDescriptorProto_Type._(9, 'TYPE_STRING');
-  static const FieldDescriptorProto_Type TYPE_GROUP = const FieldDescriptorProto_Type._(10, 'TYPE_GROUP');
-  static const FieldDescriptorProto_Type TYPE_MESSAGE = const FieldDescriptorProto_Type._(11, 'TYPE_MESSAGE');
-  static const FieldDescriptorProto_Type TYPE_BYTES = const FieldDescriptorProto_Type._(12, 'TYPE_BYTES');
-  static const FieldDescriptorProto_Type TYPE_UINT32 = const FieldDescriptorProto_Type._(13, 'TYPE_UINT32');
-  static const FieldDescriptorProto_Type TYPE_ENUM = const FieldDescriptorProto_Type._(14, 'TYPE_ENUM');
-  static const FieldDescriptorProto_Type TYPE_SFIXED32 = const FieldDescriptorProto_Type._(15, 'TYPE_SFIXED32');
-  static const FieldDescriptorProto_Type TYPE_SFIXED64 = const FieldDescriptorProto_Type._(16, 'TYPE_SFIXED64');
-  static const FieldDescriptorProto_Type TYPE_SINT32 = const FieldDescriptorProto_Type._(17, 'TYPE_SINT32');
-  static const FieldDescriptorProto_Type TYPE_SINT64 = const FieldDescriptorProto_Type._(18, 'TYPE_SINT64');
+  static const FieldDescriptorProto_Type TYPE_DOUBLE =
+      const FieldDescriptorProto_Type._(1, 'TYPE_DOUBLE');
+  static const FieldDescriptorProto_Type TYPE_FLOAT =
+      const FieldDescriptorProto_Type._(2, 'TYPE_FLOAT');
+  static const FieldDescriptorProto_Type TYPE_INT64 =
+      const FieldDescriptorProto_Type._(3, 'TYPE_INT64');
+  static const FieldDescriptorProto_Type TYPE_UINT64 =
+      const FieldDescriptorProto_Type._(4, 'TYPE_UINT64');
+  static const FieldDescriptorProto_Type TYPE_INT32 =
+      const FieldDescriptorProto_Type._(5, 'TYPE_INT32');
+  static const FieldDescriptorProto_Type TYPE_FIXED64 =
+      const FieldDescriptorProto_Type._(6, 'TYPE_FIXED64');
+  static const FieldDescriptorProto_Type TYPE_FIXED32 =
+      const FieldDescriptorProto_Type._(7, 'TYPE_FIXED32');
+  static const FieldDescriptorProto_Type TYPE_BOOL =
+      const FieldDescriptorProto_Type._(8, 'TYPE_BOOL');
+  static const FieldDescriptorProto_Type TYPE_STRING =
+      const FieldDescriptorProto_Type._(9, 'TYPE_STRING');
+  static const FieldDescriptorProto_Type TYPE_GROUP =
+      const FieldDescriptorProto_Type._(10, 'TYPE_GROUP');
+  static const FieldDescriptorProto_Type TYPE_MESSAGE =
+      const FieldDescriptorProto_Type._(11, 'TYPE_MESSAGE');
+  static const FieldDescriptorProto_Type TYPE_BYTES =
+      const FieldDescriptorProto_Type._(12, 'TYPE_BYTES');
+  static const FieldDescriptorProto_Type TYPE_UINT32 =
+      const FieldDescriptorProto_Type._(13, 'TYPE_UINT32');
+  static const FieldDescriptorProto_Type TYPE_ENUM =
+      const FieldDescriptorProto_Type._(14, 'TYPE_ENUM');
+  static const FieldDescriptorProto_Type TYPE_SFIXED32 =
+      const FieldDescriptorProto_Type._(15, 'TYPE_SFIXED32');
+  static const FieldDescriptorProto_Type TYPE_SFIXED64 =
+      const FieldDescriptorProto_Type._(16, 'TYPE_SFIXED64');
+  static const FieldDescriptorProto_Type TYPE_SINT32 =
+      const FieldDescriptorProto_Type._(17, 'TYPE_SINT32');
+  static const FieldDescriptorProto_Type TYPE_SINT64 =
+      const FieldDescriptorProto_Type._(18, 'TYPE_SINT64');
 
-  static const List<FieldDescriptorProto_Type> values = const <FieldDescriptorProto_Type> [
+  static const List<FieldDescriptorProto_Type> values =
+      const <FieldDescriptorProto_Type>[
     TYPE_DOUBLE,
     TYPE_FLOAT,
     TYPE_INT64,
@@ -51,111 +70,137 @@
   ];
 
   static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static FieldDescriptorProto_Type valueOf(int value) => _byValue[value] as FieldDescriptorProto_Type;
+  static FieldDescriptorProto_Type valueOf(int value) =>
+      _byValue[value] as FieldDescriptorProto_Type;
   static void $checkItem(FieldDescriptorProto_Type v) {
-    if (v is !FieldDescriptorProto_Type) checkItemFailed(v, 'FieldDescriptorProto_Type');
+    if (v is! FieldDescriptorProto_Type)
+      checkItemFailed(v, 'FieldDescriptorProto_Type');
   }
 
   const FieldDescriptorProto_Type._(int v, String n) : super(v, n);
 }
 
 class FieldDescriptorProto_Label extends ProtobufEnum {
-  static const FieldDescriptorProto_Label LABEL_OPTIONAL = const FieldDescriptorProto_Label._(1, 'LABEL_OPTIONAL');
-  static const FieldDescriptorProto_Label LABEL_REQUIRED = const FieldDescriptorProto_Label._(2, 'LABEL_REQUIRED');
-  static const FieldDescriptorProto_Label LABEL_REPEATED = const FieldDescriptorProto_Label._(3, 'LABEL_REPEATED');
+  static const FieldDescriptorProto_Label LABEL_OPTIONAL =
+      const FieldDescriptorProto_Label._(1, 'LABEL_OPTIONAL');
+  static const FieldDescriptorProto_Label LABEL_REQUIRED =
+      const FieldDescriptorProto_Label._(2, 'LABEL_REQUIRED');
+  static const FieldDescriptorProto_Label LABEL_REPEATED =
+      const FieldDescriptorProto_Label._(3, 'LABEL_REPEATED');
 
-  static const List<FieldDescriptorProto_Label> values = const <FieldDescriptorProto_Label> [
+  static const List<FieldDescriptorProto_Label> values =
+      const <FieldDescriptorProto_Label>[
     LABEL_OPTIONAL,
     LABEL_REQUIRED,
     LABEL_REPEATED,
   ];
 
   static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static FieldDescriptorProto_Label valueOf(int value) => _byValue[value] as FieldDescriptorProto_Label;
+  static FieldDescriptorProto_Label valueOf(int value) =>
+      _byValue[value] as FieldDescriptorProto_Label;
   static void $checkItem(FieldDescriptorProto_Label v) {
-    if (v is !FieldDescriptorProto_Label) checkItemFailed(v, 'FieldDescriptorProto_Label');
+    if (v is! FieldDescriptorProto_Label)
+      checkItemFailed(v, 'FieldDescriptorProto_Label');
   }
 
   const FieldDescriptorProto_Label._(int v, String n) : super(v, n);
 }
 
 class FileOptions_OptimizeMode extends ProtobufEnum {
-  static const FileOptions_OptimizeMode SPEED = const FileOptions_OptimizeMode._(1, 'SPEED');
-  static const FileOptions_OptimizeMode CODE_SIZE = const FileOptions_OptimizeMode._(2, 'CODE_SIZE');
-  static const FileOptions_OptimizeMode LITE_RUNTIME = const FileOptions_OptimizeMode._(3, 'LITE_RUNTIME');
+  static const FileOptions_OptimizeMode SPEED =
+      const FileOptions_OptimizeMode._(1, 'SPEED');
+  static const FileOptions_OptimizeMode CODE_SIZE =
+      const FileOptions_OptimizeMode._(2, 'CODE_SIZE');
+  static const FileOptions_OptimizeMode LITE_RUNTIME =
+      const FileOptions_OptimizeMode._(3, 'LITE_RUNTIME');
 
-  static const List<FileOptions_OptimizeMode> values = const <FileOptions_OptimizeMode> [
+  static const List<FileOptions_OptimizeMode> values =
+      const <FileOptions_OptimizeMode>[
     SPEED,
     CODE_SIZE,
     LITE_RUNTIME,
   ];
 
   static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static FileOptions_OptimizeMode valueOf(int value) => _byValue[value] as FileOptions_OptimizeMode;
+  static FileOptions_OptimizeMode valueOf(int value) =>
+      _byValue[value] as FileOptions_OptimizeMode;
   static void $checkItem(FileOptions_OptimizeMode v) {
-    if (v is !FileOptions_OptimizeMode) checkItemFailed(v, 'FileOptions_OptimizeMode');
+    if (v is! FileOptions_OptimizeMode)
+      checkItemFailed(v, 'FileOptions_OptimizeMode');
   }
 
   const FileOptions_OptimizeMode._(int v, String n) : super(v, n);
 }
 
 class FieldOptions_CType extends ProtobufEnum {
-  static const FieldOptions_CType STRING = const FieldOptions_CType._(0, 'STRING');
+  static const FieldOptions_CType STRING =
+      const FieldOptions_CType._(0, 'STRING');
   static const FieldOptions_CType CORD = const FieldOptions_CType._(1, 'CORD');
-  static const FieldOptions_CType STRING_PIECE = const FieldOptions_CType._(2, 'STRING_PIECE');
+  static const FieldOptions_CType STRING_PIECE =
+      const FieldOptions_CType._(2, 'STRING_PIECE');
 
-  static const List<FieldOptions_CType> values = const <FieldOptions_CType> [
+  static const List<FieldOptions_CType> values = const <FieldOptions_CType>[
     STRING,
     CORD,
     STRING_PIECE,
   ];
 
   static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static FieldOptions_CType valueOf(int value) => _byValue[value] as FieldOptions_CType;
+  static FieldOptions_CType valueOf(int value) =>
+      _byValue[value] as FieldOptions_CType;
   static void $checkItem(FieldOptions_CType v) {
-    if (v is !FieldOptions_CType) checkItemFailed(v, 'FieldOptions_CType');
+    if (v is! FieldOptions_CType) checkItemFailed(v, 'FieldOptions_CType');
   }
 
   const FieldOptions_CType._(int v, String n) : super(v, n);
 }
 
 class FieldOptions_JSType extends ProtobufEnum {
-  static const FieldOptions_JSType JS_NORMAL = const FieldOptions_JSType._(0, 'JS_NORMAL');
-  static const FieldOptions_JSType JS_STRING = const FieldOptions_JSType._(1, 'JS_STRING');
-  static const FieldOptions_JSType JS_NUMBER = const FieldOptions_JSType._(2, 'JS_NUMBER');
+  static const FieldOptions_JSType JS_NORMAL =
+      const FieldOptions_JSType._(0, 'JS_NORMAL');
+  static const FieldOptions_JSType JS_STRING =
+      const FieldOptions_JSType._(1, 'JS_STRING');
+  static const FieldOptions_JSType JS_NUMBER =
+      const FieldOptions_JSType._(2, 'JS_NUMBER');
 
-  static const List<FieldOptions_JSType> values = const <FieldOptions_JSType> [
+  static const List<FieldOptions_JSType> values = const <FieldOptions_JSType>[
     JS_NORMAL,
     JS_STRING,
     JS_NUMBER,
   ];
 
   static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static FieldOptions_JSType valueOf(int value) => _byValue[value] as FieldOptions_JSType;
+  static FieldOptions_JSType valueOf(int value) =>
+      _byValue[value] as FieldOptions_JSType;
   static void $checkItem(FieldOptions_JSType v) {
-    if (v is !FieldOptions_JSType) checkItemFailed(v, 'FieldOptions_JSType');
+    if (v is! FieldOptions_JSType) checkItemFailed(v, 'FieldOptions_JSType');
   }
 
   const FieldOptions_JSType._(int v, String n) : super(v, n);
 }
 
 class MethodOptions_IdempotencyLevel extends ProtobufEnum {
-  static const MethodOptions_IdempotencyLevel IDEMPOTENCY_UNKNOWN = const MethodOptions_IdempotencyLevel._(0, 'IDEMPOTENCY_UNKNOWN');
-  static const MethodOptions_IdempotencyLevel NO_SIDE_EFFECTS = const MethodOptions_IdempotencyLevel._(1, 'NO_SIDE_EFFECTS');
-  static const MethodOptions_IdempotencyLevel IDEMPOTENT = const MethodOptions_IdempotencyLevel._(2, 'IDEMPOTENT');
+  static const MethodOptions_IdempotencyLevel IDEMPOTENCY_UNKNOWN =
+      const MethodOptions_IdempotencyLevel._(0, 'IDEMPOTENCY_UNKNOWN');
+  static const MethodOptions_IdempotencyLevel NO_SIDE_EFFECTS =
+      const MethodOptions_IdempotencyLevel._(1, 'NO_SIDE_EFFECTS');
+  static const MethodOptions_IdempotencyLevel IDEMPOTENT =
+      const MethodOptions_IdempotencyLevel._(2, 'IDEMPOTENT');
 
-  static const List<MethodOptions_IdempotencyLevel> values = const <MethodOptions_IdempotencyLevel> [
+  static const List<MethodOptions_IdempotencyLevel> values =
+      const <MethodOptions_IdempotencyLevel>[
     IDEMPOTENCY_UNKNOWN,
     NO_SIDE_EFFECTS,
     IDEMPOTENT,
   ];
 
   static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
-  static MethodOptions_IdempotencyLevel valueOf(int value) => _byValue[value] as MethodOptions_IdempotencyLevel;
+  static MethodOptions_IdempotencyLevel valueOf(int value) =>
+      _byValue[value] as MethodOptions_IdempotencyLevel;
   static void $checkItem(MethodOptions_IdempotencyLevel v) {
-    if (v is !MethodOptions_IdempotencyLevel) checkItemFailed(v, 'MethodOptions_IdempotencyLevel');
+    if (v is! MethodOptions_IdempotencyLevel)
+      checkItemFailed(v, 'MethodOptions_IdempotencyLevel');
   }
 
   const MethodOptions_IdempotencyLevel._(int v, String n) : super(v, n);
 }
-
diff --git a/lib/src/plugin.pb.dart b/lib/src/plugin.pb.dart
index d8f8196..9147b80 100644
--- a/lib/src/plugin.pb.dart
+++ b/lib/src/plugin.pb.dart
@@ -17,12 +17,14 @@
     ..a/*<int>*/(2, 'minor', PbFieldType.O3)
     ..a/*<int>*/(3, 'patch', PbFieldType.O3)
     ..a/*<String>*/(4, 'suffix', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   Version() : super();
-  Version.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  Version.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+  Version.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  Version.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
   Version clone() => new Version()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static Version create() => new Version();
@@ -31,28 +33,41 @@
     if (_defaultInstance == null) _defaultInstance = new _ReadonlyVersion();
     return _defaultInstance;
   }
+
   static Version _defaultInstance;
   static void $checkItem(Version v) {
-    if (v is !Version) checkItemFailed(v, 'Version');
+    if (v is! Version) checkItemFailed(v, 'Version');
   }
 
   int get major => $_get(0, 1, 0);
-  set major(int v) { $_setUnsignedInt32(0, 1, v); }
+  set major(int v) {
+    $_setUnsignedInt32(0, 1, v);
+  }
+
   bool hasMajor() => $_has(0, 1);
   void clearMajor() => clearField(1);
 
   int get minor => $_get(1, 2, 0);
-  set minor(int v) { $_setUnsignedInt32(1, 2, v); }
+  set minor(int v) {
+    $_setUnsignedInt32(1, 2, v);
+  }
+
   bool hasMinor() => $_has(1, 2);
   void clearMinor() => clearField(2);
 
   int get patch => $_get(2, 3, 0);
-  set patch(int v) { $_setUnsignedInt32(2, 3, v); }
+  set patch(int v) {
+    $_setUnsignedInt32(2, 3, v);
+  }
+
   bool hasPatch() => $_has(2, 3);
   void clearPatch() => clearField(3);
 
   String get suffix => $_get(3, 4, '');
-  set suffix(String v) { $_setString(3, 4, v); }
+  set suffix(String v) {
+    $_setString(3, 4, v);
+  }
+
   bool hasSuffix() => $_has(3, 4);
   void clearSuffix() => clearField(4);
 }
@@ -63,115 +78,170 @@
   static final BuilderInfo _i = new BuilderInfo('CodeGeneratorRequest')
     ..p/*<String>*/(1, 'fileToGenerate', PbFieldType.PS)
     ..a/*<String>*/(2, 'parameter', PbFieldType.OS)
-    ..a/*<Version>*/(3, 'compilerVersion', PbFieldType.OM, Version.getDefault, Version.create)
-    ..pp/*<google$protobuf.FileDescriptorProto>*/(15, 'protoFile', PbFieldType.PM, google$protobuf.FileDescriptorProto.$checkItem, google$protobuf.FileDescriptorProto.create)
-  ;
+    ..a/*<Version>*/(3, 'compilerVersion', PbFieldType.OM, Version.getDefault,
+        Version.create)
+    ..pp/*<google$protobuf.FileDescriptorProto>*/(
+        15,
+        'protoFile',
+        PbFieldType.PM,
+        google$protobuf.FileDescriptorProto.$checkItem,
+        google$protobuf.FileDescriptorProto.create);
 
   CodeGeneratorRequest() : super();
-  CodeGeneratorRequest.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  CodeGeneratorRequest.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  CodeGeneratorRequest clone() => new CodeGeneratorRequest()..mergeFromMessage(this);
+  CodeGeneratorRequest.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  CodeGeneratorRequest.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  CodeGeneratorRequest clone() =>
+      new CodeGeneratorRequest()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static CodeGeneratorRequest create() => new CodeGeneratorRequest();
-  static PbList<CodeGeneratorRequest> createRepeated() => new PbList<CodeGeneratorRequest>();
+  static PbList<CodeGeneratorRequest> createRepeated() =>
+      new PbList<CodeGeneratorRequest>();
   static CodeGeneratorRequest getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyCodeGeneratorRequest();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyCodeGeneratorRequest();
     return _defaultInstance;
   }
+
   static CodeGeneratorRequest _defaultInstance;
   static void $checkItem(CodeGeneratorRequest v) {
-    if (v is !CodeGeneratorRequest) checkItemFailed(v, 'CodeGeneratorRequest');
+    if (v is! CodeGeneratorRequest) checkItemFailed(v, 'CodeGeneratorRequest');
   }
 
   List<String> get fileToGenerate => $_get(0, 1, null);
 
   String get parameter => $_get(1, 2, '');
-  set parameter(String v) { $_setString(1, 2, v); }
+  set parameter(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasParameter() => $_has(1, 2);
   void clearParameter() => clearField(2);
 
   Version get compilerVersion => $_get(2, 3, null);
-  set compilerVersion(Version v) { setField(3, v); }
+  set compilerVersion(Version v) {
+    setField(3, v);
+  }
+
   bool hasCompilerVersion() => $_has(2, 3);
   void clearCompilerVersion() => clearField(3);
 
   List<google$protobuf.FileDescriptorProto> get protoFile => $_get(3, 15, null);
 }
 
-class _ReadonlyCodeGeneratorRequest extends CodeGeneratorRequest with ReadonlyMessageMixin {}
+class _ReadonlyCodeGeneratorRequest extends CodeGeneratorRequest
+    with ReadonlyMessageMixin {}
 
 class CodeGeneratorResponse_File extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('CodeGeneratorResponse_File')
     ..a/*<String>*/(1, 'name', PbFieldType.OS)
     ..a/*<String>*/(2, 'insertionPoint', PbFieldType.OS)
     ..a/*<String>*/(15, 'content', PbFieldType.OS)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   CodeGeneratorResponse_File() : super();
-  CodeGeneratorResponse_File.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  CodeGeneratorResponse_File.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  CodeGeneratorResponse_File clone() => new CodeGeneratorResponse_File()..mergeFromMessage(this);
+  CodeGeneratorResponse_File.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  CodeGeneratorResponse_File.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  CodeGeneratorResponse_File clone() =>
+      new CodeGeneratorResponse_File()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
-  static CodeGeneratorResponse_File create() => new CodeGeneratorResponse_File();
-  static PbList<CodeGeneratorResponse_File> createRepeated() => new PbList<CodeGeneratorResponse_File>();
+  static CodeGeneratorResponse_File create() =>
+      new CodeGeneratorResponse_File();
+  static PbList<CodeGeneratorResponse_File> createRepeated() =>
+      new PbList<CodeGeneratorResponse_File>();
   static CodeGeneratorResponse_File getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyCodeGeneratorResponse_File();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyCodeGeneratorResponse_File();
     return _defaultInstance;
   }
+
   static CodeGeneratorResponse_File _defaultInstance;
   static void $checkItem(CodeGeneratorResponse_File v) {
-    if (v is !CodeGeneratorResponse_File) checkItemFailed(v, 'CodeGeneratorResponse_File');
+    if (v is! CodeGeneratorResponse_File)
+      checkItemFailed(v, 'CodeGeneratorResponse_File');
   }
 
   String get name => $_get(0, 1, '');
-  set name(String v) { $_setString(0, 1, v); }
+  set name(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasName() => $_has(0, 1);
   void clearName() => clearField(1);
 
   String get insertionPoint => $_get(1, 2, '');
-  set insertionPoint(String v) { $_setString(1, 2, v); }
+  set insertionPoint(String v) {
+    $_setString(1, 2, v);
+  }
+
   bool hasInsertionPoint() => $_has(1, 2);
   void clearInsertionPoint() => clearField(2);
 
   String get content => $_get(2, 15, '');
-  set content(String v) { $_setString(2, 15, v); }
+  set content(String v) {
+    $_setString(2, 15, v);
+  }
+
   bool hasContent() => $_has(2, 15);
   void clearContent() => clearField(15);
 }
 
-class _ReadonlyCodeGeneratorResponse_File extends CodeGeneratorResponse_File with ReadonlyMessageMixin {}
+class _ReadonlyCodeGeneratorResponse_File extends CodeGeneratorResponse_File
+    with ReadonlyMessageMixin {}
 
 class CodeGeneratorResponse extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('CodeGeneratorResponse')
     ..a/*<String>*/(1, 'error', PbFieldType.OS)
-    ..pp/*<CodeGeneratorResponse_File>*/(15, 'file', PbFieldType.PM, CodeGeneratorResponse_File.$checkItem, CodeGeneratorResponse_File.create)
-    ..hasRequiredFields = false
-  ;
+    ..pp/*<CodeGeneratorResponse_File>*/(
+        15,
+        'file',
+        PbFieldType.PM,
+        CodeGeneratorResponse_File.$checkItem,
+        CodeGeneratorResponse_File.create)
+    ..hasRequiredFields = false;
 
   CodeGeneratorResponse() : super();
-  CodeGeneratorResponse.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
-  CodeGeneratorResponse.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
-  CodeGeneratorResponse clone() => new CodeGeneratorResponse()..mergeFromMessage(this);
+  CodeGeneratorResponse.fromBuffer(List<int> i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromBuffer(i, r);
+  CodeGeneratorResponse.fromJson(String i,
+      [ExtensionRegistry r = ExtensionRegistry.EMPTY])
+      : super.fromJson(i, r);
+  CodeGeneratorResponse clone() =>
+      new CodeGeneratorResponse()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static CodeGeneratorResponse create() => new CodeGeneratorResponse();
-  static PbList<CodeGeneratorResponse> createRepeated() => new PbList<CodeGeneratorResponse>();
+  static PbList<CodeGeneratorResponse> createRepeated() =>
+      new PbList<CodeGeneratorResponse>();
   static CodeGeneratorResponse getDefault() {
-    if (_defaultInstance == null) _defaultInstance = new _ReadonlyCodeGeneratorResponse();
+    if (_defaultInstance == null)
+      _defaultInstance = new _ReadonlyCodeGeneratorResponse();
     return _defaultInstance;
   }
+
   static CodeGeneratorResponse _defaultInstance;
   static void $checkItem(CodeGeneratorResponse v) {
-    if (v is !CodeGeneratorResponse) checkItemFailed(v, 'CodeGeneratorResponse');
+    if (v is! CodeGeneratorResponse)
+      checkItemFailed(v, 'CodeGeneratorResponse');
   }
 
   String get error => $_get(0, 1, '');
-  set error(String v) { $_setString(0, 1, v); }
+  set error(String v) {
+    $_setString(0, 1, v);
+  }
+
   bool hasError() => $_has(0, 1);
   void clearError() => clearField(1);
 
   List<CodeGeneratorResponse_File> get file => $_get(1, 15, null);
 }
 
-class _ReadonlyCodeGeneratorResponse extends CodeGeneratorResponse with ReadonlyMessageMixin {}
-
+class _ReadonlyCodeGeneratorResponse extends CodeGeneratorResponse
+    with ReadonlyMessageMixin {}
diff --git a/test/extension_test.dart b/test/extension_test.dart
index 8829733..58f3aaa 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -152,7 +152,7 @@
   test('can extend a message with a message field of the same type', () {
     expect(
         MyNestedExtension.recursiveExtension.makeDefault()
-        is MessageToBeExtended,
+            is MessageToBeExtended,
         isTrue);
     expect(MyNestedExtension.recursiveExtension.name, 'recursiveExtension');
   });
diff --git a/test/indenting_writer_test.dart b/test/indenting_writer_test.dart
index 61f0427..5bbfeba 100755
--- a/test/indenting_writer_test.dart
+++ b/test/indenting_writer_test.dart
@@ -17,7 +17,9 @@
       out.println('second;');
     });
 
-    expect(out.toString(), '''
+    expect(
+        out.toString(),
+        '''
 class test {
   first;
 
diff --git a/test/json_test.dart b/test/json_test.dart
index b698eac..e088614 100755
--- a/test/json_test.dart
+++ b/test/json_test.dart
@@ -52,13 +52,13 @@
 
     // All 64-bit numbers are quoted.
     expect(getAllSet()..optionalInt64 = make64(0, 0x200000),
-           expectedJson(':"102",', ':"9007199254740992",'));
+        expectedJson(':"102",', ':"9007199254740992",'));
     expect(getAllSet()..optionalInt64 = make64(1, 0x200000),
-           expectedJson(':"102",', ':"9007199254740993",'));
+        expectedJson(':"102",', ':"9007199254740993",'));
     expect(getAllSet()..optionalInt64 = -make64(0, 0x200000),
-           expectedJson(':"102",', ':"-9007199254740992",'));
+        expectedJson(':"102",', ':"-9007199254740992",'));
     expect(getAllSet()..optionalInt64 = -make64(1, 0x200000),
-           expectedJson(':"102",', ':"-9007199254740993",'));
+        expectedJson(':"102",', ':"-9007199254740993",'));
 
     // Quotes, backslashes, and control characters in strings are quoted.
     expect(getAllSet()..optionalString = 'a\u0000b\u0001cd\\e\"fg',
diff --git a/test/service_test.dart b/test/service_test.dart
index ebf805a..d518d84 100644
--- a/test/service_test.dart
+++ b/test/service_test.dart
@@ -11,7 +11,6 @@
 import '../out/protos/service2.pb.dart' as pb2;
 import '../out/protos/service3.pb.dart' as pb3;
 
-
 class SearchService extends pb.SearchServiceBase {
   Future<pb.SearchResponse> search(
       ServerContext ctx, pb.SearchRequest request) async {