diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 9fb6b11..621721d 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -3,9 +3,9 @@ name: Dart
 on:
   # Run CI on pushes to the master branch, and on PRs against master.
   push:
-    branches: [main]
+    branches: [master]
   pull_request:
-    branches: [main]
+    branches: [master]
 
 jobs:
   # Check code formating and static analysis on a single OS (linux)
@@ -24,8 +24,18 @@ jobs:
         run: dart pub get
       - name: Check formatting
         run: dart format --output=none --set-exit-if-changed .
-      - name: Analyze code
-        run: dart analyze
+      - name: Analyze code (lib and test)
+        run: dart analyze .
+      - name: Analyze code (introp and examples)
+        run: |
+          for example in interop example/*/; do
+            pushd $example
+            echo [Analyzing $example]
+            dart pub get
+            dart analyze .
+            popd
+          done
+        shell: bash
 
   # Run tests on a matrix consisting of three dimensions:
   # 1. OS: mac, windows, linux
diff --git a/analysis_options.yaml b/analysis_options.yaml
index b2d4046..5265320 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,4 +1,8 @@
 # Lint rules and documentation, see http://dart-lang.github.io/linter/lints
+analyzer:
+  exclude:
+  - example/**
+  - interop/**
 linter:
   rules:
     - avoid_init_to_null
diff --git a/example/helloworld/lib/src/generated/helloworld.pb.dart b/example/helloworld/lib/src/generated/helloworld.pb.dart
index a6a1b8d..75b9556 100644
--- a/example/helloworld/lib/src/generated/helloworld.pb.dart
+++ b/example/helloworld/lib/src/generated/helloworld.pb.dart
@@ -10,30 +10,40 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class HelloRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('HelloRequest', package: const $pb.PackageName('helloworld'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('HelloRequest',
+      package: const $pb.PackageName('helloworld'), createEmptyInstance: create)
     ..aOS(1, 'name')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   HelloRequest._() : super();
   factory HelloRequest() => create();
-  factory HelloRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory HelloRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory HelloRequest.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory HelloRequest.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   HelloRequest clone() => HelloRequest()..mergeFromMessage(this);
-  HelloRequest copyWith(void Function(HelloRequest) updates) => super.copyWith((message) => updates(message as HelloRequest));
+  HelloRequest copyWith(void Function(HelloRequest) updates) =>
+      super.copyWith((message) => updates(message as HelloRequest));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static HelloRequest create() => HelloRequest._();
   HelloRequest createEmptyInstance() => create();
-  static $pb.PbList<HelloRequest> createRepeated() => $pb.PbList<HelloRequest>();
+  static $pb.PbList<HelloRequest> createRepeated() =>
+      $pb.PbList<HelloRequest>();
   @$core.pragma('dart2js:noInline')
-  static HelloRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<HelloRequest>(create);
+  static HelloRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<HelloRequest>(create);
   static HelloRequest _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get name => $_getSZ(0);
   @$pb.TagNumber(1)
-  set name($core.String v) { $_setString(0, v); }
+  set name($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
@@ -41,33 +51,41 @@ class HelloRequest extends $pb.GeneratedMessage {
 }
 
 class HelloReply extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('HelloReply', package: const $pb.PackageName('helloworld'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('HelloReply',
+      package: const $pb.PackageName('helloworld'), createEmptyInstance: create)
     ..aOS(1, 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   HelloReply._() : super();
   factory HelloReply() => create();
-  factory HelloReply.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory HelloReply.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory HelloReply.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory HelloReply.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   HelloReply clone() => HelloReply()..mergeFromMessage(this);
-  HelloReply copyWith(void Function(HelloReply) updates) => super.copyWith((message) => updates(message as HelloReply));
+  HelloReply copyWith(void Function(HelloReply) updates) =>
+      super.copyWith((message) => updates(message as HelloReply));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static HelloReply create() => HelloReply._();
   HelloReply createEmptyInstance() => create();
   static $pb.PbList<HelloReply> createRepeated() => $pb.PbList<HelloReply>();
   @$core.pragma('dart2js:noInline')
-  static HelloReply getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<HelloReply>(create);
+  static HelloReply getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<HelloReply>(create);
   static HelloReply _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get message => $_getSZ(0);
   @$pb.TagNumber(1)
-  set message($core.String v) { $_setString(0, v); }
+  set message($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasMessage() => $_has(0);
   @$pb.TagNumber(1)
   void clearMessage() => clearField(1);
 }
-
diff --git a/example/helloworld/lib/src/generated/helloworld.pbenum.dart b/example/helloworld/lib/src/generated/helloworld.pbenum.dart
index dd54bf2..e1a4d52 100644
--- a/example/helloworld/lib/src/generated/helloworld.pbenum.dart
+++ b/example/helloworld/lib/src/generated/helloworld.pbenum.dart
@@ -4,4 +4,3 @@
 //
 // @dart = 2.3
 // ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
-
diff --git a/example/helloworld/lib/src/generated/helloworld.pbjson.dart b/example/helloworld/lib/src/generated/helloworld.pbjson.dart
index c40d057..dc1c278 100644
--- a/example/helloworld/lib/src/generated/helloworld.pbjson.dart
+++ b/example/helloworld/lib/src/generated/helloworld.pbjson.dart
@@ -18,4 +18,3 @@ const HelloReply$json = const {
     const {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'},
   ],
 };
-
diff --git a/example/route_guide/lib/src/generated/route_guide.pb.dart b/example/route_guide/lib/src/generated/route_guide.pb.dart
index 4298e23..bad8f58 100644
--- a/example/route_guide/lib/src/generated/route_guide.pb.dart
+++ b/example/route_guide/lib/src/generated/route_guide.pb.dart
@@ -10,31 +10,40 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class Point extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Point', package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Point',
+      package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
     ..a<$core.int>(1, 'latitude', $pb.PbFieldType.O3)
     ..a<$core.int>(2, 'longitude', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   Point._() : super();
   factory Point() => create();
-  factory Point.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Point.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory Point.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory Point.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   Point clone() => Point()..mergeFromMessage(this);
-  Point copyWith(void Function(Point) updates) => super.copyWith((message) => updates(message as Point));
+  Point copyWith(void Function(Point) updates) =>
+      super.copyWith((message) => updates(message as Point));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Point create() => Point._();
   Point createEmptyInstance() => create();
   static $pb.PbList<Point> createRepeated() => $pb.PbList<Point>();
   @$core.pragma('dart2js:noInline')
-  static Point getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Point>(create);
+  static Point getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Point>(create);
   static Point _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get latitude => $_getIZ(0);
   @$pb.TagNumber(1)
-  set latitude($core.int v) { $_setSignedInt32(0, v); }
+  set latitude($core.int v) {
+    $_setSignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasLatitude() => $_has(0);
   @$pb.TagNumber(1)
@@ -43,7 +52,10 @@ class Point extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.int get longitude => $_getIZ(1);
   @$pb.TagNumber(2)
-  set longitude($core.int v) { $_setSignedInt32(1, v); }
+  set longitude($core.int v) {
+    $_setSignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasLongitude() => $_has(1);
   @$pb.TagNumber(2)
@@ -51,31 +63,40 @@ class Point extends $pb.GeneratedMessage {
 }
 
 class Rectangle extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Rectangle', package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Rectangle',
+      package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
     ..aOM<Point>(1, 'lo', subBuilder: Point.create)
     ..aOM<Point>(2, 'hi', subBuilder: Point.create)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   Rectangle._() : super();
   factory Rectangle() => create();
-  factory Rectangle.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Rectangle.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory Rectangle.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory Rectangle.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   Rectangle clone() => Rectangle()..mergeFromMessage(this);
-  Rectangle copyWith(void Function(Rectangle) updates) => super.copyWith((message) => updates(message as Rectangle));
+  Rectangle copyWith(void Function(Rectangle) updates) =>
+      super.copyWith((message) => updates(message as Rectangle));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Rectangle create() => Rectangle._();
   Rectangle createEmptyInstance() => create();
   static $pb.PbList<Rectangle> createRepeated() => $pb.PbList<Rectangle>();
   @$core.pragma('dart2js:noInline')
-  static Rectangle getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Rectangle>(create);
+  static Rectangle getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Rectangle>(create);
   static Rectangle _defaultInstance;
 
   @$pb.TagNumber(1)
   Point get lo => $_getN(0);
   @$pb.TagNumber(1)
-  set lo(Point v) { setField(1, v); }
+  set lo(Point v) {
+    setField(1, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasLo() => $_has(0);
   @$pb.TagNumber(1)
@@ -86,7 +107,10 @@ class Rectangle extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   Point get hi => $_getN(1);
   @$pb.TagNumber(2)
-  set hi(Point v) { setField(2, v); }
+  set hi(Point v) {
+    setField(2, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasHi() => $_has(1);
   @$pb.TagNumber(2)
@@ -96,31 +120,40 @@ class Rectangle extends $pb.GeneratedMessage {
 }
 
 class Feature extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Feature', package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Feature',
+      package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
     ..aOS(1, 'name')
     ..aOM<Point>(2, 'location', subBuilder: Point.create)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   Feature._() : super();
   factory Feature() => create();
-  factory Feature.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Feature.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory Feature.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory Feature.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   Feature clone() => Feature()..mergeFromMessage(this);
-  Feature copyWith(void Function(Feature) updates) => super.copyWith((message) => updates(message as Feature));
+  Feature copyWith(void Function(Feature) updates) =>
+      super.copyWith((message) => updates(message as Feature));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Feature create() => Feature._();
   Feature createEmptyInstance() => create();
   static $pb.PbList<Feature> createRepeated() => $pb.PbList<Feature>();
   @$core.pragma('dart2js:noInline')
-  static Feature getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Feature>(create);
+  static Feature getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Feature>(create);
   static Feature _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get name => $_getSZ(0);
   @$pb.TagNumber(1)
-  set name($core.String v) { $_setString(0, v); }
+  set name($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
@@ -129,7 +162,10 @@ class Feature extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   Point get location => $_getN(1);
   @$pb.TagNumber(2)
-  set location(Point v) { setField(2, v); }
+  set location(Point v) {
+    setField(2, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasLocation() => $_has(1);
   @$pb.TagNumber(2)
@@ -139,31 +175,40 @@ class Feature extends $pb.GeneratedMessage {
 }
 
 class RouteNote extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('RouteNote', package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('RouteNote',
+      package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
     ..aOM<Point>(1, 'location', subBuilder: Point.create)
     ..aOS(2, 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   RouteNote._() : super();
   factory RouteNote() => create();
-  factory RouteNote.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RouteNote.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory RouteNote.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory RouteNote.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   RouteNote clone() => RouteNote()..mergeFromMessage(this);
-  RouteNote copyWith(void Function(RouteNote) updates) => super.copyWith((message) => updates(message as RouteNote));
+  RouteNote copyWith(void Function(RouteNote) updates) =>
+      super.copyWith((message) => updates(message as RouteNote));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static RouteNote create() => RouteNote._();
   RouteNote createEmptyInstance() => create();
   static $pb.PbList<RouteNote> createRepeated() => $pb.PbList<RouteNote>();
   @$core.pragma('dart2js:noInline')
-  static RouteNote getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RouteNote>(create);
+  static RouteNote getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RouteNote>(create);
   static RouteNote _defaultInstance;
 
   @$pb.TagNumber(1)
   Point get location => $_getN(0);
   @$pb.TagNumber(1)
-  set location(Point v) { setField(1, v); }
+  set location(Point v) {
+    setField(1, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasLocation() => $_has(0);
   @$pb.TagNumber(1)
@@ -174,7 +219,10 @@ class RouteNote extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.String get message => $_getSZ(1);
   @$pb.TagNumber(2)
-  set message($core.String v) { $_setString(1, v); }
+  set message($core.String v) {
+    $_setString(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
@@ -182,33 +230,43 @@ class RouteNote extends $pb.GeneratedMessage {
 }
 
 class RouteSummary extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('RouteSummary', package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('RouteSummary',
+      package: const $pb.PackageName('routeguide'), createEmptyInstance: create)
     ..a<$core.int>(1, 'pointCount', $pb.PbFieldType.O3)
     ..a<$core.int>(2, 'featureCount', $pb.PbFieldType.O3)
     ..a<$core.int>(3, 'distance', $pb.PbFieldType.O3)
     ..a<$core.int>(4, 'elapsedTime', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   RouteSummary._() : super();
   factory RouteSummary() => create();
-  factory RouteSummary.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RouteSummary.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory RouteSummary.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory RouteSummary.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   RouteSummary clone() => RouteSummary()..mergeFromMessage(this);
-  RouteSummary copyWith(void Function(RouteSummary) updates) => super.copyWith((message) => updates(message as RouteSummary));
+  RouteSummary copyWith(void Function(RouteSummary) updates) =>
+      super.copyWith((message) => updates(message as RouteSummary));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static RouteSummary create() => RouteSummary._();
   RouteSummary createEmptyInstance() => create();
-  static $pb.PbList<RouteSummary> createRepeated() => $pb.PbList<RouteSummary>();
+  static $pb.PbList<RouteSummary> createRepeated() =>
+      $pb.PbList<RouteSummary>();
   @$core.pragma('dart2js:noInline')
-  static RouteSummary getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RouteSummary>(create);
+  static RouteSummary getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<RouteSummary>(create);
   static RouteSummary _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.int get pointCount => $_getIZ(0);
   @$pb.TagNumber(1)
-  set pointCount($core.int v) { $_setSignedInt32(0, v); }
+  set pointCount($core.int v) {
+    $_setSignedInt32(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasPointCount() => $_has(0);
   @$pb.TagNumber(1)
@@ -217,7 +275,10 @@ class RouteSummary extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.int get featureCount => $_getIZ(1);
   @$pb.TagNumber(2)
-  set featureCount($core.int v) { $_setSignedInt32(1, v); }
+  set featureCount($core.int v) {
+    $_setSignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasFeatureCount() => $_has(1);
   @$pb.TagNumber(2)
@@ -226,7 +287,10 @@ class RouteSummary extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.int get distance => $_getIZ(2);
   @$pb.TagNumber(3)
-  set distance($core.int v) { $_setSignedInt32(2, v); }
+  set distance($core.int v) {
+    $_setSignedInt32(2, v);
+  }
+
   @$pb.TagNumber(3)
   $core.bool hasDistance() => $_has(2);
   @$pb.TagNumber(3)
@@ -235,10 +299,12 @@ class RouteSummary extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.int get elapsedTime => $_getIZ(3);
   @$pb.TagNumber(4)
-  set elapsedTime($core.int v) { $_setSignedInt32(3, v); }
+  set elapsedTime($core.int v) {
+    $_setSignedInt32(3, v);
+  }
+
   @$pb.TagNumber(4)
   $core.bool hasElapsedTime() => $_has(3);
   @$pb.TagNumber(4)
   void clearElapsedTime() => clearField(4);
 }
-
diff --git a/example/route_guide/lib/src/generated/route_guide.pbenum.dart b/example/route_guide/lib/src/generated/route_guide.pbenum.dart
index 2a3fa5e..f9a684d 100644
--- a/example/route_guide/lib/src/generated/route_guide.pbenum.dart
+++ b/example/route_guide/lib/src/generated/route_guide.pbenum.dart
@@ -4,4 +4,3 @@
 //
 // @dart = 2.3
 // ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
-
diff --git a/example/route_guide/lib/src/generated/route_guide.pbjson.dart b/example/route_guide/lib/src/generated/route_guide.pbjson.dart
index 83e14eb..6c09f27 100644
--- a/example/route_guide/lib/src/generated/route_guide.pbjson.dart
+++ b/example/route_guide/lib/src/generated/route_guide.pbjson.dart
@@ -16,8 +16,22 @@ const Point$json = const {
 const Rectangle$json = const {
   '1': 'Rectangle',
   '2': const [
-    const {'1': 'lo', '3': 1, '4': 1, '5': 11, '6': '.routeguide.Point', '10': 'lo'},
-    const {'1': 'hi', '3': 2, '4': 1, '5': 11, '6': '.routeguide.Point', '10': 'hi'},
+    const {
+      '1': 'lo',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.routeguide.Point',
+      '10': 'lo'
+    },
+    const {
+      '1': 'hi',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.routeguide.Point',
+      '10': 'hi'
+    },
   ],
 };
 
@@ -25,14 +39,28 @@ const Feature$json = const {
   '1': 'Feature',
   '2': const [
     const {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'},
-    const {'1': 'location', '3': 2, '4': 1, '5': 11, '6': '.routeguide.Point', '10': 'location'},
+    const {
+      '1': 'location',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.routeguide.Point',
+      '10': 'location'
+    },
   ],
 };
 
 const RouteNote$json = const {
   '1': 'RouteNote',
   '2': const [
-    const {'1': 'location', '3': 1, '4': 1, '5': 11, '6': '.routeguide.Point', '10': 'location'},
+    const {
+      '1': 'location',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.routeguide.Point',
+      '10': 'location'
+    },
     const {'1': 'message', '3': 2, '4': 1, '5': 9, '10': 'message'},
   ],
 };
@@ -46,4 +74,3 @@ const RouteSummary$json = const {
     const {'1': 'elapsed_time', '3': 4, '4': 1, '5': 5, '10': 'elapsedTime'},
   ],
 };
-
diff --git a/test/src/generated/echo.pb.dart b/test/src/generated/echo.pb.dart
index 89994a0..1445944 100644
--- a/test/src/generated/echo.pb.dart
+++ b/test/src/generated/echo.pb.dart
@@ -10,30 +10,40 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class EchoRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('EchoRequest', package: const $pb.PackageName('grpc.gateway.testing'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('EchoRequest',
+      package: const $pb.PackageName('grpc.gateway.testing'),
+      createEmptyInstance: create)
     ..aOS(1, 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   EchoRequest._() : super();
   factory EchoRequest() => create();
-  factory EchoRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EchoRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory EchoRequest.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory EchoRequest.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   EchoRequest clone() => EchoRequest()..mergeFromMessage(this);
-  EchoRequest copyWith(void Function(EchoRequest) updates) => super.copyWith((message) => updates(message as EchoRequest));
+  EchoRequest copyWith(void Function(EchoRequest) updates) =>
+      super.copyWith((message) => updates(message as EchoRequest));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static EchoRequest create() => EchoRequest._();
   EchoRequest createEmptyInstance() => create();
   static $pb.PbList<EchoRequest> createRepeated() => $pb.PbList<EchoRequest>();
   @$core.pragma('dart2js:noInline')
-  static EchoRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EchoRequest>(create);
+  static EchoRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EchoRequest>(create);
   static EchoRequest _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get message => $_getSZ(0);
   @$pb.TagNumber(1)
-  set message($core.String v) { $_setString(0, v); }
+  set message($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasMessage() => $_has(0);
   @$pb.TagNumber(1)
@@ -41,30 +51,41 @@ class EchoRequest extends $pb.GeneratedMessage {
 }
 
 class EchoResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('EchoResponse', package: const $pb.PackageName('grpc.gateway.testing'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo('EchoResponse',
+      package: const $pb.PackageName('grpc.gateway.testing'),
+      createEmptyInstance: create)
     ..aOS(1, 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   EchoResponse._() : super();
   factory EchoResponse() => create();
-  factory EchoResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EchoResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+  factory EchoResponse.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory EchoResponse.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
   EchoResponse clone() => EchoResponse()..mergeFromMessage(this);
-  EchoResponse copyWith(void Function(EchoResponse) updates) => super.copyWith((message) => updates(message as EchoResponse));
+  EchoResponse copyWith(void Function(EchoResponse) updates) =>
+      super.copyWith((message) => updates(message as EchoResponse));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static EchoResponse create() => EchoResponse._();
   EchoResponse createEmptyInstance() => create();
-  static $pb.PbList<EchoResponse> createRepeated() => $pb.PbList<EchoResponse>();
+  static $pb.PbList<EchoResponse> createRepeated() =>
+      $pb.PbList<EchoResponse>();
   @$core.pragma('dart2js:noInline')
-  static EchoResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EchoResponse>(create);
+  static EchoResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<EchoResponse>(create);
   static EchoResponse _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get message => $_getSZ(0);
   @$pb.TagNumber(1)
-  set message($core.String v) { $_setString(0, v); }
+  set message($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasMessage() => $_has(0);
   @$pb.TagNumber(1)
@@ -72,32 +93,47 @@ class EchoResponse extends $pb.GeneratedMessage {
 }
 
 class ServerStreamingEchoRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('ServerStreamingEchoRequest', package: const $pb.PackageName('grpc.gateway.testing'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      'ServerStreamingEchoRequest',
+      package: const $pb.PackageName('grpc.gateway.testing'),
+      createEmptyInstance: create)
     ..aOS(1, 'message')
     ..a<$core.int>(2, 'messageCount', $pb.PbFieldType.O3)
     ..a<$core.int>(3, 'messageInterval', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   ServerStreamingEchoRequest._() : super();
   factory ServerStreamingEchoRequest() => create();
-  factory ServerStreamingEchoRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ServerStreamingEchoRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-  ServerStreamingEchoRequest clone() => ServerStreamingEchoRequest()..mergeFromMessage(this);
-  ServerStreamingEchoRequest copyWith(void Function(ServerStreamingEchoRequest) updates) => super.copyWith((message) => updates(message as ServerStreamingEchoRequest));
+  factory ServerStreamingEchoRequest.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory ServerStreamingEchoRequest.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+  ServerStreamingEchoRequest clone() =>
+      ServerStreamingEchoRequest()..mergeFromMessage(this);
+  ServerStreamingEchoRequest copyWith(
+          void Function(ServerStreamingEchoRequest) updates) =>
+      super.copyWith(
+          (message) => updates(message as ServerStreamingEchoRequest));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static ServerStreamingEchoRequest create() => ServerStreamingEchoRequest._();
   ServerStreamingEchoRequest createEmptyInstance() => create();
-  static $pb.PbList<ServerStreamingEchoRequest> createRepeated() => $pb.PbList<ServerStreamingEchoRequest>();
+  static $pb.PbList<ServerStreamingEchoRequest> createRepeated() =>
+      $pb.PbList<ServerStreamingEchoRequest>();
   @$core.pragma('dart2js:noInline')
-  static ServerStreamingEchoRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ServerStreamingEchoRequest>(create);
+  static ServerStreamingEchoRequest getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<ServerStreamingEchoRequest>(create);
   static ServerStreamingEchoRequest _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get message => $_getSZ(0);
   @$pb.TagNumber(1)
-  set message($core.String v) { $_setString(0, v); }
+  set message($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasMessage() => $_has(0);
   @$pb.TagNumber(1)
@@ -106,7 +142,10 @@ class ServerStreamingEchoRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.int get messageCount => $_getIZ(1);
   @$pb.TagNumber(2)
-  set messageCount($core.int v) { $_setSignedInt32(1, v); }
+  set messageCount($core.int v) {
+    $_setSignedInt32(1, v);
+  }
+
   @$pb.TagNumber(2)
   $core.bool hasMessageCount() => $_has(1);
   @$pb.TagNumber(2)
@@ -115,7 +154,10 @@ class ServerStreamingEchoRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.int get messageInterval => $_getIZ(2);
   @$pb.TagNumber(3)
-  set messageInterval($core.int v) { $_setSignedInt32(2, v); }
+  set messageInterval($core.int v) {
+    $_setSignedInt32(2, v);
+  }
+
   @$pb.TagNumber(3)
   $core.bool hasMessageInterval() => $_has(2);
   @$pb.TagNumber(3)
@@ -123,33 +165,48 @@ class ServerStreamingEchoRequest extends $pb.GeneratedMessage {
 }
 
 class ServerStreamingEchoResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('ServerStreamingEchoResponse', package: const $pb.PackageName('grpc.gateway.testing'), createEmptyInstance: create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      'ServerStreamingEchoResponse',
+      package: const $pb.PackageName('grpc.gateway.testing'),
+      createEmptyInstance: create)
     ..aOS(1, 'message')
-    ..hasRequiredFields = false
-  ;
+    ..hasRequiredFields = false;
 
   ServerStreamingEchoResponse._() : super();
   factory ServerStreamingEchoResponse() => create();
-  factory ServerStreamingEchoResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ServerStreamingEchoResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-  ServerStreamingEchoResponse clone() => ServerStreamingEchoResponse()..mergeFromMessage(this);
-  ServerStreamingEchoResponse copyWith(void Function(ServerStreamingEchoResponse) updates) => super.copyWith((message) => updates(message as ServerStreamingEchoResponse));
+  factory ServerStreamingEchoResponse.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory ServerStreamingEchoResponse.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+  ServerStreamingEchoResponse clone() =>
+      ServerStreamingEchoResponse()..mergeFromMessage(this);
+  ServerStreamingEchoResponse copyWith(
+          void Function(ServerStreamingEchoResponse) updates) =>
+      super.copyWith(
+          (message) => updates(message as ServerStreamingEchoResponse));
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
-  static ServerStreamingEchoResponse create() => ServerStreamingEchoResponse._();
+  static ServerStreamingEchoResponse create() =>
+      ServerStreamingEchoResponse._();
   ServerStreamingEchoResponse createEmptyInstance() => create();
-  static $pb.PbList<ServerStreamingEchoResponse> createRepeated() => $pb.PbList<ServerStreamingEchoResponse>();
+  static $pb.PbList<ServerStreamingEchoResponse> createRepeated() =>
+      $pb.PbList<ServerStreamingEchoResponse>();
   @$core.pragma('dart2js:noInline')
-  static ServerStreamingEchoResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ServerStreamingEchoResponse>(create);
+  static ServerStreamingEchoResponse getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<ServerStreamingEchoResponse>(create);
   static ServerStreamingEchoResponse _defaultInstance;
 
   @$pb.TagNumber(1)
   $core.String get message => $_getSZ(0);
   @$pb.TagNumber(1)
-  set message($core.String v) { $_setString(0, v); }
+  set message($core.String v) {
+    $_setString(0, v);
+  }
+
   @$pb.TagNumber(1)
   $core.bool hasMessage() => $_has(0);
   @$pb.TagNumber(1)
   void clearMessage() => clearField(1);
 }
-
diff --git a/test/src/generated/echo.pbenum.dart b/test/src/generated/echo.pbenum.dart
index 1c07ac7..178c983 100644
--- a/test/src/generated/echo.pbenum.dart
+++ b/test/src/generated/echo.pbenum.dart
@@ -4,4 +4,3 @@
 //
 // @dart = 2.3
 // ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
-
diff --git a/test/src/generated/echo.pbjson.dart b/test/src/generated/echo.pbjson.dart
index 1c329dc..7a8a4fe 100644
--- a/test/src/generated/echo.pbjson.dart
+++ b/test/src/generated/echo.pbjson.dart
@@ -24,7 +24,13 @@ const ServerStreamingEchoRequest$json = const {
   '2': const [
     const {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'},
     const {'1': 'message_count', '3': 2, '4': 1, '5': 5, '10': 'messageCount'},
-    const {'1': 'message_interval', '3': 3, '4': 1, '5': 5, '10': 'messageInterval'},
+    const {
+      '1': 'message_interval',
+      '3': 3,
+      '4': 1,
+      '5': 5,
+      '10': 'messageInterval'
+    },
   ],
 };
 
@@ -34,4 +40,3 @@ const ServerStreamingEchoResponse$json = const {
     const {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'},
   ],
 };
-