Seal protobuf message classes via constructor streamlining. (#253)
Emit constructors for protobuf message classes as factory constructors, effectively sealing the classes. create() is now the primary construction code.
diff --git a/protoc_plugin/CHANGELOG.md b/protoc_plugin/CHANGELOG.md
index 228c7bd..b3ca270 100644
--- a/protoc_plugin/CHANGELOG.md
+++ b/protoc_plugin/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 17.0.0
+
+* Breaking change: seal protobuf message classes by using an internal
+ private constructor and changing the rest to factories.
+
## 16.0.7
* Always prefix .pb.dart imports in .pbserver, .pb.json, .pbgrpc files.
diff --git a/protoc_plugin/lib/file_generator.dart b/protoc_plugin/lib/file_generator.dart
index 07fce5c..784364b 100644
--- a/protoc_plugin/lib/file_generator.dart
+++ b/protoc_plugin/lib/file_generator.dart
@@ -285,8 +285,9 @@
out.println(_asyncImport);
}
- out.println(
- '$_coreImport show bool, Deprecated, double, int, List, Map, override, String;\n');
+ out.println('$_coreImport show '
+ 'bool, Deprecated, double, int, List, Map, override, pragma, String;');
+ out.println();
if (_needsFixnumImport) {
out.println("import 'package:fixnum/fixnum.dart';");
diff --git a/protoc_plugin/lib/message_generator.dart b/protoc_plugin/lib/message_generator.dart
index 643ec84..75b17c6 100644
--- a/protoc_plugin/lib/message_generator.dart
+++ b/protoc_plugin/lib/message_generator.dart
@@ -359,16 +359,17 @@
out.println();
- out.printlnAnnotated('${classname}() : super();', [
+ out.printlnAnnotated('${classname}._() : super();', [
NamedLocation(name: classname, fieldPathSegment: fieldPath, start: 0)
]);
+ out.println('factory ${classname}() => create();');
out.println(
- '${classname}.fromBuffer($_coreImportPrefix.List<$_coreImportPrefix.int> i,'
+ 'factory ${classname}.fromBuffer($_coreImportPrefix.List<$_coreImportPrefix.int> i,'
' [$_protobufImportPrefix.ExtensionRegistry r = $_protobufImportPrefix.ExtensionRegistry.EMPTY])'
- ' : super.fromBuffer(i, r);');
- out.println('${classname}.fromJson($_coreImportPrefix.String i,'
+ ' => create()..mergeFromBuffer(i, r);');
+ out.println('factory ${classname}.fromJson($_coreImportPrefix.String i,'
' [$_protobufImportPrefix.ExtensionRegistry r = $_protobufImportPrefix.ExtensionRegistry.EMPTY])'
- ' : super.fromJson(i, r);');
+ ' => create()..mergeFromJson(i, r);');
out.println('${classname} clone() =>'
' ${classname}()..mergeFromMessage(this);');
out.println('$classname copyWith(void Function($classname) updates) =>'
@@ -377,8 +378,8 @@
out.println('$_protobufImportPrefix.BuilderInfo get info_ => _i;');
// Factory functions which can be used as default value closures.
- out.println('static ${classname} create() =>'
- ' ${classname}();');
+ out.println("@${_coreImportPrefix}.pragma('dart2js:noInline')");
+ out.println('static ${classname} create() => ${classname}._();');
out.println('${classname} createEmptyInstance() => create();');
out.println(
diff --git a/protoc_plugin/lib/src/dart_options.pb.dart b/protoc_plugin/lib/src/dart_options.pb.dart
index ccb840a..abcd30c 100644
--- a/protoc_plugin/lib/src/dart_options.pb.dart
+++ b/protoc_plugin/lib/src/dart_options.pb.dart
@@ -5,7 +5,7 @@
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
import 'dart:core' as $core
- show bool, Deprecated, double, int, List, Map, override, String;
+ show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
@@ -17,18 +17,20 @@
..aOS(3, 'parent')
..hasRequiredFields = false;
- DartMixin() : super();
- DartMixin.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- DartMixin.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ DartMixin._() : super();
+ factory DartMixin() => create();
+ factory DartMixin.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory DartMixin.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
DartMixin clone() => DartMixin()..mergeFromMessage(this);
DartMixin copyWith(void Function(DartMixin) updates) =>
super.copyWith((message) => updates(message as DartMixin));
$pb.BuilderInfo get info_ => _i;
- static DartMixin create() => DartMixin();
+ @$core.pragma('dart2js:noInline')
+ static DartMixin create() => DartMixin._();
DartMixin createEmptyInstance() => create();
static $pb.PbList<DartMixin> createRepeated() => $pb.PbList<DartMixin>();
static DartMixin getDefault() => _defaultInstance ??= create()..freeze();
@@ -65,18 +67,20 @@
..pc<DartMixin>(1, 'mixins', $pb.PbFieldType.PM, DartMixin.create)
..hasRequiredFields = false;
- Imports() : super();
- Imports.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- Imports.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ Imports._() : super();
+ factory Imports() => create();
+ factory Imports.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory Imports.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
Imports clone() => Imports()..mergeFromMessage(this);
Imports copyWith(void Function(Imports) updates) =>
super.copyWith((message) => updates(message as Imports));
$pb.BuilderInfo get info_ => _i;
- static Imports create() => Imports();
+ @$core.pragma('dart2js:noInline')
+ static Imports create() => Imports._();
Imports createEmptyInstance() => create();
static $pb.PbList<Imports> createRepeated() => $pb.PbList<Imports>();
static Imports getDefault() => _defaultInstance ??= create()..freeze();
diff --git a/protoc_plugin/lib/src/descriptor.pb.dart b/protoc_plugin/lib/src/descriptor.pb.dart
index 6b1a3fb..44d8800 100644
--- a/protoc_plugin/lib/src/descriptor.pb.dart
+++ b/protoc_plugin/lib/src/descriptor.pb.dart
@@ -5,7 +5,7 @@
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
import 'dart:core' as $core
- show bool, Deprecated, double, int, List, Map, override, String;
+ show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:fixnum/fixnum.dart';
import 'package:protobuf/protobuf.dart' as $pb;
@@ -20,18 +20,20 @@
..pc<FileDescriptorProto>(
1, 'file', $pb.PbFieldType.PM, FileDescriptorProto.create);
- FileDescriptorSet() : super();
- FileDescriptorSet.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- FileDescriptorSet.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ FileDescriptorSet._() : super();
+ factory FileDescriptorSet() => create();
+ factory FileDescriptorSet.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory FileDescriptorSet.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
FileDescriptorSet clone() => FileDescriptorSet()..mergeFromMessage(this);
FileDescriptorSet copyWith(void Function(FileDescriptorSet) updates) =>
super.copyWith((message) => updates(message as FileDescriptorSet));
$pb.BuilderInfo get info_ => _i;
- static FileDescriptorSet create() => FileDescriptorSet();
+ @$core.pragma('dart2js:noInline')
+ static FileDescriptorSet create() => FileDescriptorSet._();
FileDescriptorSet createEmptyInstance() => create();
static $pb.PbList<FileDescriptorSet> createRepeated() =>
$pb.PbList<FileDescriptorSet>();
@@ -64,18 +66,20 @@
..p<$core.int>(11, 'weakDependency', $pb.PbFieldType.P3)
..aOS(12, 'syntax');
- FileDescriptorProto() : super();
- FileDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- FileDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ FileDescriptorProto._() : super();
+ factory FileDescriptorProto() => create();
+ factory FileDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory FileDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
FileDescriptorProto clone() => FileDescriptorProto()..mergeFromMessage(this);
FileDescriptorProto copyWith(void Function(FileDescriptorProto) updates) =>
super.copyWith((message) => updates(message as FileDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static FileDescriptorProto create() => FileDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static FileDescriptorProto create() => FileDescriptorProto._();
FileDescriptorProto createEmptyInstance() => create();
static $pb.PbList<FileDescriptorProto> createRepeated() =>
$pb.PbList<FileDescriptorProto>();
@@ -146,13 +150,14 @@
..a<$core.int>(2, 'end', $pb.PbFieldType.O3)
..hasRequiredFields = false;
- DescriptorProto_ExtensionRange() : super();
- DescriptorProto_ExtensionRange.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- DescriptorProto_ExtensionRange.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ DescriptorProto_ExtensionRange._() : super();
+ factory DescriptorProto_ExtensionRange() => create();
+ factory DescriptorProto_ExtensionRange.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory DescriptorProto_ExtensionRange.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
DescriptorProto_ExtensionRange clone() =>
DescriptorProto_ExtensionRange()..mergeFromMessage(this);
DescriptorProto_ExtensionRange copyWith(
@@ -160,8 +165,9 @@
super.copyWith(
(message) => updates(message as DescriptorProto_ExtensionRange));
$pb.BuilderInfo get info_ => _i;
+ @$core.pragma('dart2js:noInline')
static DescriptorProto_ExtensionRange create() =>
- DescriptorProto_ExtensionRange();
+ DescriptorProto_ExtensionRange._();
DescriptorProto_ExtensionRange createEmptyInstance() => create();
static $pb.PbList<DescriptorProto_ExtensionRange> createRepeated() =>
$pb.PbList<DescriptorProto_ExtensionRange>();
@@ -194,13 +200,14 @@
..a<$core.int>(2, 'end', $pb.PbFieldType.O3)
..hasRequiredFields = false;
- DescriptorProto_ReservedRange() : super();
- DescriptorProto_ReservedRange.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- DescriptorProto_ReservedRange.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ DescriptorProto_ReservedRange._() : super();
+ factory DescriptorProto_ReservedRange() => create();
+ factory DescriptorProto_ReservedRange.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory DescriptorProto_ReservedRange.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
DescriptorProto_ReservedRange clone() =>
DescriptorProto_ReservedRange()..mergeFromMessage(this);
DescriptorProto_ReservedRange copyWith(
@@ -208,8 +215,9 @@
super.copyWith(
(message) => updates(message as DescriptorProto_ReservedRange));
$pb.BuilderInfo get info_ => _i;
+ @$core.pragma('dart2js:noInline')
static DescriptorProto_ReservedRange create() =>
- DescriptorProto_ReservedRange();
+ DescriptorProto_ReservedRange._();
DescriptorProto_ReservedRange createEmptyInstance() => create();
static $pb.PbList<DescriptorProto_ReservedRange> createRepeated() =>
$pb.PbList<DescriptorProto_ReservedRange>();
@@ -256,18 +264,20 @@
DescriptorProto_ReservedRange.create)
..pPS(10, 'reservedName');
- DescriptorProto() : super();
- DescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- DescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ DescriptorProto._() : super();
+ factory DescriptorProto() => create();
+ factory DescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory DescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
DescriptorProto clone() => DescriptorProto()..mergeFromMessage(this);
DescriptorProto copyWith(void Function(DescriptorProto) updates) =>
super.copyWith((message) => updates(message as DescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static DescriptorProto create() => DescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static DescriptorProto create() => DescriptorProto._();
DescriptorProto createEmptyInstance() => create();
static $pb.PbList<DescriptorProto> createRepeated() =>
$pb.PbList<DescriptorProto>();
@@ -335,19 +345,21 @@
..a<$core.int>(9, 'oneofIndex', $pb.PbFieldType.O3)
..aOS(10, 'jsonName');
- FieldDescriptorProto() : super();
- FieldDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- FieldDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ FieldDescriptorProto._() : super();
+ factory FieldDescriptorProto() => create();
+ factory FieldDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory FieldDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
FieldDescriptorProto clone() =>
FieldDescriptorProto()..mergeFromMessage(this);
FieldDescriptorProto copyWith(void Function(FieldDescriptorProto) updates) =>
super.copyWith((message) => updates(message as FieldDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static FieldDescriptorProto create() => FieldDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static FieldDescriptorProto create() => FieldDescriptorProto._();
FieldDescriptorProto createEmptyInstance() => create();
static $pb.PbList<FieldDescriptorProto> createRepeated() =>
$pb.PbList<FieldDescriptorProto>();
@@ -443,19 +455,21 @@
..a<OneofOptions>(2, 'options', $pb.PbFieldType.OM, OneofOptions.getDefault,
OneofOptions.create);
- OneofDescriptorProto() : super();
- OneofDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- OneofDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ OneofDescriptorProto._() : super();
+ factory OneofDescriptorProto() => create();
+ factory OneofDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory OneofDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
OneofDescriptorProto clone() =>
OneofDescriptorProto()..mergeFromMessage(this);
OneofDescriptorProto copyWith(void Function(OneofDescriptorProto) updates) =>
super.copyWith((message) => updates(message as OneofDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static OneofDescriptorProto create() => OneofDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static OneofDescriptorProto create() => OneofDescriptorProto._();
OneofDescriptorProto createEmptyInstance() => create();
static $pb.PbList<OneofDescriptorProto> createRepeated() =>
$pb.PbList<OneofDescriptorProto>();
@@ -489,18 +503,20 @@
..a<EnumOptions>(3, 'options', $pb.PbFieldType.OM, EnumOptions.getDefault,
EnumOptions.create);
- EnumDescriptorProto() : super();
- EnumDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- EnumDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ EnumDescriptorProto._() : super();
+ factory EnumDescriptorProto() => create();
+ factory EnumDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory EnumDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
EnumDescriptorProto clone() => EnumDescriptorProto()..mergeFromMessage(this);
EnumDescriptorProto copyWith(void Function(EnumDescriptorProto) updates) =>
super.copyWith((message) => updates(message as EnumDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static EnumDescriptorProto create() => EnumDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static EnumDescriptorProto create() => EnumDescriptorProto._();
EnumDescriptorProto createEmptyInstance() => create();
static $pb.PbList<EnumDescriptorProto> createRepeated() =>
$pb.PbList<EnumDescriptorProto>();
@@ -535,20 +551,22 @@
..a<EnumValueOptions>(3, 'options', $pb.PbFieldType.OM,
EnumValueOptions.getDefault, EnumValueOptions.create);
- EnumValueDescriptorProto() : super();
- EnumValueDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- EnumValueDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ EnumValueDescriptorProto._() : super();
+ factory EnumValueDescriptorProto() => create();
+ factory EnumValueDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory EnumValueDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
EnumValueDescriptorProto clone() =>
EnumValueDescriptorProto()..mergeFromMessage(this);
EnumValueDescriptorProto copyWith(
void Function(EnumValueDescriptorProto) updates) =>
super.copyWith((message) => updates(message as EnumValueDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static EnumValueDescriptorProto create() => EnumValueDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static EnumValueDescriptorProto create() => EnumValueDescriptorProto._();
EnumValueDescriptorProto createEmptyInstance() => create();
static $pb.PbList<EnumValueDescriptorProto> createRepeated() =>
$pb.PbList<EnumValueDescriptorProto>();
@@ -590,20 +608,22 @@
..a<ServiceOptions>(3, 'options', $pb.PbFieldType.OM,
ServiceOptions.getDefault, ServiceOptions.create);
- ServiceDescriptorProto() : super();
- ServiceDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- ServiceDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ ServiceDescriptorProto._() : super();
+ factory ServiceDescriptorProto() => create();
+ factory ServiceDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory ServiceDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
ServiceDescriptorProto clone() =>
ServiceDescriptorProto()..mergeFromMessage(this);
ServiceDescriptorProto copyWith(
void Function(ServiceDescriptorProto) updates) =>
super.copyWith((message) => updates(message as ServiceDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static ServiceDescriptorProto create() => ServiceDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static ServiceDescriptorProto create() => ServiceDescriptorProto._();
ServiceDescriptorProto createEmptyInstance() => create();
static $pb.PbList<ServiceDescriptorProto> createRepeated() =>
$pb.PbList<ServiceDescriptorProto>();
@@ -641,20 +661,22 @@
..aOB(5, 'clientStreaming')
..aOB(6, 'serverStreaming');
- MethodDescriptorProto() : super();
- MethodDescriptorProto.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- MethodDescriptorProto.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ MethodDescriptorProto._() : super();
+ factory MethodDescriptorProto() => create();
+ factory MethodDescriptorProto.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory MethodDescriptorProto.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
MethodDescriptorProto clone() =>
MethodDescriptorProto()..mergeFromMessage(this);
MethodDescriptorProto copyWith(
void Function(MethodDescriptorProto) updates) =>
super.copyWith((message) => updates(message as MethodDescriptorProto));
$pb.BuilderInfo get info_ => _i;
- static MethodDescriptorProto create() => MethodDescriptorProto();
+ @$core.pragma('dart2js:noInline')
+ static MethodDescriptorProto create() => MethodDescriptorProto._();
MethodDescriptorProto createEmptyInstance() => create();
static $pb.PbList<MethodDescriptorProto> createRepeated() =>
$pb.PbList<MethodDescriptorProto>();
@@ -741,18 +763,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- FileOptions() : super();
- FileOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- FileOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ FileOptions._() : super();
+ factory FileOptions() => create();
+ factory FileOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory FileOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
FileOptions clone() => FileOptions()..mergeFromMessage(this);
FileOptions copyWith(void Function(FileOptions) updates) =>
super.copyWith((message) => updates(message as FileOptions));
$pb.BuilderInfo get info_ => _i;
- static FileOptions create() => FileOptions();
+ @$core.pragma('dart2js:noInline')
+ static FileOptions create() => FileOptions._();
FileOptions createEmptyInstance() => create();
static $pb.PbList<FileOptions> createRepeated() => $pb.PbList<FileOptions>();
static FileOptions getDefault() => _defaultInstance ??= create()..freeze();
@@ -912,18 +936,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- MessageOptions() : super();
- MessageOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- MessageOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ MessageOptions._() : super();
+ factory MessageOptions() => create();
+ factory MessageOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory MessageOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
MessageOptions clone() => MessageOptions()..mergeFromMessage(this);
MessageOptions copyWith(void Function(MessageOptions) updates) =>
super.copyWith((message) => updates(message as MessageOptions));
$pb.BuilderInfo get info_ => _i;
- static MessageOptions create() => MessageOptions();
+ @$core.pragma('dart2js:noInline')
+ static MessageOptions create() => MessageOptions._();
MessageOptions createEmptyInstance() => create();
static $pb.PbList<MessageOptions> createRepeated() =>
$pb.PbList<MessageOptions>();
@@ -990,18 +1016,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- FieldOptions() : super();
- FieldOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- FieldOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ FieldOptions._() : super();
+ factory FieldOptions() => create();
+ factory FieldOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory FieldOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
FieldOptions clone() => FieldOptions()..mergeFromMessage(this);
FieldOptions copyWith(void Function(FieldOptions) updates) =>
super.copyWith((message) => updates(message as FieldOptions));
$pb.BuilderInfo get info_ => _i;
- static FieldOptions create() => FieldOptions();
+ @$core.pragma('dart2js:noInline')
+ static FieldOptions create() => FieldOptions._();
FieldOptions createEmptyInstance() => create();
static $pb.PbList<FieldOptions> createRepeated() =>
$pb.PbList<FieldOptions>();
@@ -1066,18 +1094,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- OneofOptions() : super();
- OneofOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- OneofOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ OneofOptions._() : super();
+ factory OneofOptions() => create();
+ factory OneofOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory OneofOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
OneofOptions clone() => OneofOptions()..mergeFromMessage(this);
OneofOptions copyWith(void Function(OneofOptions) updates) =>
super.copyWith((message) => updates(message as OneofOptions));
$pb.BuilderInfo get info_ => _i;
- static OneofOptions create() => OneofOptions();
+ @$core.pragma('dart2js:noInline')
+ static OneofOptions create() => OneofOptions._();
OneofOptions createEmptyInstance() => create();
static $pb.PbList<OneofOptions> createRepeated() =>
$pb.PbList<OneofOptions>();
@@ -1096,18 +1126,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- EnumOptions() : super();
- EnumOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- EnumOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ EnumOptions._() : super();
+ factory EnumOptions() => create();
+ factory EnumOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory EnumOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
EnumOptions clone() => EnumOptions()..mergeFromMessage(this);
EnumOptions copyWith(void Function(EnumOptions) updates) =>
super.copyWith((message) => updates(message as EnumOptions));
$pb.BuilderInfo get info_ => _i;
- static EnumOptions create() => EnumOptions();
+ @$core.pragma('dart2js:noInline')
+ static EnumOptions create() => EnumOptions._();
EnumOptions createEmptyInstance() => create();
static $pb.PbList<EnumOptions> createRepeated() => $pb.PbList<EnumOptions>();
static EnumOptions getDefault() => _defaultInstance ??= create()..freeze();
@@ -1140,18 +1172,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- EnumValueOptions() : super();
- EnumValueOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- EnumValueOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ EnumValueOptions._() : super();
+ factory EnumValueOptions() => create();
+ factory EnumValueOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory EnumValueOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
EnumValueOptions clone() => EnumValueOptions()..mergeFromMessage(this);
EnumValueOptions copyWith(void Function(EnumValueOptions) updates) =>
super.copyWith((message) => updates(message as EnumValueOptions));
$pb.BuilderInfo get info_ => _i;
- static EnumValueOptions create() => EnumValueOptions();
+ @$core.pragma('dart2js:noInline')
+ static EnumValueOptions create() => EnumValueOptions._();
EnumValueOptions createEmptyInstance() => create();
static $pb.PbList<EnumValueOptions> createRepeated() =>
$pb.PbList<EnumValueOptions>();
@@ -1178,18 +1212,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- ServiceOptions() : super();
- ServiceOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- ServiceOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ ServiceOptions._() : super();
+ factory ServiceOptions() => create();
+ factory ServiceOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory ServiceOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
ServiceOptions clone() => ServiceOptions()..mergeFromMessage(this);
ServiceOptions copyWith(void Function(ServiceOptions) updates) =>
super.copyWith((message) => updates(message as ServiceOptions));
$pb.BuilderInfo get info_ => _i;
- static ServiceOptions create() => ServiceOptions();
+ @$core.pragma('dart2js:noInline')
+ static ServiceOptions create() => ServiceOptions._();
ServiceOptions createEmptyInstance() => create();
static $pb.PbList<ServiceOptions> createRepeated() =>
$pb.PbList<ServiceOptions>();
@@ -1222,18 +1258,20 @@
UninterpretedOption.create)
..hasExtensions = true;
- MethodOptions() : super();
- MethodOptions.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- MethodOptions.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ MethodOptions._() : super();
+ factory MethodOptions() => create();
+ factory MethodOptions.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory MethodOptions.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
MethodOptions clone() => MethodOptions()..mergeFromMessage(this);
MethodOptions copyWith(void Function(MethodOptions) updates) =>
super.copyWith((message) => updates(message as MethodOptions));
$pb.BuilderInfo get info_ => _i;
- static MethodOptions create() => MethodOptions();
+ @$core.pragma('dart2js:noInline')
+ static MethodOptions create() => MethodOptions._();
MethodOptions createEmptyInstance() => create();
static $pb.PbList<MethodOptions> createRepeated() =>
$pb.PbList<MethodOptions>();
@@ -1266,13 +1304,14 @@
..aQS(1, 'namePart')
..a<$core.bool>(2, 'isExtension', $pb.PbFieldType.QB);
- UninterpretedOption_NamePart() : super();
- UninterpretedOption_NamePart.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- UninterpretedOption_NamePart.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ UninterpretedOption_NamePart._() : super();
+ factory UninterpretedOption_NamePart() => create();
+ factory UninterpretedOption_NamePart.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory UninterpretedOption_NamePart.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
UninterpretedOption_NamePart clone() =>
UninterpretedOption_NamePart()..mergeFromMessage(this);
UninterpretedOption_NamePart copyWith(
@@ -1280,8 +1319,9 @@
super.copyWith(
(message) => updates(message as UninterpretedOption_NamePart));
$pb.BuilderInfo get info_ => _i;
+ @$core.pragma('dart2js:noInline')
static UninterpretedOption_NamePart create() =>
- UninterpretedOption_NamePart();
+ UninterpretedOption_NamePart._();
UninterpretedOption_NamePart createEmptyInstance() => create();
static $pb.PbList<UninterpretedOption_NamePart> createRepeated() =>
$pb.PbList<UninterpretedOption_NamePart>();
@@ -1318,18 +1358,20 @@
..a<$core.List<$core.int>>(7, 'stringValue', $pb.PbFieldType.OY)
..aOS(8, 'aggregateValue');
- UninterpretedOption() : super();
- UninterpretedOption.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- UninterpretedOption.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ UninterpretedOption._() : super();
+ factory UninterpretedOption() => create();
+ factory UninterpretedOption.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory UninterpretedOption.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
UninterpretedOption clone() => UninterpretedOption()..mergeFromMessage(this);
UninterpretedOption copyWith(void Function(UninterpretedOption) updates) =>
super.copyWith((message) => updates(message as UninterpretedOption));
$pb.BuilderInfo get info_ => _i;
- static UninterpretedOption create() => UninterpretedOption();
+ @$core.pragma('dart2js:noInline')
+ static UninterpretedOption create() => UninterpretedOption._();
UninterpretedOption createEmptyInstance() => create();
static $pb.PbList<UninterpretedOption> createRepeated() =>
$pb.PbList<UninterpretedOption>();
@@ -1398,20 +1440,22 @@
..pPS(6, 'leadingDetachedComments')
..hasRequiredFields = false;
- SourceCodeInfo_Location() : super();
- SourceCodeInfo_Location.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- SourceCodeInfo_Location.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ SourceCodeInfo_Location._() : super();
+ factory SourceCodeInfo_Location() => create();
+ factory SourceCodeInfo_Location.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory SourceCodeInfo_Location.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
SourceCodeInfo_Location clone() =>
SourceCodeInfo_Location()..mergeFromMessage(this);
SourceCodeInfo_Location copyWith(
void Function(SourceCodeInfo_Location) updates) =>
super.copyWith((message) => updates(message as SourceCodeInfo_Location));
$pb.BuilderInfo get info_ => _i;
- static SourceCodeInfo_Location create() => SourceCodeInfo_Location();
+ @$core.pragma('dart2js:noInline')
+ static SourceCodeInfo_Location create() => SourceCodeInfo_Location._();
SourceCodeInfo_Location createEmptyInstance() => create();
static $pb.PbList<SourceCodeInfo_Location> createRepeated() =>
$pb.PbList<SourceCodeInfo_Location>();
@@ -1449,18 +1493,20 @@
1, 'location', $pb.PbFieldType.PM, SourceCodeInfo_Location.create)
..hasRequiredFields = false;
- SourceCodeInfo() : super();
- SourceCodeInfo.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- SourceCodeInfo.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ SourceCodeInfo._() : super();
+ factory SourceCodeInfo() => create();
+ factory SourceCodeInfo.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory SourceCodeInfo.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
SourceCodeInfo clone() => SourceCodeInfo()..mergeFromMessage(this);
SourceCodeInfo copyWith(void Function(SourceCodeInfo) updates) =>
super.copyWith((message) => updates(message as SourceCodeInfo));
$pb.BuilderInfo get info_ => _i;
- static SourceCodeInfo create() => SourceCodeInfo();
+ @$core.pragma('dart2js:noInline')
+ static SourceCodeInfo create() => SourceCodeInfo._();
SourceCodeInfo createEmptyInstance() => create();
static $pb.PbList<SourceCodeInfo> createRepeated() =>
$pb.PbList<SourceCodeInfo>();
@@ -1480,13 +1526,14 @@
..a<$core.int>(4, 'end', $pb.PbFieldType.O3)
..hasRequiredFields = false;
- GeneratedCodeInfo_Annotation() : super();
- GeneratedCodeInfo_Annotation.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- GeneratedCodeInfo_Annotation.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ GeneratedCodeInfo_Annotation._() : super();
+ factory GeneratedCodeInfo_Annotation() => create();
+ factory GeneratedCodeInfo_Annotation.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory GeneratedCodeInfo_Annotation.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
GeneratedCodeInfo_Annotation clone() =>
GeneratedCodeInfo_Annotation()..mergeFromMessage(this);
GeneratedCodeInfo_Annotation copyWith(
@@ -1494,8 +1541,9 @@
super.copyWith(
(message) => updates(message as GeneratedCodeInfo_Annotation));
$pb.BuilderInfo get info_ => _i;
+ @$core.pragma('dart2js:noInline')
static GeneratedCodeInfo_Annotation create() =>
- GeneratedCodeInfo_Annotation();
+ GeneratedCodeInfo_Annotation._();
GeneratedCodeInfo_Annotation createEmptyInstance() => create();
static $pb.PbList<GeneratedCodeInfo_Annotation> createRepeated() =>
$pb.PbList<GeneratedCodeInfo_Annotation>();
@@ -1537,18 +1585,20 @@
GeneratedCodeInfo_Annotation.create)
..hasRequiredFields = false;
- GeneratedCodeInfo() : super();
- GeneratedCodeInfo.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- GeneratedCodeInfo.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ GeneratedCodeInfo._() : super();
+ factory GeneratedCodeInfo() => create();
+ factory GeneratedCodeInfo.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory GeneratedCodeInfo.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
GeneratedCodeInfo clone() => GeneratedCodeInfo()..mergeFromMessage(this);
GeneratedCodeInfo copyWith(void Function(GeneratedCodeInfo) updates) =>
super.copyWith((message) => updates(message as GeneratedCodeInfo));
$pb.BuilderInfo get info_ => _i;
- static GeneratedCodeInfo create() => GeneratedCodeInfo();
+ @$core.pragma('dart2js:noInline')
+ static GeneratedCodeInfo create() => GeneratedCodeInfo._();
GeneratedCodeInfo createEmptyInstance() => create();
static $pb.PbList<GeneratedCodeInfo> createRepeated() =>
$pb.PbList<GeneratedCodeInfo>();
diff --git a/protoc_plugin/lib/src/plugin.pb.dart b/protoc_plugin/lib/src/plugin.pb.dart
index d3c9834..452d925 100644
--- a/protoc_plugin/lib/src/plugin.pb.dart
+++ b/protoc_plugin/lib/src/plugin.pb.dart
@@ -5,7 +5,7 @@
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
import 'dart:core' as $core
- show bool, Deprecated, double, int, List, Map, override, String;
+ show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
@@ -20,18 +20,20 @@
..aOS(4, 'suffix')
..hasRequiredFields = false;
- Version() : super();
- Version.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- Version.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ Version._() : super();
+ factory Version() => create();
+ factory Version.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory Version.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
Version clone() => Version()..mergeFromMessage(this);
Version copyWith(void Function(Version) updates) =>
super.copyWith((message) => updates(message as Version));
$pb.BuilderInfo get info_ => _i;
- static Version create() => Version();
+ @$core.pragma('dart2js:noInline')
+ static Version create() => Version._();
Version createEmptyInstance() => create();
static $pb.PbList<Version> createRepeated() => $pb.PbList<Version>();
static Version getDefault() => _defaultInstance ??= create()..freeze();
@@ -80,19 +82,21 @@
..pc<$0.FileDescriptorProto>(
15, 'protoFile', $pb.PbFieldType.PM, $0.FileDescriptorProto.create);
- CodeGeneratorRequest() : super();
- CodeGeneratorRequest.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- CodeGeneratorRequest.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ CodeGeneratorRequest._() : super();
+ factory CodeGeneratorRequest() => create();
+ factory CodeGeneratorRequest.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory CodeGeneratorRequest.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
CodeGeneratorRequest clone() =>
CodeGeneratorRequest()..mergeFromMessage(this);
CodeGeneratorRequest copyWith(void Function(CodeGeneratorRequest) updates) =>
super.copyWith((message) => updates(message as CodeGeneratorRequest));
$pb.BuilderInfo get info_ => _i;
- static CodeGeneratorRequest create() => CodeGeneratorRequest();
+ @$core.pragma('dart2js:noInline')
+ static CodeGeneratorRequest create() => CodeGeneratorRequest._();
CodeGeneratorRequest createEmptyInstance() => create();
static $pb.PbList<CodeGeneratorRequest> createRepeated() =>
$pb.PbList<CodeGeneratorRequest>();
@@ -130,13 +134,14 @@
..aOS(15, 'content')
..hasRequiredFields = false;
- CodeGeneratorResponse_File() : super();
- CodeGeneratorResponse_File.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- CodeGeneratorResponse_File.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ CodeGeneratorResponse_File._() : super();
+ factory CodeGeneratorResponse_File() => create();
+ factory CodeGeneratorResponse_File.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory CodeGeneratorResponse_File.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
CodeGeneratorResponse_File clone() =>
CodeGeneratorResponse_File()..mergeFromMessage(this);
CodeGeneratorResponse_File copyWith(
@@ -144,7 +149,8 @@
super.copyWith(
(message) => updates(message as CodeGeneratorResponse_File));
$pb.BuilderInfo get info_ => _i;
- static CodeGeneratorResponse_File create() => CodeGeneratorResponse_File();
+ @$core.pragma('dart2js:noInline')
+ static CodeGeneratorResponse_File create() => CodeGeneratorResponse_File._();
CodeGeneratorResponse_File createEmptyInstance() => create();
static $pb.PbList<CodeGeneratorResponse_File> createRepeated() =>
$pb.PbList<CodeGeneratorResponse_File>();
@@ -185,20 +191,22 @@
15, 'file', $pb.PbFieldType.PM, CodeGeneratorResponse_File.create)
..hasRequiredFields = false;
- CodeGeneratorResponse() : super();
- CodeGeneratorResponse.fromBuffer($core.List<$core.int> i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromBuffer(i, r);
- CodeGeneratorResponse.fromJson($core.String i,
- [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY])
- : super.fromJson(i, r);
+ CodeGeneratorResponse._() : super();
+ factory CodeGeneratorResponse() => create();
+ factory CodeGeneratorResponse.fromBuffer($core.List<$core.int> i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromBuffer(i, r);
+ factory CodeGeneratorResponse.fromJson($core.String i,
+ [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+ create()..mergeFromJson(i, r);
CodeGeneratorResponse clone() =>
CodeGeneratorResponse()..mergeFromMessage(this);
CodeGeneratorResponse copyWith(
void Function(CodeGeneratorResponse) updates) =>
super.copyWith((message) => updates(message as CodeGeneratorResponse));
$pb.BuilderInfo get info_ => _i;
- static CodeGeneratorResponse create() => CodeGeneratorResponse();
+ @$core.pragma('dart2js:noInline')
+ static CodeGeneratorResponse create() => CodeGeneratorResponse._();
CodeGeneratorResponse createEmptyInstance() => create();
static $pb.PbList<CodeGeneratorResponse> createRepeated() =>
$pb.PbList<CodeGeneratorResponse>();
diff --git a/protoc_plugin/pubspec.yaml b/protoc_plugin/pubspec.yaml
index 0622cc3..c039923 100644
--- a/protoc_plugin/pubspec.yaml
+++ b/protoc_plugin/pubspec.yaml
@@ -1,5 +1,5 @@
name: protoc_plugin
-version: 16.0.7
+version: 17.0.0
author: Dart Team <misc@dartlang.org>
description: Protoc compiler plugin to generate Dart code
homepage: https://github.com/dart-lang/protobuf
diff --git a/protoc_plugin/test/golden_file.dart b/protoc_plugin/test/golden_file.dart
index efcabb0..e122458 100644
--- a/protoc_plugin/test/golden_file.dart
+++ b/protoc_plugin/test/golden_file.dart
@@ -13,7 +13,8 @@
void expectMatchesGoldenFile(String actual, String goldenFilePath) {
File goldenFile = File(goldenFilePath);
if (goldenFile.existsSync()) {
- expect(actual, equals(goldenFile.readAsStringSync()));
+ expect(actual, equals(goldenFile.readAsStringSync()),
+ reason: 'goldenFilePath: "${goldenFilePath}"');
} else {
// This enables writing the updated file when the run in otherwise hermetic
// settings.
diff --git a/protoc_plugin/test/goldens/grpc_service.pb b/protoc_plugin/test/goldens/grpc_service.pb
index 6010b4b..cb82adc 100644
--- a/protoc_plugin/test/goldens/grpc_service.pb
+++ b/protoc_plugin/test/goldens/grpc_service.pb
@@ -4,7 +4,7 @@
///
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
@@ -13,13 +13,15 @@
..hasRequiredFields = false
;
- Empty() : super();
- Empty.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
- Empty.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+ Empty._() : super();
+ factory Empty() => create();
+ factory Empty.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+ factory Empty.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
Empty clone() => Empty()..mergeFromMessage(this);
Empty copyWith(void Function(Empty) updates) => super.copyWith((message) => updates(message as Empty));
$pb.BuilderInfo get info_ => _i;
- static Empty create() => Empty();
+ @$core.pragma('dart2js:noInline')
+ static Empty create() => Empty._();
Empty createEmptyInstance() => create();
static $pb.PbList<Empty> createRepeated() => $pb.PbList<Empty>();
static Empty getDefault() => _defaultInstance ??= create()..freeze();
diff --git a/protoc_plugin/test/goldens/header_in_package.pb b/protoc_plugin/test/goldens/header_in_package.pb
index 02c0af6..bfd1dc0 100644
--- a/protoc_plugin/test/goldens/header_in_package.pb
+++ b/protoc_plugin/test/goldens/header_in_package.pb
@@ -4,7 +4,7 @@
///
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
diff --git a/protoc_plugin/test/goldens/header_with_fixnum.pb b/protoc_plugin/test/goldens/header_with_fixnum.pb
index 87b35a7..e354c83 100644
--- a/protoc_plugin/test/goldens/header_with_fixnum.pb
+++ b/protoc_plugin/test/goldens/header_with_fixnum.pb
@@ -4,7 +4,7 @@
///
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:fixnum/fixnum.dart';
import 'package:protobuf/protobuf.dart' as $pb;
diff --git a/protoc_plugin/test/goldens/imports.pb b/protoc_plugin/test/goldens/imports.pb
index e25694a..d1994d1 100644
--- a/protoc_plugin/test/goldens/imports.pb
+++ b/protoc_plugin/test/goldens/imports.pb
@@ -4,7 +4,7 @@
///
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
@@ -19,13 +19,15 @@
..hasRequiredFields = false
;
- M() : super();
- M.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
- M.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+ M._() : super();
+ factory M() => create();
+ factory M.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+ factory M.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
M clone() => M()..mergeFromMessage(this);
M copyWith(void Function(M) updates) => super.copyWith((message) => updates(message as M));
$pb.BuilderInfo get info_ => _i;
- static M create() => M();
+ @$core.pragma('dart2js:noInline')
+ static M create() => M._();
M createEmptyInstance() => create();
static $pb.PbList<M> createRepeated() => $pb.PbList<M>();
static M getDefault() => _defaultInstance ??= create()..freeze();
diff --git a/protoc_plugin/test/goldens/messageGenerator b/protoc_plugin/test/goldens/messageGenerator
index 09186e2..8c1516a 100644
--- a/protoc_plugin/test/goldens/messageGenerator
+++ b/protoc_plugin/test/goldens/messageGenerator
@@ -6,13 +6,15 @@
..aOS(4, 'deprecatedField')
;
- PhoneNumber() : super();
- PhoneNumber.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
- PhoneNumber.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+ PhoneNumber._() : super();
+ factory PhoneNumber() => create();
+ factory PhoneNumber.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+ factory PhoneNumber.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
PhoneNumber clone() => PhoneNumber()..mergeFromMessage(this);
PhoneNumber copyWith(void Function(PhoneNumber) updates) => super.copyWith((message) => updates(message as PhoneNumber));
$pb.BuilderInfo get info_ => _i;
- static PhoneNumber create() => PhoneNumber();
+ @$core.pragma('dart2js:noInline')
+ static PhoneNumber create() => PhoneNumber._();
PhoneNumber createEmptyInstance() => create();
static $pb.PbList<PhoneNumber> createRepeated() => $pb.PbList<PhoneNumber>();
static PhoneNumber getDefault() => _defaultInstance ??= create()..freeze();
diff --git a/protoc_plugin/test/goldens/messageGenerator.meta b/protoc_plugin/test/goldens/messageGenerator.meta
index e573df9..17d9fed 100644
--- a/protoc_plugin/test/goldens/messageGenerator.meta
+++ b/protoc_plugin/test/goldens/messageGenerator.meta
@@ -18,8 +18,8 @@
path: 2
path: 1
sourceFile:
- begin: 1205
- end: 1211
+ begin: 1318
+ end: 1324
}
annotation: {
path: 4
@@ -27,8 +27,8 @@
path: 2
path: 1
sourceFile:
- begin: 1236
- end: 1242
+ begin: 1349
+ end: 1355
}
annotation: {
path: 4
@@ -36,44 +36,17 @@
path: 2
path: 1
sourceFile:
- begin: 1295
- end: 1304
-}
-annotation: {
- path: 4
- path: 0
- path: 2
- path: 1
- sourceFile:
- begin: 1327
- end: 1338
-}
-annotation: {
- path: 4
- path: 0
- path: 2
- path: 0
- sourceFile:
- begin: 1388
- end: 1392
-}
-annotation: {
- path: 4
- path: 0
- path: 2
- path: 0
- sourceFile:
- begin: 1413
+ begin: 1408
end: 1417
}
annotation: {
path: 4
path: 0
path: 2
- path: 0
+ path: 1
sourceFile:
- begin: 1476
- end: 1483
+ begin: 1440
+ end: 1451
}
annotation: {
path: 4
@@ -81,8 +54,35 @@
path: 2
path: 0
sourceFile:
- begin: 1506
- end: 1515
+ begin: 1501
+ end: 1505
+}
+annotation: {
+ path: 4
+ path: 0
+ path: 2
+ path: 0
+ sourceFile:
+ begin: 1526
+ end: 1530
+}
+annotation: {
+ path: 4
+ path: 0
+ path: 2
+ path: 0
+ sourceFile:
+ begin: 1589
+ end: 1596
+}
+annotation: {
+ path: 4
+ path: 0
+ path: 2
+ path: 0
+ sourceFile:
+ begin: 1619
+ end: 1628
}
annotation: {
path: 4
@@ -90,8 +90,8 @@
path: 2
path: 2
sourceFile:
- begin: 1556
- end: 1560
+ begin: 1669
+ end: 1673
}
annotation: {
path: 4
@@ -99,8 +99,8 @@
path: 2
path: 2
sourceFile:
- begin: 1587
- end: 1591
+ begin: 1700
+ end: 1704
}
annotation: {
path: 4
@@ -108,8 +108,8 @@
path: 2
path: 2
sourceFile:
- begin: 1644
- end: 1651
+ begin: 1757
+ end: 1764
}
annotation: {
path: 4
@@ -117,8 +117,8 @@
path: 2
path: 2
sourceFile:
- begin: 1674
- end: 1683
+ begin: 1787
+ end: 1796
}
annotation: {
path: 4
@@ -126,8 +126,8 @@
path: 2
path: 3
sourceFile:
- begin: 1773
- end: 1788
+ begin: 1886
+ end: 1901
}
annotation: {
path: 4
@@ -135,8 +135,8 @@
path: 2
path: 3
sourceFile:
- begin: 1862
- end: 1877
+ begin: 1975
+ end: 1990
}
annotation: {
path: 4
@@ -144,8 +144,8 @@
path: 2
path: 3
sourceFile:
- begin: 1979
- end: 1997
+ begin: 2092
+ end: 2110
}
annotation: {
path: 4
@@ -153,6 +153,6 @@
path: 2
path: 3
sourceFile:
- begin: 2069
- end: 2089
+ begin: 2182
+ end: 2202
}
diff --git a/protoc_plugin/test/goldens/oneMessage.pb b/protoc_plugin/test/goldens/oneMessage.pb
index 43cb7f3..388ff0e 100644
--- a/protoc_plugin/test/goldens/oneMessage.pb
+++ b/protoc_plugin/test/goldens/oneMessage.pb
@@ -4,7 +4,7 @@
///
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
@@ -15,13 +15,15 @@
..a<$core.String>(3, 'name', $pb.PbFieldType.OS, '\$')
;
- PhoneNumber() : super();
- PhoneNumber.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
- PhoneNumber.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+ PhoneNumber._() : super();
+ factory PhoneNumber() => create();
+ factory PhoneNumber.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+ factory PhoneNumber.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
PhoneNumber clone() => PhoneNumber()..mergeFromMessage(this);
PhoneNumber copyWith(void Function(PhoneNumber) updates) => super.copyWith((message) => updates(message as PhoneNumber));
$pb.BuilderInfo get info_ => _i;
- static PhoneNumber create() => PhoneNumber();
+ @$core.pragma('dart2js:noInline')
+ static PhoneNumber create() => PhoneNumber._();
PhoneNumber createEmptyInstance() => create();
static $pb.PbList<PhoneNumber> createRepeated() => $pb.PbList<PhoneNumber>();
static PhoneNumber getDefault() => _defaultInstance ??= create()..freeze();
diff --git a/protoc_plugin/test/goldens/oneMessage.pb.meta b/protoc_plugin/test/goldens/oneMessage.pb.meta
index fb67861..546cc81 100644
--- a/protoc_plugin/test/goldens/oneMessage.pb.meta
+++ b/protoc_plugin/test/goldens/oneMessage.pb.meta
@@ -2,15 +2,15 @@
path: 4
path: 0
sourceFile: test
- begin: 326
- end: 337
+ begin: 334
+ end: 345
}
annotation: {
path: 4
path: 0
sourceFile: test
- begin: 575
- end: 586
+ begin: 583
+ end: 594
}
annotation: {
path: 4
@@ -18,8 +18,8 @@
path: 2
path: 0
sourceFile: test
- begin: 1390
- end: 1396
+ begin: 1511
+ end: 1517
}
annotation: {
path: 4
@@ -27,8 +27,8 @@
path: 2
path: 0
sourceFile: test
- begin: 1421
- end: 1427
+ begin: 1542
+ end: 1548
}
annotation: {
path: 4
@@ -36,8 +36,8 @@
path: 2
path: 0
sourceFile: test
- begin: 1480
- end: 1489
+ begin: 1601
+ end: 1610
}
annotation: {
path: 4
@@ -45,8 +45,8 @@
path: 2
path: 0
sourceFile: test
- begin: 1512
- end: 1523
+ begin: 1633
+ end: 1644
}
annotation: {
path: 4
@@ -54,44 +54,35 @@
path: 2
path: 1
sourceFile: test
- begin: 1561
- end: 1565
-}
-annotation: {
- path: 4
- path: 0
- path: 2
- path: 1
- sourceFile: test
- begin: 1588
- end: 1592
-}
-annotation: {
- path: 4
- path: 0
- path: 2
- path: 1
- sourceFile: test
- begin: 1647
- end: 1654
-}
-annotation: {
- path: 4
- path: 0
- path: 2
- path: 1
- sourceFile: test
- begin: 1677
+ begin: 1682
end: 1686
}
annotation: {
path: 4
path: 0
path: 2
- path: 2
+ path: 1
sourceFile: test
- begin: 1727
- end: 1731
+ begin: 1709
+ end: 1713
+}
+annotation: {
+ path: 4
+ path: 0
+ path: 2
+ path: 1
+ sourceFile: test
+ begin: 1768
+ end: 1775
+}
+annotation: {
+ path: 4
+ path: 0
+ path: 2
+ path: 1
+ sourceFile: test
+ begin: 1798
+ end: 1807
}
annotation: {
path: 4
@@ -99,8 +90,8 @@
path: 2
path: 2
sourceFile: test
- begin: 1758
- end: 1762
+ begin: 1848
+ end: 1852
}
annotation: {
path: 4
@@ -108,8 +99,8 @@
path: 2
path: 2
sourceFile: test
- begin: 1815
- end: 1822
+ begin: 1879
+ end: 1883
}
annotation: {
path: 4
@@ -117,6 +108,15 @@
path: 2
path: 2
sourceFile: test
- begin: 1845
- end: 1854
+ begin: 1936
+ end: 1943
+}
+annotation: {
+ path: 4
+ path: 0
+ path: 2
+ path: 2
+ sourceFile: test
+ begin: 1966
+ end: 1975
}
diff --git a/protoc_plugin/test/goldens/service.pb b/protoc_plugin/test/goldens/service.pb
index e9b88c0..62db6e5 100644
--- a/protoc_plugin/test/goldens/service.pb
+++ b/protoc_plugin/test/goldens/service.pb
@@ -5,7 +5,7 @@
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
import 'dart:async' as $async;
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
import 'package:protobuf/protobuf.dart' as $pb;
@@ -14,13 +14,15 @@
..hasRequiredFields = false
;
- Empty() : super();
- Empty.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
- Empty.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
+ Empty._() : super();
+ factory Empty() => create();
+ factory Empty.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+ factory Empty.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
Empty clone() => Empty()..mergeFromMessage(this);
Empty copyWith(void Function(Empty) updates) => super.copyWith((message) => updates(message as Empty));
$pb.BuilderInfo get info_ => _i;
- static Empty create() => Empty();
+ @$core.pragma('dart2js:noInline')
+ static Empty create() => Empty._();
Empty createEmptyInstance() => create();
static $pb.PbList<Empty> createRepeated() => $pb.PbList<Empty>();
static Empty getDefault() => _defaultInstance ??= create()..freeze();
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pb b/protoc_plugin/test/goldens/topLevelEnum.pb
index e5bacde..e533ebb 100644
--- a/protoc_plugin/test/goldens/topLevelEnum.pb
+++ b/protoc_plugin/test/goldens/topLevelEnum.pb
@@ -4,7 +4,7 @@
///
// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name
-import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, String;
+import 'dart:core' as $core show bool, Deprecated, double, int, List, Map, override, pragma, String;
export 'test.pbenum.dart';
