Update the generated code to improve readability and to better follow common Dart patterns. (#1003)
diff --git a/protobuf/lib/src/protobuf/generated_message.dart b/protobuf/lib/src/protobuf/generated_message.dart index b16387e..fe87651 100644 --- a/protobuf/lib/src/protobuf/generated_message.dart +++ b/protobuf/lib/src/protobuf/generated_message.dart
@@ -575,7 +575,9 @@ /// The package name of a protobuf message. class PackageName { final String name; + const PackageName(this.name); + String get prefix => name == '' ? '' : '$name.'; }
diff --git a/protoc_plugin/CHANGELOG.md b/protoc_plugin/CHANGELOG.md index c3b2a1d..65882fb 100644 --- a/protoc_plugin/CHANGELOG.md +++ b/protoc_plugin/CHANGELOG.md
@@ -1,5 +1,7 @@ ## 22.3.0-wip +* Update the generated code to improve readability and to better follow common + Dart patterns. * No longer generate empty enum (`*.pbenum.dart`) files. * No longer generate empty server (`*.pbserver.dart`) files. * Ignore `implementation_imports` for some generated files.
diff --git a/protoc_plugin/lib/src/client_generator.dart b/protoc_plugin/lib/src/client_generator.dart index 7112e06..3b4bbfb 100644 --- a/protoc_plugin/lib/src/client_generator.dart +++ b/protoc_plugin/lib/src/client_generator.dart
@@ -53,7 +53,8 @@ '@$coreImportPrefix.Deprecated(\'This service is deprecated\')'); } out.addBlock('class ${className}Api {', '}', () { - out.println('$_clientType _client;'); + out.println('final $_clientType _client;'); + out.println(); out.println('${className}Api(this._client);'); out.println();
diff --git a/protoc_plugin/lib/src/enum_generator.dart b/protoc_plugin/lib/src/enum_generator.dart index ea26f34..c57d0e0 100644 --- a/protoc_plugin/lib/src/enum_generator.dart +++ b/protoc_plugin/lib/src/enum_generator.dart
@@ -115,10 +115,10 @@ ], () { // ----------------------------------------------------------------- // Define enum types. + final omitEnumNames = ConditionalConstDefinition('omit_enum_names'); for (var i = 0; i < _canonicalValues.length; i++) { final val = _canonicalValues[i]; final name = dartNames[val.name]!; - final omitEnumNames = ConditionalConstDefinition('omit_enum_names'); out.addSuffix( omitEnumNames.constFieldName, omitEnumNames.constDefinition); final conditionalValName = omitEnumNames.createTernary(val.name); @@ -206,7 +206,7 @@ out.println(); - out.println('const $classname._(super.v, super.n);'); + out.println('const $classname._(super.value, super.name);'); }); }
diff --git a/protoc_plugin/lib/src/file_generator.dart b/protoc_plugin/lib/src/file_generator.dart index ddca41c..258d9f9 100644 --- a/protoc_plugin/lib/src/file_generator.dart +++ b/protoc_plugin/lib/src/file_generator.dart
@@ -278,8 +278,8 @@ m.generate(out); } - // Generate code for extensions defined at top-level using a class - // name derived from the file name. + // Generate code for extensions defined at top-level using a class name + // derived from the file name. if (extensionGenerators.isNotEmpty) { // TODO(antonm): do not generate a class. final className = extensionClassName(descriptor, usedTopLevelNames); @@ -287,9 +287,8 @@ for (final x in extensionGenerators) { x.generate(out); } - out.println( - 'static void registerAllExtensions($protobufImportPrefix.ExtensionRegistry ' - 'registry) {'); + out.println('static void registerAllExtensions(' + '$protobufImportPrefix.ExtensionRegistry registry) {'); for (final x in extensionGenerators) { out.println(' registry.add(${x.name});'); } @@ -339,7 +338,11 @@ } for (final target in enumImports) { - _addImport(importWriter, config, target, '.pbenum.dart'); + // If we're already adding the main file (.pb.dart) as an import, we don't + // need to add the enums file, as that's exported from the main file. + if (!imports.contains(target)) { + _addImport(importWriter, config, target, '.pbenum.dart'); + } } importWriter.addExport(_protobufImportUrl, @@ -690,16 +693,13 @@ class ConditionalConstDefinition { final String envName; - late String _fieldName; + final String constFieldName; - ConditionalConstDefinition(this.envName) { - _fieldName = _convertToCamelCase(envName); - } - - String get constFieldName => _fieldName; + ConditionalConstDefinition(this.envName) + : constFieldName = _convertToCamelCase(envName); String get constDefinition { - return 'const $constFieldName = ' + return 'const $coreImportPrefix.bool $constFieldName = ' "$coreImportPrefix.bool.fromEnvironment(${quoted('protobuf.$envName')});"; } @@ -708,7 +708,7 @@ } // Convert foo_bar_baz to _fooBarBaz. - String _convertToCamelCase(String lowerUnderscoreCase) { + static String _convertToCamelCase(String lowerUnderscoreCase) { final parts = lowerUnderscoreCase.split('_'); final rest = parts.skip(1).map((item) { return item.substring(0, 1).toUpperCase() + item.substring(1); @@ -717,19 +717,13 @@ } } -// TODO(devoncarew): We should be able to shrink this down to just: -// annotate_overrides, camel_case_types, constant_identifier_names, and -// library_prefixes. - const _fileIgnores = { 'annotate_overrides', 'camel_case_types', 'comment_references', 'constant_identifier_names', + 'curly_braces_in_flow_control_structures', + 'deprecated_member_use_from_same_package', 'library_prefixes', 'non_constant_identifier_names', - 'prefer_final_fields', - 'unnecessary_import', - 'unnecessary_this', - 'unused_import', };
diff --git a/protoc_plugin/lib/src/gen/dart_options.pb.dart b/protoc_plugin/lib/src/gen/dart_options.pb.dart index 5487dd4..3b26594 100644 --- a/protoc_plugin/lib/src/gen/dart_options.pb.dart +++ b/protoc_plugin/lib/src/gen/dart_options.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -23,25 +24,21 @@ $core.String? importFrom, $core.String? parent, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (importFrom != null) { - $result.importFrom = importFrom; - } - if (parent != null) { - $result.parent = parent; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (importFrom != null) result.importFrom = importFrom; + if (parent != null) result.parent = parent; + return result; } - DartMixin._() : super(); - 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._(); + + factory DartMixin.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory DartMixin.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'DartMixin', @@ -58,10 +55,12 @@ DartMixin copyWith(void Function(DartMixin) updates) => super.copyWith((message) => updates(message as DartMixin)) as DartMixin; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static DartMixin create() => DartMixin._(); + @$core.override DartMixin createEmptyInstance() => create(); static $pb.PbList<DartMixin> createRepeated() => $pb.PbList<DartMixin>(); @$core.pragma('dart2js:noInline') @@ -73,10 +72,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -87,10 +83,7 @@ @$pb.TagNumber(2) $core.String get importFrom => $_getSZ(1); @$pb.TagNumber(2) - set importFrom($core.String v) { - $_setString(1, v); - } - + set importFrom($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasImportFrom() => $_has(1); @$pb.TagNumber(2) @@ -102,10 +95,7 @@ @$pb.TagNumber(3) $core.String get parent => $_getSZ(2); @$pb.TagNumber(3) - set parent($core.String v) { - $_setString(2, v); - } - + set parent($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasParent() => $_has(2); @$pb.TagNumber(3) @@ -117,19 +107,19 @@ factory Imports({ $core.Iterable<DartMixin>? mixins, }) { - final $result = create(); - if (mixins != null) { - $result.mixins.addAll(mixins); - } - return $result; + final result = create(); + if (mixins != null) result.mixins.addAll(mixins); + return result; } - Imports._() : super(); - 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._(); + + factory Imports.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Imports.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'Imports', @@ -145,10 +135,12 @@ Imports copyWith(void Function(Imports) updates) => super.copyWith((message) => updates(message as Imports)) as Imports; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Imports create() => Imports._(); + @$core.override Imports createEmptyInstance() => create(); static $pb.PbList<Imports> createRepeated() => $pb.PbList<Imports>(); @$core.pragma('dart2js:noInline') @@ -223,6 +215,7 @@ } } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/gen/google/api/client.pb.dart b/protoc_plugin/lib/src/gen/google/api/client.pb.dart index 3aa47fc..16ca1e9 100644 --- a/protoc_plugin/lib/src/gen/google/api/client.pb.dart +++ b/protoc_plugin/lib/src/gen/google/api/client.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -29,26 +30,22 @@ $core.Iterable<ClientLibraryDestination>? destinations, SelectiveGapicGeneration? selectiveGapicGeneration, }) { - final $result = create(); - if (referenceDocsUri != null) { - // ignore: deprecated_member_use_from_same_package - $result.referenceDocsUri = referenceDocsUri; - } - if (destinations != null) { - $result.destinations.addAll(destinations); - } - if (selectiveGapicGeneration != null) { - $result.selectiveGapicGeneration = selectiveGapicGeneration; - } - return $result; + final result = create(); + if (referenceDocsUri != null) result.referenceDocsUri = referenceDocsUri; + if (destinations != null) result.destinations.addAll(destinations); + if (selectiveGapicGeneration != null) + result.selectiveGapicGeneration = selectiveGapicGeneration; + return result; } - CommonLanguageSettings._() : super(); - factory CommonLanguageSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory CommonLanguageSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + CommonLanguageSettings._(); + + factory CommonLanguageSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory CommonLanguageSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'CommonLanguageSettings', @@ -75,10 +72,12 @@ super.copyWith((message) => updates(message as CommonLanguageSettings)) as CommonLanguageSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CommonLanguageSettings create() => CommonLanguageSettings._(); + @$core.override CommonLanguageSettings createEmptyInstance() => create(); static $pb.PbList<CommonLanguageSettings> createRepeated() => $pb.PbList<CommonLanguageSettings>(); @@ -94,10 +93,7 @@ $core.String get referenceDocsUri => $_getSZ(0); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(1) - set referenceDocsUri($core.String v) { - $_setString(0, v); - } - + set referenceDocsUri($core.String value) => $_setString(0, value); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(1) $core.bool hasReferenceDocsUri() => $_has(0); @@ -113,10 +109,8 @@ @$pb.TagNumber(3) SelectiveGapicGeneration get selectiveGapicGeneration => $_getN(2); @$pb.TagNumber(3) - set selectiveGapicGeneration(SelectiveGapicGeneration v) { - $_setField(3, v); - } - + set selectiveGapicGeneration(SelectiveGapicGeneration value) => + $_setField(3, value); @$pb.TagNumber(3) $core.bool hasSelectiveGapicGeneration() => $_has(2); @$pb.TagNumber(3) @@ -140,49 +134,29 @@ RubySettings? rubySettings, GoSettings? goSettings, }) { - final $result = create(); - if (version != null) { - $result.version = version; - } - if (launchStage != null) { - $result.launchStage = launchStage; - } - if (restNumericEnums != null) { - $result.restNumericEnums = restNumericEnums; - } - if (javaSettings != null) { - $result.javaSettings = javaSettings; - } - if (cppSettings != null) { - $result.cppSettings = cppSettings; - } - if (phpSettings != null) { - $result.phpSettings = phpSettings; - } - if (pythonSettings != null) { - $result.pythonSettings = pythonSettings; - } - if (nodeSettings != null) { - $result.nodeSettings = nodeSettings; - } - if (dotnetSettings != null) { - $result.dotnetSettings = dotnetSettings; - } - if (rubySettings != null) { - $result.rubySettings = rubySettings; - } - if (goSettings != null) { - $result.goSettings = goSettings; - } - return $result; + final result = create(); + if (version != null) result.version = version; + if (launchStage != null) result.launchStage = launchStage; + if (restNumericEnums != null) result.restNumericEnums = restNumericEnums; + if (javaSettings != null) result.javaSettings = javaSettings; + if (cppSettings != null) result.cppSettings = cppSettings; + if (phpSettings != null) result.phpSettings = phpSettings; + if (pythonSettings != null) result.pythonSettings = pythonSettings; + if (nodeSettings != null) result.nodeSettings = nodeSettings; + if (dotnetSettings != null) result.dotnetSettings = dotnetSettings; + if (rubySettings != null) result.rubySettings = rubySettings; + if (goSettings != null) result.goSettings = goSettings; + return result; } - ClientLibrarySettings._() : super(); - factory ClientLibrarySettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory ClientLibrarySettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + ClientLibrarySettings._(); + + factory ClientLibrarySettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory ClientLibrarySettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'ClientLibrarySettings', @@ -222,10 +196,12 @@ super.copyWith((message) => updates(message as ClientLibrarySettings)) as ClientLibrarySettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ClientLibrarySettings create() => ClientLibrarySettings._(); + @$core.override ClientLibrarySettings createEmptyInstance() => create(); static $pb.PbList<ClientLibrarySettings> createRepeated() => $pb.PbList<ClientLibrarySettings>(); @@ -240,10 +216,7 @@ @$pb.TagNumber(1) $core.String get version => $_getSZ(0); @$pb.TagNumber(1) - set version($core.String v) { - $_setString(0, v); - } - + set version($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasVersion() => $_has(0); @$pb.TagNumber(1) @@ -253,10 +226,7 @@ @$pb.TagNumber(2) $1.LaunchStage get launchStage => $_getN(1); @$pb.TagNumber(2) - set launchStage($1.LaunchStage v) { - $_setField(2, v); - } - + set launchStage($1.LaunchStage value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasLaunchStage() => $_has(1); @$pb.TagNumber(2) @@ -267,10 +237,7 @@ @$pb.TagNumber(3) $core.bool get restNumericEnums => $_getBF(2); @$pb.TagNumber(3) - set restNumericEnums($core.bool v) { - $_setBool(2, v); - } - + set restNumericEnums($core.bool value) => $_setBool(2, value); @$pb.TagNumber(3) $core.bool hasRestNumericEnums() => $_has(2); @$pb.TagNumber(3) @@ -280,10 +247,7 @@ @$pb.TagNumber(21) JavaSettings get javaSettings => $_getN(3); @$pb.TagNumber(21) - set javaSettings(JavaSettings v) { - $_setField(21, v); - } - + set javaSettings(JavaSettings value) => $_setField(21, value); @$pb.TagNumber(21) $core.bool hasJavaSettings() => $_has(3); @$pb.TagNumber(21) @@ -295,10 +259,7 @@ @$pb.TagNumber(22) CppSettings get cppSettings => $_getN(4); @$pb.TagNumber(22) - set cppSettings(CppSettings v) { - $_setField(22, v); - } - + set cppSettings(CppSettings value) => $_setField(22, value); @$pb.TagNumber(22) $core.bool hasCppSettings() => $_has(4); @$pb.TagNumber(22) @@ -310,10 +271,7 @@ @$pb.TagNumber(23) PhpSettings get phpSettings => $_getN(5); @$pb.TagNumber(23) - set phpSettings(PhpSettings v) { - $_setField(23, v); - } - + set phpSettings(PhpSettings value) => $_setField(23, value); @$pb.TagNumber(23) $core.bool hasPhpSettings() => $_has(5); @$pb.TagNumber(23) @@ -325,10 +283,7 @@ @$pb.TagNumber(24) PythonSettings get pythonSettings => $_getN(6); @$pb.TagNumber(24) - set pythonSettings(PythonSettings v) { - $_setField(24, v); - } - + set pythonSettings(PythonSettings value) => $_setField(24, value); @$pb.TagNumber(24) $core.bool hasPythonSettings() => $_has(6); @$pb.TagNumber(24) @@ -340,10 +295,7 @@ @$pb.TagNumber(25) NodeSettings get nodeSettings => $_getN(7); @$pb.TagNumber(25) - set nodeSettings(NodeSettings v) { - $_setField(25, v); - } - + set nodeSettings(NodeSettings value) => $_setField(25, value); @$pb.TagNumber(25) $core.bool hasNodeSettings() => $_has(7); @$pb.TagNumber(25) @@ -355,10 +307,7 @@ @$pb.TagNumber(26) DotnetSettings get dotnetSettings => $_getN(8); @$pb.TagNumber(26) - set dotnetSettings(DotnetSettings v) { - $_setField(26, v); - } - + set dotnetSettings(DotnetSettings value) => $_setField(26, value); @$pb.TagNumber(26) $core.bool hasDotnetSettings() => $_has(8); @$pb.TagNumber(26) @@ -370,10 +319,7 @@ @$pb.TagNumber(27) RubySettings get rubySettings => $_getN(9); @$pb.TagNumber(27) - set rubySettings(RubySettings v) { - $_setField(27, v); - } - + set rubySettings(RubySettings value) => $_setField(27, value); @$pb.TagNumber(27) $core.bool hasRubySettings() => $_has(9); @$pb.TagNumber(27) @@ -385,10 +331,7 @@ @$pb.TagNumber(28) GoSettings get goSettings => $_getN(10); @$pb.TagNumber(28) - set goSettings(GoSettings v) { - $_setField(28, v); - } - + set goSettings(GoSettings value) => $_setField(28, value); @$pb.TagNumber(28) $core.bool hasGoSettings() => $_has(10); @$pb.TagNumber(28) @@ -414,49 +357,32 @@ $core.String? protoReferenceDocumentationUri, $core.String? restReferenceDocumentationUri, }) { - final $result = create(); - if (methodSettings != null) { - $result.methodSettings.addAll(methodSettings); - } - if (newIssueUri != null) { - $result.newIssueUri = newIssueUri; - } - if (documentationUri != null) { - $result.documentationUri = documentationUri; - } - if (apiShortName != null) { - $result.apiShortName = apiShortName; - } - if (githubLabel != null) { - $result.githubLabel = githubLabel; - } - if (codeownerGithubTeams != null) { - $result.codeownerGithubTeams.addAll(codeownerGithubTeams); - } - if (docTagPrefix != null) { - $result.docTagPrefix = docTagPrefix; - } - if (organization != null) { - $result.organization = organization; - } - if (librarySettings != null) { - $result.librarySettings.addAll(librarySettings); - } - if (protoReferenceDocumentationUri != null) { - $result.protoReferenceDocumentationUri = protoReferenceDocumentationUri; - } - if (restReferenceDocumentationUri != null) { - $result.restReferenceDocumentationUri = restReferenceDocumentationUri; - } - return $result; + final result = create(); + if (methodSettings != null) result.methodSettings.addAll(methodSettings); + if (newIssueUri != null) result.newIssueUri = newIssueUri; + if (documentationUri != null) result.documentationUri = documentationUri; + if (apiShortName != null) result.apiShortName = apiShortName; + if (githubLabel != null) result.githubLabel = githubLabel; + if (codeownerGithubTeams != null) + result.codeownerGithubTeams.addAll(codeownerGithubTeams); + if (docTagPrefix != null) result.docTagPrefix = docTagPrefix; + if (organization != null) result.organization = organization; + if (librarySettings != null) result.librarySettings.addAll(librarySettings); + if (protoReferenceDocumentationUri != null) + result.protoReferenceDocumentationUri = protoReferenceDocumentationUri; + if (restReferenceDocumentationUri != null) + result.restReferenceDocumentationUri = restReferenceDocumentationUri; + return result; } - Publishing._() : super(); - factory Publishing.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Publishing.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + Publishing._(); + + factory Publishing.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Publishing.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'Publishing', @@ -490,10 +416,12 @@ Publishing copyWith(void Function(Publishing) updates) => super.copyWith((message) => updates(message as Publishing)) as Publishing; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Publishing create() => Publishing._(); + @$core.override Publishing createEmptyInstance() => create(); static $pb.PbList<Publishing> createRepeated() => $pb.PbList<Publishing>(); @$core.pragma('dart2js:noInline') @@ -511,10 +439,7 @@ @$pb.TagNumber(101) $core.String get newIssueUri => $_getSZ(1); @$pb.TagNumber(101) - set newIssueUri($core.String v) { - $_setString(1, v); - } - + set newIssueUri($core.String value) => $_setString(1, value); @$pb.TagNumber(101) $core.bool hasNewIssueUri() => $_has(1); @$pb.TagNumber(101) @@ -525,10 +450,7 @@ @$pb.TagNumber(102) $core.String get documentationUri => $_getSZ(2); @$pb.TagNumber(102) - set documentationUri($core.String v) { - $_setString(2, v); - } - + set documentationUri($core.String value) => $_setString(2, value); @$pb.TagNumber(102) $core.bool hasDocumentationUri() => $_has(2); @$pb.TagNumber(102) @@ -540,10 +462,7 @@ @$pb.TagNumber(103) $core.String get apiShortName => $_getSZ(3); @$pb.TagNumber(103) - set apiShortName($core.String v) { - $_setString(3, v); - } - + set apiShortName($core.String value) => $_setString(3, value); @$pb.TagNumber(103) $core.bool hasApiShortName() => $_has(3); @$pb.TagNumber(103) @@ -553,10 +472,7 @@ @$pb.TagNumber(104) $core.String get githubLabel => $_getSZ(4); @$pb.TagNumber(104) - set githubLabel($core.String v) { - $_setString(4, v); - } - + set githubLabel($core.String value) => $_setString(4, value); @$pb.TagNumber(104) $core.bool hasGithubLabel() => $_has(4); @$pb.TagNumber(104) @@ -572,10 +488,7 @@ @$pb.TagNumber(106) $core.String get docTagPrefix => $_getSZ(6); @$pb.TagNumber(106) - set docTagPrefix($core.String v) { - $_setString(6, v); - } - + set docTagPrefix($core.String value) => $_setString(6, value); @$pb.TagNumber(106) $core.bool hasDocTagPrefix() => $_has(6); @$pb.TagNumber(106) @@ -585,10 +498,7 @@ @$pb.TagNumber(107) ClientLibraryOrganization get organization => $_getN(7); @$pb.TagNumber(107) - set organization(ClientLibraryOrganization v) { - $_setField(107, v); - } - + set organization(ClientLibraryOrganization value) => $_setField(107, value); @$pb.TagNumber(107) $core.bool hasOrganization() => $_has(7); @$pb.TagNumber(107) @@ -605,10 +515,8 @@ @$pb.TagNumber(110) $core.String get protoReferenceDocumentationUri => $_getSZ(9); @$pb.TagNumber(110) - set protoReferenceDocumentationUri($core.String v) { - $_setString(9, v); - } - + set protoReferenceDocumentationUri($core.String value) => + $_setString(9, value); @$pb.TagNumber(110) $core.bool hasProtoReferenceDocumentationUri() => $_has(9); @$pb.TagNumber(110) @@ -619,10 +527,8 @@ @$pb.TagNumber(111) $core.String get restReferenceDocumentationUri => $_getSZ(10); @$pb.TagNumber(111) - set restReferenceDocumentationUri($core.String v) { - $_setString(10, v); - } - + set restReferenceDocumentationUri($core.String value) => + $_setString(10, value); @$pb.TagNumber(111) $core.bool hasRestReferenceDocumentationUri() => $_has(10); @$pb.TagNumber(111) @@ -637,25 +543,22 @@ serviceClassNames, CommonLanguageSettings? common, }) { - final $result = create(); - if (libraryPackage != null) { - $result.libraryPackage = libraryPackage; - } - if (serviceClassNames != null) { - $result.serviceClassNames.addEntries(serviceClassNames); - } - if (common != null) { - $result.common = common; - } - return $result; + final result = create(); + if (libraryPackage != null) result.libraryPackage = libraryPackage; + if (serviceClassNames != null) + result.serviceClassNames.addEntries(serviceClassNames); + if (common != null) result.common = common; + return result; } - JavaSettings._() : super(); - factory JavaSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory JavaSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + JavaSettings._(); + + factory JavaSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory JavaSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'JavaSettings', @@ -679,10 +582,12 @@ super.copyWith((message) => updates(message as JavaSettings)) as JavaSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static JavaSettings create() => JavaSettings._(); + @$core.override JavaSettings createEmptyInstance() => create(); static $pb.PbList<JavaSettings> createRepeated() => $pb.PbList<JavaSettings>(); @@ -705,10 +610,7 @@ @$pb.TagNumber(1) $core.String get libraryPackage => $_getSZ(0); @$pb.TagNumber(1) - set libraryPackage($core.String v) { - $_setString(0, v); - } - + set libraryPackage($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasLibraryPackage() => $_has(0); @$pb.TagNumber(1) @@ -735,10 +637,7 @@ @$pb.TagNumber(3) CommonLanguageSettings get common => $_getN(2); @$pb.TagNumber(3) - set common(CommonLanguageSettings v) { - $_setField(3, v); - } - + set common(CommonLanguageSettings value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasCommon() => $_has(2); @$pb.TagNumber(3) @@ -752,19 +651,19 @@ factory CppSettings({ CommonLanguageSettings? common, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - return $result; + final result = create(); + if (common != null) result.common = common; + return result; } - CppSettings._() : super(); - factory CppSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory CppSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + CppSettings._(); + + factory CppSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory CppSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'CppSettings', @@ -781,10 +680,12 @@ super.copyWith((message) => updates(message as CppSettings)) as CppSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CppSettings create() => CppSettings._(); + @$core.override CppSettings createEmptyInstance() => create(); static $pb.PbList<CppSettings> createRepeated() => $pb.PbList<CppSettings>(); @$core.pragma('dart2js:noInline') @@ -796,10 +697,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -813,19 +711,19 @@ factory PhpSettings({ CommonLanguageSettings? common, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - return $result; + final result = create(); + if (common != null) result.common = common; + return result; } - PhpSettings._() : super(); - factory PhpSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory PhpSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + PhpSettings._(); + + factory PhpSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory PhpSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'PhpSettings', @@ -842,10 +740,12 @@ super.copyWith((message) => updates(message as PhpSettings)) as PhpSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PhpSettings create() => PhpSettings._(); + @$core.override PhpSettings createEmptyInstance() => create(); static $pb.PbList<PhpSettings> createRepeated() => $pb.PbList<PhpSettings>(); @$core.pragma('dart2js:noInline') @@ -857,10 +757,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -878,26 +775,25 @@ $core.bool? protobufPythonicTypesEnabled, $core.bool? unversionedPackageDisabled, }) { - final $result = create(); - if (restAsyncIoEnabled != null) { - $result.restAsyncIoEnabled = restAsyncIoEnabled; - } - if (protobufPythonicTypesEnabled != null) { - $result.protobufPythonicTypesEnabled = protobufPythonicTypesEnabled; - } - if (unversionedPackageDisabled != null) { - $result.unversionedPackageDisabled = unversionedPackageDisabled; - } - return $result; + final result = create(); + if (restAsyncIoEnabled != null) + result.restAsyncIoEnabled = restAsyncIoEnabled; + if (protobufPythonicTypesEnabled != null) + result.protobufPythonicTypesEnabled = protobufPythonicTypesEnabled; + if (unversionedPackageDisabled != null) + result.unversionedPackageDisabled = unversionedPackageDisabled; + return result; } - PythonSettings_ExperimentalFeatures._() : super(); + + PythonSettings_ExperimentalFeatures._(); + factory PythonSettings_ExperimentalFeatures.fromBuffer( - $core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory PythonSettings_ExperimentalFeatures.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + $core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory PythonSettings_ExperimentalFeatures.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'PythonSettings.ExperimentalFeatures', @@ -918,11 +814,13 @@ updates(message as PythonSettings_ExperimentalFeatures)) as PythonSettings_ExperimentalFeatures; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PythonSettings_ExperimentalFeatures create() => PythonSettings_ExperimentalFeatures._(); + @$core.override PythonSettings_ExperimentalFeatures createEmptyInstance() => create(); static $pb.PbList<PythonSettings_ExperimentalFeatures> createRepeated() => $pb.PbList<PythonSettings_ExperimentalFeatures>(); @@ -939,10 +837,7 @@ @$pb.TagNumber(1) $core.bool get restAsyncIoEnabled => $_getBF(0); @$pb.TagNumber(1) - set restAsyncIoEnabled($core.bool v) { - $_setBool(0, v); - } - + set restAsyncIoEnabled($core.bool value) => $_setBool(0, value); @$pb.TagNumber(1) $core.bool hasRestAsyncIoEnabled() => $_has(0); @$pb.TagNumber(1) @@ -955,10 +850,7 @@ @$pb.TagNumber(2) $core.bool get protobufPythonicTypesEnabled => $_getBF(1); @$pb.TagNumber(2) - set protobufPythonicTypesEnabled($core.bool v) { - $_setBool(1, v); - } - + set protobufPythonicTypesEnabled($core.bool value) => $_setBool(1, value); @$pb.TagNumber(2) $core.bool hasProtobufPythonicTypesEnabled() => $_has(1); @$pb.TagNumber(2) @@ -971,10 +863,7 @@ @$pb.TagNumber(3) $core.bool get unversionedPackageDisabled => $_getBF(2); @$pb.TagNumber(3) - set unversionedPackageDisabled($core.bool v) { - $_setBool(2, v); - } - + set unversionedPackageDisabled($core.bool value) => $_setBool(2, value); @$pb.TagNumber(3) $core.bool hasUnversionedPackageDisabled() => $_has(2); @$pb.TagNumber(3) @@ -987,22 +876,21 @@ CommonLanguageSettings? common, PythonSettings_ExperimentalFeatures? experimentalFeatures, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - if (experimentalFeatures != null) { - $result.experimentalFeatures = experimentalFeatures; - } - return $result; + final result = create(); + if (common != null) result.common = common; + if (experimentalFeatures != null) + result.experimentalFeatures = experimentalFeatures; + return result; } - PythonSettings._() : super(); - factory PythonSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory PythonSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + PythonSettings._(); + + factory PythonSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory PythonSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'PythonSettings', @@ -1022,10 +910,12 @@ super.copyWith((message) => updates(message as PythonSettings)) as PythonSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PythonSettings create() => PythonSettings._(); + @$core.override PythonSettings createEmptyInstance() => create(); static $pb.PbList<PythonSettings> createRepeated() => $pb.PbList<PythonSettings>(); @@ -1038,10 +928,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -1053,10 +940,8 @@ @$pb.TagNumber(2) PythonSettings_ExperimentalFeatures get experimentalFeatures => $_getN(1); @$pb.TagNumber(2) - set experimentalFeatures(PythonSettings_ExperimentalFeatures v) { - $_setField(2, v); - } - + set experimentalFeatures(PythonSettings_ExperimentalFeatures value) => + $_setField(2, value); @$pb.TagNumber(2) $core.bool hasExperimentalFeatures() => $_has(1); @$pb.TagNumber(2) @@ -1071,19 +956,19 @@ factory NodeSettings({ CommonLanguageSettings? common, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - return $result; + final result = create(); + if (common != null) result.common = common; + return result; } - NodeSettings._() : super(); - factory NodeSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory NodeSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + NodeSettings._(); + + factory NodeSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory NodeSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'NodeSettings', @@ -1100,10 +985,12 @@ super.copyWith((message) => updates(message as NodeSettings)) as NodeSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static NodeSettings create() => NodeSettings._(); + @$core.override NodeSettings createEmptyInstance() => create(); static $pb.PbList<NodeSettings> createRepeated() => $pb.PbList<NodeSettings>(); @@ -1116,10 +1003,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -1139,34 +1023,29 @@ $core.Iterable<$core.String>? forcedNamespaceAliases, $core.Iterable<$core.String>? handwrittenSignatures, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - if (renamedServices != null) { - $result.renamedServices.addEntries(renamedServices); - } - if (renamedResources != null) { - $result.renamedResources.addEntries(renamedResources); - } - if (ignoredResources != null) { - $result.ignoredResources.addAll(ignoredResources); - } - if (forcedNamespaceAliases != null) { - $result.forcedNamespaceAliases.addAll(forcedNamespaceAliases); - } - if (handwrittenSignatures != null) { - $result.handwrittenSignatures.addAll(handwrittenSignatures); - } - return $result; + final result = create(); + if (common != null) result.common = common; + if (renamedServices != null) + result.renamedServices.addEntries(renamedServices); + if (renamedResources != null) + result.renamedResources.addEntries(renamedResources); + if (ignoredResources != null) + result.ignoredResources.addAll(ignoredResources); + if (forcedNamespaceAliases != null) + result.forcedNamespaceAliases.addAll(forcedNamespaceAliases); + if (handwrittenSignatures != null) + result.handwrittenSignatures.addAll(handwrittenSignatures); + return result; } - DotnetSettings._() : super(); - factory DotnetSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory DotnetSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + DotnetSettings._(); + + factory DotnetSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory DotnetSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'DotnetSettings', @@ -1197,10 +1076,12 @@ super.copyWith((message) => updates(message as DotnetSettings)) as DotnetSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static DotnetSettings create() => DotnetSettings._(); + @$core.override DotnetSettings createEmptyInstance() => create(); static $pb.PbList<DotnetSettings> createRepeated() => $pb.PbList<DotnetSettings>(); @@ -1213,10 +1094,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -1265,19 +1143,19 @@ factory RubySettings({ CommonLanguageSettings? common, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - return $result; + final result = create(); + if (common != null) result.common = common; + return result; } - RubySettings._() : super(); - factory RubySettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory RubySettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + RubySettings._(); + + factory RubySettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory RubySettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'RubySettings', @@ -1294,10 +1172,12 @@ super.copyWith((message) => updates(message as RubySettings)) as RubySettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static RubySettings create() => RubySettings._(); + @$core.override RubySettings createEmptyInstance() => create(); static $pb.PbList<RubySettings> createRepeated() => $pb.PbList<RubySettings>(); @@ -1310,10 +1190,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -1328,22 +1205,21 @@ CommonLanguageSettings? common, $core.Iterable<$core.MapEntry<$core.String, $core.String>>? renamedServices, }) { - final $result = create(); - if (common != null) { - $result.common = common; - } - if (renamedServices != null) { - $result.renamedServices.addEntries(renamedServices); - } - return $result; + final result = create(); + if (common != null) result.common = common; + if (renamedServices != null) + result.renamedServices.addEntries(renamedServices); + return result; } - GoSettings._() : super(); - factory GoSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory GoSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + GoSettings._(); + + factory GoSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory GoSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'GoSettings', @@ -1364,10 +1240,12 @@ GoSettings copyWith(void Function(GoSettings) updates) => super.copyWith((message) => updates(message as GoSettings)) as GoSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static GoSettings create() => GoSettings._(); + @$core.override GoSettings createEmptyInstance() => create(); static $pb.PbList<GoSettings> createRepeated() => $pb.PbList<GoSettings>(); @$core.pragma('dart2js:noInline') @@ -1379,10 +1257,7 @@ @$pb.TagNumber(1) CommonLanguageSettings get common => $_getN(0); @$pb.TagNumber(1) - set common(CommonLanguageSettings v) { - $_setField(1, v); - } - + set common(CommonLanguageSettings value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCommon() => $_has(0); @$pb.TagNumber(1) @@ -1414,28 +1289,23 @@ $0.Duration? maxPollDelay, $0.Duration? totalPollTimeout, }) { - final $result = create(); - if (initialPollDelay != null) { - $result.initialPollDelay = initialPollDelay; - } - if (pollDelayMultiplier != null) { - $result.pollDelayMultiplier = pollDelayMultiplier; - } - if (maxPollDelay != null) { - $result.maxPollDelay = maxPollDelay; - } - if (totalPollTimeout != null) { - $result.totalPollTimeout = totalPollTimeout; - } - return $result; + final result = create(); + if (initialPollDelay != null) result.initialPollDelay = initialPollDelay; + if (pollDelayMultiplier != null) + result.pollDelayMultiplier = pollDelayMultiplier; + if (maxPollDelay != null) result.maxPollDelay = maxPollDelay; + if (totalPollTimeout != null) result.totalPollTimeout = totalPollTimeout; + return result; } - MethodSettings_LongRunning._() : super(); - factory MethodSettings_LongRunning.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MethodSettings_LongRunning.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + MethodSettings_LongRunning._(); + + factory MethodSettings_LongRunning.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory MethodSettings_LongRunning.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'MethodSettings.LongRunning', @@ -1461,10 +1331,12 @@ (message) => updates(message as MethodSettings_LongRunning)) as MethodSettings_LongRunning; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MethodSettings_LongRunning create() => MethodSettings_LongRunning._(); + @$core.override MethodSettings_LongRunning createEmptyInstance() => create(); static $pb.PbList<MethodSettings_LongRunning> createRepeated() => $pb.PbList<MethodSettings_LongRunning>(); @@ -1478,10 +1350,7 @@ @$pb.TagNumber(1) $0.Duration get initialPollDelay => $_getN(0); @$pb.TagNumber(1) - set initialPollDelay($0.Duration v) { - $_setField(1, v); - } - + set initialPollDelay($0.Duration value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasInitialPollDelay() => $_has(0); @$pb.TagNumber(1) @@ -1495,10 +1364,7 @@ @$pb.TagNumber(2) $core.double get pollDelayMultiplier => $_getN(1); @$pb.TagNumber(2) - set pollDelayMultiplier($core.double v) { - $_setFloat(1, v); - } - + set pollDelayMultiplier($core.double value) => $_setFloat(1, value); @$pb.TagNumber(2) $core.bool hasPollDelayMultiplier() => $_has(1); @$pb.TagNumber(2) @@ -1509,10 +1375,7 @@ @$pb.TagNumber(3) $0.Duration get maxPollDelay => $_getN(2); @$pb.TagNumber(3) - set maxPollDelay($0.Duration v) { - $_setField(3, v); - } - + set maxPollDelay($0.Duration value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasMaxPollDelay() => $_has(2); @$pb.TagNumber(3) @@ -1525,10 +1388,7 @@ @$pb.TagNumber(4) $0.Duration get totalPollTimeout => $_getN(3); @$pb.TagNumber(4) - set totalPollTimeout($0.Duration v) { - $_setField(4, v); - } - + set totalPollTimeout($0.Duration value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasTotalPollTimeout() => $_has(3); @$pb.TagNumber(4) @@ -1544,25 +1404,22 @@ MethodSettings_LongRunning? longRunning, $core.Iterable<$core.String>? autoPopulatedFields, }) { - final $result = create(); - if (selector != null) { - $result.selector = selector; - } - if (longRunning != null) { - $result.longRunning = longRunning; - } - if (autoPopulatedFields != null) { - $result.autoPopulatedFields.addAll(autoPopulatedFields); - } - return $result; + final result = create(); + if (selector != null) result.selector = selector; + if (longRunning != null) result.longRunning = longRunning; + if (autoPopulatedFields != null) + result.autoPopulatedFields.addAll(autoPopulatedFields); + return result; } - MethodSettings._() : super(); - factory MethodSettings.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MethodSettings.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + MethodSettings._(); + + factory MethodSettings.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory MethodSettings.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'MethodSettings', @@ -1581,10 +1438,12 @@ super.copyWith((message) => updates(message as MethodSettings)) as MethodSettings; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MethodSettings create() => MethodSettings._(); + @$core.override MethodSettings createEmptyInstance() => create(); static $pb.PbList<MethodSettings> createRepeated() => $pb.PbList<MethodSettings>(); @@ -1605,10 +1464,7 @@ @$pb.TagNumber(1) $core.String get selector => $_getSZ(0); @$pb.TagNumber(1) - set selector($core.String v) { - $_setString(0, v); - } - + set selector($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasSelector() => $_has(0); @$pb.TagNumber(1) @@ -1631,10 +1487,7 @@ @$pb.TagNumber(2) MethodSettings_LongRunning get longRunning => $_getN(1); @$pb.TagNumber(2) - set longRunning(MethodSettings_LongRunning v) { - $_setField(2, v); - } - + set longRunning(MethodSettings_LongRunning value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasLongRunning() => $_has(1); @$pb.TagNumber(2) @@ -1664,22 +1517,21 @@ $core.Iterable<$core.String>? methods, $core.bool? generateOmittedAsInternal, }) { - final $result = create(); - if (methods != null) { - $result.methods.addAll(methods); - } - if (generateOmittedAsInternal != null) { - $result.generateOmittedAsInternal = generateOmittedAsInternal; - } - return $result; + final result = create(); + if (methods != null) result.methods.addAll(methods); + if (generateOmittedAsInternal != null) + result.generateOmittedAsInternal = generateOmittedAsInternal; + return result; } - SelectiveGapicGeneration._() : super(); - factory SelectiveGapicGeneration.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory SelectiveGapicGeneration.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + SelectiveGapicGeneration._(); + + factory SelectiveGapicGeneration.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory SelectiveGapicGeneration.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'SelectiveGapicGeneration', @@ -1698,10 +1550,12 @@ super.copyWith((message) => updates(message as SelectiveGapicGeneration)) as SelectiveGapicGeneration; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static SelectiveGapicGeneration create() => SelectiveGapicGeneration._(); + @$core.override SelectiveGapicGeneration createEmptyInstance() => create(); static $pb.PbList<SelectiveGapicGeneration> createRepeated() => $pb.PbList<SelectiveGapicGeneration>(); @@ -1724,10 +1578,7 @@ @$pb.TagNumber(2) $core.bool get generateOmittedAsInternal => $_getBF(1); @$pb.TagNumber(2) - set generateOmittedAsInternal($core.bool v) { - $_setBool(1, v); - } - + set generateOmittedAsInternal($core.bool value) => $_setBool(1, value); @$pb.TagNumber(2) $core.bool hasGenerateOmittedAsInternal() => $_has(1); @$pb.TagNumber(2) @@ -1764,6 +1615,7 @@ } } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart index 97f4568..48c8eeb 100644 --- a/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart +++ b/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -66,7 +67,7 @@ static ClientLibraryOrganization? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const ClientLibraryOrganization._(super.v, super.n); + const ClientLibraryOrganization._(super.value, super.name); } /// To where should client libraries be published? @@ -97,7 +98,8 @@ $pb.ProtobufEnum.initByValue(values); static ClientLibraryDestination? valueOf($core.int value) => _byValue[value]; - const ClientLibraryDestination._(super.v, super.n); + const ClientLibraryDestination._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = + $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/lib/src/gen/google/api/http.pb.dart b/protoc_plugin/lib/src/gen/google/api/http.pb.dart index ca989fa..979b62f 100644 --- a/protoc_plugin/lib/src/gen/google/api/http.pb.dart +++ b/protoc_plugin/lib/src/gen/google/api/http.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -23,22 +24,21 @@ $core.Iterable<HttpRule>? rules, $core.bool? fullyDecodeReservedExpansion, }) { - final $result = create(); - if (rules != null) { - $result.rules.addAll(rules); - } - if (fullyDecodeReservedExpansion != null) { - $result.fullyDecodeReservedExpansion = fullyDecodeReservedExpansion; - } - return $result; + final result = create(); + if (rules != null) result.rules.addAll(rules); + if (fullyDecodeReservedExpansion != null) + result.fullyDecodeReservedExpansion = fullyDecodeReservedExpansion; + return result; } - Http._() : super(); - factory Http.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Http.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + Http._(); + + factory Http.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Http.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'Http', @@ -55,10 +55,12 @@ Http copyWith(void Function(Http) updates) => super.copyWith((message) => updates(message as Http)) as Http; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Http create() => Http._(); + @$core.override Http createEmptyInstance() => create(); static $pb.PbList<Http> createRepeated() => $pb.PbList<Http>(); @$core.pragma('dart2js:noInline') @@ -81,10 +83,7 @@ @$pb.TagNumber(2) $core.bool get fullyDecodeReservedExpansion => $_getBF(1); @$pb.TagNumber(2) - set fullyDecodeReservedExpansion($core.bool v) { - $_setBool(1, v); - } - + set fullyDecodeReservedExpansion($core.bool value) => $_setBool(1, value); @$pb.TagNumber(2) $core.bool hasFullyDecodeReservedExpansion() => $_has(1); @$pb.TagNumber(2) @@ -370,46 +369,29 @@ $core.Iterable<HttpRule>? additionalBindings, $core.String? responseBody, }) { - final $result = create(); - if (selector != null) { - $result.selector = selector; - } - if (get != null) { - $result.get = get; - } - if (put != null) { - $result.put = put; - } - if (post != null) { - $result.post = post; - } - if (delete != null) { - $result.delete = delete; - } - if (patch != null) { - $result.patch = patch; - } - if (body != null) { - $result.body = body; - } - if (custom != null) { - $result.custom = custom; - } - if (additionalBindings != null) { - $result.additionalBindings.addAll(additionalBindings); - } - if (responseBody != null) { - $result.responseBody = responseBody; - } - return $result; + final result = create(); + if (selector != null) result.selector = selector; + if (get != null) result.get = get; + if (put != null) result.put = put; + if (post != null) result.post = post; + if (delete != null) result.delete = delete; + if (patch != null) result.patch = patch; + if (body != null) result.body = body; + if (custom != null) result.custom = custom; + if (additionalBindings != null) + result.additionalBindings.addAll(additionalBindings); + if (responseBody != null) result.responseBody = responseBody; + return result; } - HttpRule._() : super(); - factory HttpRule.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory HttpRule.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + HttpRule._(); + + factory HttpRule.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory HttpRule.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static const $core.Map<$core.int, HttpRule_Pattern> _HttpRule_PatternByTag = { 2: HttpRule_Pattern.get, @@ -446,10 +428,12 @@ HttpRule copyWith(void Function(HttpRule) updates) => super.copyWith((message) => updates(message as HttpRule)) as HttpRule; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HttpRule create() => HttpRule._(); + @$core.override HttpRule createEmptyInstance() => create(); static $pb.PbList<HttpRule> createRepeated() => $pb.PbList<HttpRule>(); @$core.pragma('dart2js:noInline') @@ -467,10 +451,7 @@ @$pb.TagNumber(1) $core.String get selector => $_getSZ(0); @$pb.TagNumber(1) - set selector($core.String v) { - $_setString(0, v); - } - + set selector($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasSelector() => $_has(0); @$pb.TagNumber(1) @@ -481,10 +462,7 @@ @$pb.TagNumber(2) $core.String get get => $_getSZ(1); @$pb.TagNumber(2) - set get($core.String v) { - $_setString(1, v); - } - + set get($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasGet() => $_has(1); @$pb.TagNumber(2) @@ -494,10 +472,7 @@ @$pb.TagNumber(3) $core.String get put => $_getSZ(2); @$pb.TagNumber(3) - set put($core.String v) { - $_setString(2, v); - } - + set put($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasPut() => $_has(2); @$pb.TagNumber(3) @@ -507,10 +482,7 @@ @$pb.TagNumber(4) $core.String get post => $_getSZ(3); @$pb.TagNumber(4) - set post($core.String v) { - $_setString(3, v); - } - + set post($core.String value) => $_setString(3, value); @$pb.TagNumber(4) $core.bool hasPost() => $_has(3); @$pb.TagNumber(4) @@ -520,10 +492,7 @@ @$pb.TagNumber(5) $core.String get delete => $_getSZ(4); @$pb.TagNumber(5) - set delete($core.String v) { - $_setString(4, v); - } - + set delete($core.String value) => $_setString(4, value); @$pb.TagNumber(5) $core.bool hasDelete() => $_has(4); @$pb.TagNumber(5) @@ -533,10 +502,7 @@ @$pb.TagNumber(6) $core.String get patch => $_getSZ(5); @$pb.TagNumber(6) - set patch($core.String v) { - $_setString(5, v); - } - + set patch($core.String value) => $_setString(5, value); @$pb.TagNumber(6) $core.bool hasPatch() => $_has(5); @$pb.TagNumber(6) @@ -551,10 +517,7 @@ @$pb.TagNumber(7) $core.String get body => $_getSZ(6); @$pb.TagNumber(7) - set body($core.String v) { - $_setString(6, v); - } - + set body($core.String value) => $_setString(6, value); @$pb.TagNumber(7) $core.bool hasBody() => $_has(6); @$pb.TagNumber(7) @@ -567,10 +530,7 @@ @$pb.TagNumber(8) CustomHttpPattern get custom => $_getN(7); @$pb.TagNumber(8) - set custom(CustomHttpPattern v) { - $_setField(8, v); - } - + set custom(CustomHttpPattern value) => $_setField(8, value); @$pb.TagNumber(8) $core.bool hasCustom() => $_has(7); @$pb.TagNumber(8) @@ -593,10 +553,7 @@ @$pb.TagNumber(12) $core.String get responseBody => $_getSZ(9); @$pb.TagNumber(12) - set responseBody($core.String v) { - $_setString(9, v); - } - + set responseBody($core.String value) => $_setString(9, value); @$pb.TagNumber(12) $core.bool hasResponseBody() => $_has(9); @$pb.TagNumber(12) @@ -609,22 +566,20 @@ $core.String? kind, $core.String? path, }) { - final $result = create(); - if (kind != null) { - $result.kind = kind; - } - if (path != null) { - $result.path = path; - } - return $result; + final result = create(); + if (kind != null) result.kind = kind; + if (path != null) result.path = path; + return result; } - CustomHttpPattern._() : super(); - factory CustomHttpPattern.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory CustomHttpPattern.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + CustomHttpPattern._(); + + factory CustomHttpPattern.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory CustomHttpPattern.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'CustomHttpPattern', @@ -641,10 +596,12 @@ super.copyWith((message) => updates(message as CustomHttpPattern)) as CustomHttpPattern; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CustomHttpPattern create() => CustomHttpPattern._(); + @$core.override CustomHttpPattern createEmptyInstance() => create(); static $pb.PbList<CustomHttpPattern> createRepeated() => $pb.PbList<CustomHttpPattern>(); @@ -657,10 +614,7 @@ @$pb.TagNumber(1) $core.String get kind => $_getSZ(0); @$pb.TagNumber(1) - set kind($core.String v) { - $_setString(0, v); - } - + set kind($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasKind() => $_has(0); @$pb.TagNumber(1) @@ -670,16 +624,14 @@ @$pb.TagNumber(2) $core.String get path => $_getSZ(1); @$pb.TagNumber(2) - set path($core.String v) { - $_setString(1, v); - } - + set path($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasPath() => $_has(1); @$pb.TagNumber(2) void clearPath() => $_clearField(2); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart b/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart index 4373372..fe9d66f 100644 --- a/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart +++ b/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core;
diff --git a/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart index 1cb6b62..35b891f 100644 --- a/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart +++ b/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -84,7 +85,8 @@ static LaunchStage? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const LaunchStage._(super.v, super.n); + const LaunchStage._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = + $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/lib/src/gen/google/api/routing.pb.dart b/protoc_plugin/lib/src/gen/google/api/routing.pb.dart index 5ce422e..38a6218 100644 --- a/protoc_plugin/lib/src/gen/google/api/routing.pb.dart +++ b/protoc_plugin/lib/src/gen/google/api/routing.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -378,19 +379,20 @@ factory RoutingRule({ $core.Iterable<RoutingParameter>? routingParameters, }) { - final $result = create(); - if (routingParameters != null) { - $result.routingParameters.addAll(routingParameters); - } - return $result; + final result = create(); + if (routingParameters != null) + result.routingParameters.addAll(routingParameters); + return result; } - RoutingRule._() : super(); - factory RoutingRule.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory RoutingRule.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + RoutingRule._(); + + factory RoutingRule.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory RoutingRule.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'RoutingRule', @@ -408,10 +410,12 @@ super.copyWith((message) => updates(message as RoutingRule)) as RoutingRule; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static RoutingRule create() => RoutingRule._(); + @$core.override RoutingRule createEmptyInstance() => create(); static $pb.PbList<RoutingRule> createRepeated() => $pb.PbList<RoutingRule>(); @$core.pragma('dart2js:noInline') @@ -435,22 +439,20 @@ $core.String? field_1, $core.String? pathTemplate, }) { - final $result = create(); - if (field_1 != null) { - $result.field_1 = field_1; - } - if (pathTemplate != null) { - $result.pathTemplate = pathTemplate; - } - return $result; + final result = create(); + if (field_1 != null) result.field_1 = field_1; + if (pathTemplate != null) result.pathTemplate = pathTemplate; + return result; } - RoutingParameter._() : super(); - factory RoutingParameter.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory RoutingParameter.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + RoutingParameter._(); + + factory RoutingParameter.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory RoutingParameter.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'RoutingParameter', @@ -467,10 +469,12 @@ super.copyWith((message) => updates(message as RoutingParameter)) as RoutingParameter; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static RoutingParameter create() => RoutingParameter._(); + @$core.override RoutingParameter createEmptyInstance() => create(); static $pb.PbList<RoutingParameter> createRepeated() => $pb.PbList<RoutingParameter>(); @@ -483,10 +487,7 @@ @$pb.TagNumber(1) $core.String get field_1 => $_getSZ(0); @$pb.TagNumber(1) - set field_1($core.String v) { - $_setString(0, v); - } - + set field_1($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasField_1() => $_has(0); @$pb.TagNumber(1) @@ -549,10 +550,7 @@ @$pb.TagNumber(2) $core.String get pathTemplate => $_getSZ(1); @$pb.TagNumber(2) - set pathTemplate($core.String v) { - $_setString(1, v); - } - + set pathTemplate($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasPathTemplate() => $_has(1); @$pb.TagNumber(2) @@ -572,6 +570,7 @@ } } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart index dd574e5..7c90eaf 100644 --- a/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart +++ b/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart
@@ -5,6 +5,7 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart index 56ccb3d..4675791 100644 --- a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart +++ b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -28,28 +29,22 @@ $core.int? patch, $core.String? suffix, }) { - final $result = create(); - if (major != null) { - $result.major = major; - } - if (minor != null) { - $result.minor = minor; - } - if (patch != null) { - $result.patch = patch; - } - if (suffix != null) { - $result.suffix = suffix; - } - return $result; + final result = create(); + if (major != null) result.major = major; + if (minor != null) result.minor = minor; + if (patch != null) result.patch = patch; + if (suffix != null) result.suffix = suffix; + return result; } - Version._() : super(); - 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._(); + + factory Version.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Version.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'Version', @@ -68,10 +63,12 @@ Version copyWith(void Function(Version) updates) => super.copyWith((message) => updates(message as Version)) as Version; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Version create() => Version._(); + @$core.override Version createEmptyInstance() => create(); static $pb.PbList<Version> createRepeated() => $pb.PbList<Version>(); @$core.pragma('dart2js:noInline') @@ -82,10 +79,7 @@ @$pb.TagNumber(1) $core.int get major => $_getIZ(0); @$pb.TagNumber(1) - set major($core.int v) { - $_setSignedInt32(0, v); - } - + set major($core.int value) => $_setSignedInt32(0, value); @$pb.TagNumber(1) $core.bool hasMajor() => $_has(0); @$pb.TagNumber(1) @@ -94,10 +88,7 @@ @$pb.TagNumber(2) $core.int get minor => $_getIZ(1); @$pb.TagNumber(2) - set minor($core.int v) { - $_setSignedInt32(1, v); - } - + set minor($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasMinor() => $_has(1); @$pb.TagNumber(2) @@ -106,10 +97,7 @@ @$pb.TagNumber(3) $core.int get patch => $_getIZ(2); @$pb.TagNumber(3) - set patch($core.int v) { - $_setSignedInt32(2, v); - } - + set patch($core.int value) => $_setSignedInt32(2, value); @$pb.TagNumber(3) $core.bool hasPatch() => $_has(2); @$pb.TagNumber(3) @@ -120,10 +108,7 @@ @$pb.TagNumber(4) $core.String get suffix => $_getSZ(3); @$pb.TagNumber(4) - set suffix($core.String v) { - $_setString(3, v); - } - + set suffix($core.String value) => $_setString(3, value); @$pb.TagNumber(4) $core.bool hasSuffix() => $_has(3); @$pb.TagNumber(4) @@ -139,31 +124,24 @@ $core.Iterable<$2.FileDescriptorProto>? protoFile, $core.Iterable<$2.FileDescriptorProto>? sourceFileDescriptors, }) { - final $result = create(); - if (fileToGenerate != null) { - $result.fileToGenerate.addAll(fileToGenerate); - } - if (parameter != null) { - $result.parameter = parameter; - } - if (compilerVersion != null) { - $result.compilerVersion = compilerVersion; - } - if (protoFile != null) { - $result.protoFile.addAll(protoFile); - } - if (sourceFileDescriptors != null) { - $result.sourceFileDescriptors.addAll(sourceFileDescriptors); - } - return $result; + final result = create(); + if (fileToGenerate != null) result.fileToGenerate.addAll(fileToGenerate); + if (parameter != null) result.parameter = parameter; + if (compilerVersion != null) result.compilerVersion = compilerVersion; + if (protoFile != null) result.protoFile.addAll(protoFile); + if (sourceFileDescriptors != null) + result.sourceFileDescriptors.addAll(sourceFileDescriptors); + return result; } - CodeGeneratorRequest._() : super(); - 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._(); + + factory CodeGeneratorRequest.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory CodeGeneratorRequest.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'CodeGeneratorRequest', @@ -189,10 +167,12 @@ super.copyWith((message) => updates(message as CodeGeneratorRequest)) as CodeGeneratorRequest; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CodeGeneratorRequest create() => CodeGeneratorRequest._(); + @$core.override CodeGeneratorRequest createEmptyInstance() => create(); static $pb.PbList<CodeGeneratorRequest> createRepeated() => $pb.PbList<CodeGeneratorRequest>(); @@ -211,10 +191,7 @@ @$pb.TagNumber(2) $core.String get parameter => $_getSZ(1); @$pb.TagNumber(2) - set parameter($core.String v) { - $_setString(1, v); - } - + set parameter($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasParameter() => $_has(1); @$pb.TagNumber(2) @@ -224,10 +201,7 @@ @$pb.TagNumber(3) Version get compilerVersion => $_getN(2); @$pb.TagNumber(3) - set compilerVersion(Version v) { - $_setField(3, v); - } - + set compilerVersion(Version value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasCompilerVersion() => $_has(2); @$pb.TagNumber(3) @@ -272,28 +246,22 @@ $core.String? content, $2.GeneratedCodeInfo? generatedCodeInfo, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (insertionPoint != null) { - $result.insertionPoint = insertionPoint; - } - if (content != null) { - $result.content = content; - } - if (generatedCodeInfo != null) { - $result.generatedCodeInfo = generatedCodeInfo; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (insertionPoint != null) result.insertionPoint = insertionPoint; + if (content != null) result.content = content; + if (generatedCodeInfo != null) result.generatedCodeInfo = generatedCodeInfo; + return result; } - CodeGeneratorResponse_File._() : super(); - 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._(); + + factory CodeGeneratorResponse_File.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory CodeGeneratorResponse_File.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'CodeGeneratorResponse.File', @@ -317,10 +285,12 @@ (message) => updates(message as CodeGeneratorResponse_File)) as CodeGeneratorResponse_File; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CodeGeneratorResponse_File create() => CodeGeneratorResponse_File._(); + @$core.override CodeGeneratorResponse_File createEmptyInstance() => create(); static $pb.PbList<CodeGeneratorResponse_File> createRepeated() => $pb.PbList<CodeGeneratorResponse_File>(); @@ -343,10 +313,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -392,10 +359,7 @@ @$pb.TagNumber(2) $core.String get insertionPoint => $_getSZ(1); @$pb.TagNumber(2) - set insertionPoint($core.String v) { - $_setString(1, v); - } - + set insertionPoint($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasInsertionPoint() => $_has(1); @$pb.TagNumber(2) @@ -405,10 +369,7 @@ @$pb.TagNumber(15) $core.String get content => $_getSZ(2); @$pb.TagNumber(15) - set content($core.String v) { - $_setString(2, v); - } - + set content($core.String value) => $_setString(2, value); @$pb.TagNumber(15) $core.bool hasContent() => $_has(2); @$pb.TagNumber(15) @@ -420,10 +381,7 @@ @$pb.TagNumber(16) $2.GeneratedCodeInfo get generatedCodeInfo => $_getN(3); @$pb.TagNumber(16) - set generatedCodeInfo($2.GeneratedCodeInfo v) { - $_setField(16, v); - } - + set generatedCodeInfo($2.GeneratedCodeInfo value) => $_setField(16, value); @$pb.TagNumber(16) $core.bool hasGeneratedCodeInfo() => $_has(3); @$pb.TagNumber(16) @@ -441,31 +399,23 @@ $core.int? maximumEdition, $core.Iterable<CodeGeneratorResponse_File>? file, }) { - final $result = create(); - if (error != null) { - $result.error = error; - } - if (supportedFeatures != null) { - $result.supportedFeatures = supportedFeatures; - } - if (minimumEdition != null) { - $result.minimumEdition = minimumEdition; - } - if (maximumEdition != null) { - $result.maximumEdition = maximumEdition; - } - if (file != null) { - $result.file.addAll(file); - } - return $result; + final result = create(); + if (error != null) result.error = error; + if (supportedFeatures != null) result.supportedFeatures = supportedFeatures; + if (minimumEdition != null) result.minimumEdition = minimumEdition; + if (maximumEdition != null) result.maximumEdition = maximumEdition; + if (file != null) result.file.addAll(file); + return result; } - CodeGeneratorResponse._() : super(); - 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._(); + + factory CodeGeneratorResponse.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory CodeGeneratorResponse.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'CodeGeneratorResponse', @@ -494,10 +444,12 @@ super.copyWith((message) => updates(message as CodeGeneratorResponse)) as CodeGeneratorResponse; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CodeGeneratorResponse create() => CodeGeneratorResponse._(); + @$core.override CodeGeneratorResponse createEmptyInstance() => create(); static $pb.PbList<CodeGeneratorResponse> createRepeated() => $pb.PbList<CodeGeneratorResponse>(); @@ -517,10 +469,7 @@ @$pb.TagNumber(1) $core.String get error => $_getSZ(0); @$pb.TagNumber(1) - set error($core.String v) { - $_setString(0, v); - } - + set error($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasError() => $_has(0); @$pb.TagNumber(1) @@ -531,10 +480,7 @@ @$pb.TagNumber(2) $fixnum.Int64 get supportedFeatures => $_getI64(1); @$pb.TagNumber(2) - set supportedFeatures($fixnum.Int64 v) { - $_setInt64(1, v); - } - + set supportedFeatures($fixnum.Int64 value) => $_setInt64(1, value); @$pb.TagNumber(2) $core.bool hasSupportedFeatures() => $_has(1); @$pb.TagNumber(2) @@ -547,10 +493,7 @@ @$pb.TagNumber(3) $core.int get minimumEdition => $_getIZ(2); @$pb.TagNumber(3) - set minimumEdition($core.int v) { - $_setSignedInt32(2, v); - } - + set minimumEdition($core.int value) => $_setSignedInt32(2, value); @$pb.TagNumber(3) $core.bool hasMinimumEdition() => $_has(2); @$pb.TagNumber(3) @@ -563,10 +506,7 @@ @$pb.TagNumber(4) $core.int get maximumEdition => $_getIZ(3); @$pb.TagNumber(4) - set maximumEdition($core.int v) { - $_setSignedInt32(3, v); - } - + set maximumEdition($core.int value) => $_setSignedInt32(3, value); @$pb.TagNumber(4) $core.bool hasMaximumEdition() => $_has(3); @$pb.TagNumber(4) @@ -576,6 +516,7 @@ $pb.PbList<CodeGeneratorResponse_File> get file => $_getList(4); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart index 7e1fa58..35788ac 100644 --- a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart +++ b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -36,7 +37,8 @@ static CodeGeneratorResponse_Feature? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const CodeGeneratorResponse_Feature._(super.v, super.n); + const CodeGeneratorResponse_Feature._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = + $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart index dfd990f..95b3027 100644 --- a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart +++ b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -26,19 +27,19 @@ factory FileDescriptorSet({ $core.Iterable<FileDescriptorProto>? file, }) { - final $result = create(); - if (file != null) { - $result.file.addAll(file); - } - return $result; + final result = create(); + if (file != null) result.file.addAll(file); + return result; } - FileDescriptorSet._() : super(); - 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._(); + + factory FileDescriptorSet.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FileDescriptorSet.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FileDescriptorSet', @@ -57,10 +58,12 @@ super.copyWith((message) => updates(message as FileDescriptorSet)) as FileDescriptorSet; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FileDescriptorSet create() => FileDescriptorSet._(); + @$core.override FileDescriptorSet createEmptyInstance() => create(); static $pb.PbList<FileDescriptorSet> createRepeated() => $pb.PbList<FileDescriptorSet>(); @@ -91,58 +94,34 @@ Edition? edition, $core.Iterable<$core.String>? optionDependency, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (package != null) { - $result.package = package; - } - if (dependency != null) { - $result.dependency.addAll(dependency); - } - if (messageType != null) { - $result.messageType.addAll(messageType); - } - if (enumType != null) { - $result.enumType.addAll(enumType); - } - if (service != null) { - $result.service.addAll(service); - } - if (extension != null) { - $result.extension.addAll(extension); - } - if (options != null) { - $result.options = options; - } - if (sourceCodeInfo != null) { - $result.sourceCodeInfo = sourceCodeInfo; - } - if (publicDependency != null) { - $result.publicDependency.addAll(publicDependency); - } - if (weakDependency != null) { - $result.weakDependency.addAll(weakDependency); - } - if (syntax != null) { - $result.syntax = syntax; - } - if (edition != null) { - $result.edition = edition; - } - if (optionDependency != null) { - $result.optionDependency.addAll(optionDependency); - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (package != null) result.package = package; + if (dependency != null) result.dependency.addAll(dependency); + if (messageType != null) result.messageType.addAll(messageType); + if (enumType != null) result.enumType.addAll(enumType); + if (service != null) result.service.addAll(service); + if (extension != null) result.extension.addAll(extension); + if (options != null) result.options = options; + if (sourceCodeInfo != null) result.sourceCodeInfo = sourceCodeInfo; + if (publicDependency != null) + result.publicDependency.addAll(publicDependency); + if (weakDependency != null) result.weakDependency.addAll(weakDependency); + if (syntax != null) result.syntax = syntax; + if (edition != null) result.edition = edition; + if (optionDependency != null) + result.optionDependency.addAll(optionDependency); + return result; } - FileDescriptorProto._() : super(); - 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._(); + + factory FileDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FileDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FileDescriptorProto', @@ -186,10 +165,12 @@ super.copyWith((message) => updates(message as FileDescriptorProto)) as FileDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FileDescriptorProto create() => FileDescriptorProto._(); + @$core.override FileDescriptorProto createEmptyInstance() => create(); static $pb.PbList<FileDescriptorProto> createRepeated() => $pb.PbList<FileDescriptorProto>(); @@ -201,10 +182,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -213,10 +191,7 @@ @$pb.TagNumber(2) $core.String get package => $_getSZ(1); @$pb.TagNumber(2) - set package($core.String v) { - $_setString(1, v); - } - + set package($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasPackage() => $_has(1); @$pb.TagNumber(2) @@ -242,10 +217,7 @@ @$pb.TagNumber(8) FileOptions get options => $_getN(7); @$pb.TagNumber(8) - set options(FileOptions v) { - $_setField(8, v); - } - + set options(FileOptions value) => $_setField(8, value); @$pb.TagNumber(8) $core.bool hasOptions() => $_has(7); @$pb.TagNumber(8) @@ -260,10 +232,7 @@ @$pb.TagNumber(9) SourceCodeInfo get sourceCodeInfo => $_getN(8); @$pb.TagNumber(9) - set sourceCodeInfo(SourceCodeInfo v) { - $_setField(9, v); - } - + set sourceCodeInfo(SourceCodeInfo value) => $_setField(9, value); @$pb.TagNumber(9) $core.bool hasSourceCodeInfo() => $_has(8); @$pb.TagNumber(9) @@ -290,10 +259,7 @@ @$pb.TagNumber(12) $core.String get syntax => $_getSZ(11); @$pb.TagNumber(12) - set syntax($core.String v) { - $_setString(11, v); - } - + set syntax($core.String value) => $_setString(11, value); @$pb.TagNumber(12) $core.bool hasSyntax() => $_has(11); @$pb.TagNumber(12) @@ -306,10 +272,7 @@ @$pb.TagNumber(14) Edition get edition => $_getN(12); @$pb.TagNumber(14) - set edition(Edition v) { - $_setField(14, v); - } - + set edition(Edition value) => $_setField(14, value); @$pb.TagNumber(14) $core.bool hasEdition() => $_has(12); @$pb.TagNumber(14) @@ -327,25 +290,21 @@ $core.int? end, ExtensionRangeOptions? options, }) { - final $result = create(); - if (start != null) { - $result.start = start; - } - if (end != null) { - $result.end = end; - } - if (options != null) { - $result.options = options; - } - return $result; + final result = create(); + if (start != null) result.start = start; + if (end != null) result.end = end; + if (options != null) result.options = options; + return result; } - DescriptorProto_ExtensionRange._() : super(); - 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._(); + + factory DescriptorProto_ExtensionRange.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory DescriptorProto_ExtensionRange.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'DescriptorProto.ExtensionRange', @@ -367,11 +326,13 @@ (message) => updates(message as DescriptorProto_ExtensionRange)) as DescriptorProto_ExtensionRange; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static DescriptorProto_ExtensionRange create() => DescriptorProto_ExtensionRange._(); + @$core.override DescriptorProto_ExtensionRange createEmptyInstance() => create(); static $pb.PbList<DescriptorProto_ExtensionRange> createRepeated() => $pb.PbList<DescriptorProto_ExtensionRange>(); @@ -383,10 +344,7 @@ @$pb.TagNumber(1) $core.int get start => $_getIZ(0); @$pb.TagNumber(1) - set start($core.int v) { - $_setSignedInt32(0, v); - } - + set start($core.int value) => $_setSignedInt32(0, value); @$pb.TagNumber(1) $core.bool hasStart() => $_has(0); @$pb.TagNumber(1) @@ -395,10 +353,7 @@ @$pb.TagNumber(2) $core.int get end => $_getIZ(1); @$pb.TagNumber(2) - set end($core.int v) { - $_setSignedInt32(1, v); - } - + set end($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasEnd() => $_has(1); @$pb.TagNumber(2) @@ -407,10 +362,7 @@ @$pb.TagNumber(3) ExtensionRangeOptions get options => $_getN(2); @$pb.TagNumber(3) - set options(ExtensionRangeOptions v) { - $_setField(3, v); - } - + set options(ExtensionRangeOptions value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasOptions() => $_has(2); @$pb.TagNumber(3) @@ -427,22 +379,20 @@ $core.int? start, $core.int? end, }) { - final $result = create(); - if (start != null) { - $result.start = start; - } - if (end != null) { - $result.end = end; - } - return $result; + final result = create(); + if (start != null) result.start = start; + if (end != null) result.end = end; + return result; } - DescriptorProto_ReservedRange._() : super(); - 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._(); + + factory DescriptorProto_ReservedRange.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory DescriptorProto_ReservedRange.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'DescriptorProto.ReservedRange', @@ -463,11 +413,13 @@ (message) => updates(message as DescriptorProto_ReservedRange)) as DescriptorProto_ReservedRange; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static DescriptorProto_ReservedRange create() => DescriptorProto_ReservedRange._(); + @$core.override DescriptorProto_ReservedRange createEmptyInstance() => create(); static $pb.PbList<DescriptorProto_ReservedRange> createRepeated() => $pb.PbList<DescriptorProto_ReservedRange>(); @@ -479,10 +431,7 @@ @$pb.TagNumber(1) $core.int get start => $_getIZ(0); @$pb.TagNumber(1) - set start($core.int v) { - $_setSignedInt32(0, v); - } - + set start($core.int value) => $_setSignedInt32(0, value); @$pb.TagNumber(1) $core.bool hasStart() => $_has(0); @$pb.TagNumber(1) @@ -491,10 +440,7 @@ @$pb.TagNumber(2) $core.int get end => $_getIZ(1); @$pb.TagNumber(2) - set end($core.int v) { - $_setSignedInt32(1, v); - } - + set end($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasEnd() => $_has(1); @$pb.TagNumber(2) @@ -516,49 +462,29 @@ $core.Iterable<$core.String>? reservedName, SymbolVisibility? visibility, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (field != null) { - $result.field.addAll(field); - } - if (nestedType != null) { - $result.nestedType.addAll(nestedType); - } - if (enumType != null) { - $result.enumType.addAll(enumType); - } - if (extensionRange != null) { - $result.extensionRange.addAll(extensionRange); - } - if (extension != null) { - $result.extension.addAll(extension); - } - if (options != null) { - $result.options = options; - } - if (oneofDecl != null) { - $result.oneofDecl.addAll(oneofDecl); - } - if (reservedRange != null) { - $result.reservedRange.addAll(reservedRange); - } - if (reservedName != null) { - $result.reservedName.addAll(reservedName); - } - if (visibility != null) { - $result.visibility = visibility; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (field != null) result.field.addAll(field); + if (nestedType != null) result.nestedType.addAll(nestedType); + if (enumType != null) result.enumType.addAll(enumType); + if (extensionRange != null) result.extensionRange.addAll(extensionRange); + if (extension != null) result.extension.addAll(extension); + if (options != null) result.options = options; + if (oneofDecl != null) result.oneofDecl.addAll(oneofDecl); + if (reservedRange != null) result.reservedRange.addAll(reservedRange); + if (reservedName != null) result.reservedName.addAll(reservedName); + if (visibility != null) result.visibility = visibility; + return result; } - DescriptorProto._() : super(); - 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._(); + + factory DescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory DescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'DescriptorProto', @@ -603,10 +529,12 @@ super.copyWith((message) => updates(message as DescriptorProto)) as DescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static DescriptorProto create() => DescriptorProto._(); + @$core.override DescriptorProto createEmptyInstance() => create(); static $pb.PbList<DescriptorProto> createRepeated() => $pb.PbList<DescriptorProto>(); @@ -618,10 +546,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -645,10 +570,7 @@ @$pb.TagNumber(7) MessageOptions get options => $_getN(6); @$pb.TagNumber(7) - set options(MessageOptions v) { - $_setField(7, v); - } - + set options(MessageOptions value) => $_setField(7, value); @$pb.TagNumber(7) $core.bool hasOptions() => $_has(6); @$pb.TagNumber(7) @@ -671,10 +593,7 @@ @$pb.TagNumber(11) SymbolVisibility get visibility => $_getN(10); @$pb.TagNumber(11) - set visibility(SymbolVisibility v) { - $_setField(11, v); - } - + set visibility(SymbolVisibility value) => $_setField(11, value); @$pb.TagNumber(11) $core.bool hasVisibility() => $_has(10); @$pb.TagNumber(11) @@ -689,31 +608,24 @@ $core.bool? reserved, $core.bool? repeated, }) { - final $result = create(); - if (number != null) { - $result.number = number; - } - if (fullName != null) { - $result.fullName = fullName; - } - if (type != null) { - $result.type = type; - } - if (reserved != null) { - $result.reserved = reserved; - } - if (repeated != null) { - $result.repeated = repeated; - } - return $result; + final result = create(); + if (number != null) result.number = number; + if (fullName != null) result.fullName = fullName; + if (type != null) result.type = type; + if (reserved != null) result.reserved = reserved; + if (repeated != null) result.repeated = repeated; + return result; } - ExtensionRangeOptions_Declaration._() : super(); - factory ExtensionRangeOptions_Declaration.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory ExtensionRangeOptions_Declaration.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + ExtensionRangeOptions_Declaration._(); + + factory ExtensionRangeOptions_Declaration.fromBuffer( + $core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory ExtensionRangeOptions_Declaration.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'ExtensionRangeOptions.Declaration', @@ -737,11 +649,13 @@ updates(message as ExtensionRangeOptions_Declaration)) as ExtensionRangeOptions_Declaration; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ExtensionRangeOptions_Declaration create() => ExtensionRangeOptions_Declaration._(); + @$core.override ExtensionRangeOptions_Declaration createEmptyInstance() => create(); static $pb.PbList<ExtensionRangeOptions_Declaration> createRepeated() => $pb.PbList<ExtensionRangeOptions_Declaration>(); @@ -755,10 +669,7 @@ @$pb.TagNumber(1) $core.int get number => $_getIZ(0); @$pb.TagNumber(1) - set number($core.int v) { - $_setSignedInt32(0, v); - } - + set number($core.int value) => $_setSignedInt32(0, value); @$pb.TagNumber(1) $core.bool hasNumber() => $_has(0); @$pb.TagNumber(1) @@ -769,10 +680,7 @@ @$pb.TagNumber(2) $core.String get fullName => $_getSZ(1); @$pb.TagNumber(2) - set fullName($core.String v) { - $_setString(1, v); - } - + set fullName($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasFullName() => $_has(1); @$pb.TagNumber(2) @@ -784,10 +692,7 @@ @$pb.TagNumber(3) $core.String get type => $_getSZ(2); @$pb.TagNumber(3) - set type($core.String v) { - $_setString(2, v); - } - + set type($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasType() => $_has(2); @$pb.TagNumber(3) @@ -799,10 +704,7 @@ @$pb.TagNumber(5) $core.bool get reserved => $_getBF(3); @$pb.TagNumber(5) - set reserved($core.bool v) { - $_setBool(3, v); - } - + set reserved($core.bool value) => $_setBool(3, value); @$pb.TagNumber(5) $core.bool hasReserved() => $_has(3); @$pb.TagNumber(5) @@ -813,10 +715,7 @@ @$pb.TagNumber(6) $core.bool get repeated => $_getBF(4); @$pb.TagNumber(6) - set repeated($core.bool v) { - $_setBool(4, v); - } - + set repeated($core.bool value) => $_setBool(4, value); @$pb.TagNumber(6) $core.bool hasRepeated() => $_has(4); @$pb.TagNumber(6) @@ -830,28 +729,23 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (declaration != null) { - $result.declaration.addAll(declaration); - } - if (verification != null) { - $result.verification = verification; - } - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (declaration != null) result.declaration.addAll(declaration); + if (verification != null) result.verification = verification; + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - ExtensionRangeOptions._() : super(); - factory ExtensionRangeOptions.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory ExtensionRangeOptions.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + ExtensionRangeOptions._(); + + factory ExtensionRangeOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory ExtensionRangeOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'ExtensionRangeOptions', @@ -882,10 +776,12 @@ super.copyWith((message) => updates(message as ExtensionRangeOptions)) as ExtensionRangeOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ExtensionRangeOptions create() => ExtensionRangeOptions._(); + @$core.override ExtensionRangeOptions createEmptyInstance() => create(); static $pb.PbList<ExtensionRangeOptions> createRepeated() => $pb.PbList<ExtensionRangeOptions>(); @@ -906,10 +802,8 @@ @$pb.TagNumber(3) ExtensionRangeOptions_VerificationState get verification => $_getN(1); @$pb.TagNumber(3) - set verification(ExtensionRangeOptions_VerificationState v) { - $_setField(3, v); - } - + set verification(ExtensionRangeOptions_VerificationState value) => + $_setField(3, value); @$pb.TagNumber(3) $core.bool hasVerification() => $_has(1); @$pb.TagNumber(3) @@ -919,10 +813,7 @@ @$pb.TagNumber(50) FeatureSet get features => $_getN(2); @$pb.TagNumber(50) - set features(FeatureSet v) { - $_setField(50, v); - } - + set features(FeatureSet value) => $_setField(50, value); @$pb.TagNumber(50) $core.bool hasFeatures() => $_has(2); @$pb.TagNumber(50) @@ -950,49 +841,29 @@ $core.String? jsonName, $core.bool? proto3Optional, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (extendee != null) { - $result.extendee = extendee; - } - if (number != null) { - $result.number = number; - } - if (label != null) { - $result.label = label; - } - if (type != null) { - $result.type = type; - } - if (typeName != null) { - $result.typeName = typeName; - } - if (defaultValue != null) { - $result.defaultValue = defaultValue; - } - if (options != null) { - $result.options = options; - } - if (oneofIndex != null) { - $result.oneofIndex = oneofIndex; - } - if (jsonName != null) { - $result.jsonName = jsonName; - } - if (proto3Optional != null) { - $result.proto3Optional = proto3Optional; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (extendee != null) result.extendee = extendee; + if (number != null) result.number = number; + if (label != null) result.label = label; + if (type != null) result.type = type; + if (typeName != null) result.typeName = typeName; + if (defaultValue != null) result.defaultValue = defaultValue; + if (options != null) result.options = options; + if (oneofIndex != null) result.oneofIndex = oneofIndex; + if (jsonName != null) result.jsonName = jsonName; + if (proto3Optional != null) result.proto3Optional = proto3Optional; + return result; } - FieldDescriptorProto._() : super(); - 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._(); + + factory FieldDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FieldDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FieldDescriptorProto', @@ -1028,10 +899,12 @@ super.copyWith((message) => updates(message as FieldDescriptorProto)) as FieldDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FieldDescriptorProto create() => FieldDescriptorProto._(); + @$core.override FieldDescriptorProto createEmptyInstance() => create(); static $pb.PbList<FieldDescriptorProto> createRepeated() => $pb.PbList<FieldDescriptorProto>(); @@ -1043,10 +916,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -1057,10 +927,7 @@ @$pb.TagNumber(2) $core.String get extendee => $_getSZ(1); @$pb.TagNumber(2) - set extendee($core.String v) { - $_setString(1, v); - } - + set extendee($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasExtendee() => $_has(1); @$pb.TagNumber(2) @@ -1069,10 +936,7 @@ @$pb.TagNumber(3) $core.int get number => $_getIZ(2); @$pb.TagNumber(3) - set number($core.int v) { - $_setSignedInt32(2, v); - } - + set number($core.int value) => $_setSignedInt32(2, value); @$pb.TagNumber(3) $core.bool hasNumber() => $_has(2); @$pb.TagNumber(3) @@ -1081,10 +945,7 @@ @$pb.TagNumber(4) FieldDescriptorProto_Label get label => $_getN(3); @$pb.TagNumber(4) - set label(FieldDescriptorProto_Label v) { - $_setField(4, v); - } - + set label(FieldDescriptorProto_Label value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasLabel() => $_has(3); @$pb.TagNumber(4) @@ -1095,10 +956,7 @@ @$pb.TagNumber(5) FieldDescriptorProto_Type get type => $_getN(4); @$pb.TagNumber(5) - set type(FieldDescriptorProto_Type v) { - $_setField(5, v); - } - + set type(FieldDescriptorProto_Type value) => $_setField(5, value); @$pb.TagNumber(5) $core.bool hasType() => $_has(4); @$pb.TagNumber(5) @@ -1112,10 +970,7 @@ @$pb.TagNumber(6) $core.String get typeName => $_getSZ(5); @$pb.TagNumber(6) - set typeName($core.String v) { - $_setString(5, v); - } - + set typeName($core.String value) => $_setString(5, value); @$pb.TagNumber(6) $core.bool hasTypeName() => $_has(5); @$pb.TagNumber(6) @@ -1128,10 +983,7 @@ @$pb.TagNumber(7) $core.String get defaultValue => $_getSZ(6); @$pb.TagNumber(7) - set defaultValue($core.String v) { - $_setString(6, v); - } - + set defaultValue($core.String value) => $_setString(6, value); @$pb.TagNumber(7) $core.bool hasDefaultValue() => $_has(6); @$pb.TagNumber(7) @@ -1140,10 +992,7 @@ @$pb.TagNumber(8) FieldOptions get options => $_getN(7); @$pb.TagNumber(8) - set options(FieldOptions v) { - $_setField(8, v); - } - + set options(FieldOptions value) => $_setField(8, value); @$pb.TagNumber(8) $core.bool hasOptions() => $_has(7); @$pb.TagNumber(8) @@ -1156,10 +1005,7 @@ @$pb.TagNumber(9) $core.int get oneofIndex => $_getIZ(8); @$pb.TagNumber(9) - set oneofIndex($core.int v) { - $_setSignedInt32(8, v); - } - + set oneofIndex($core.int value) => $_setSignedInt32(8, value); @$pb.TagNumber(9) $core.bool hasOneofIndex() => $_has(8); @$pb.TagNumber(9) @@ -1172,10 +1018,7 @@ @$pb.TagNumber(10) $core.String get jsonName => $_getSZ(9); @$pb.TagNumber(10) - set jsonName($core.String v) { - $_setString(9, v); - } - + set jsonName($core.String value) => $_setString(9, value); @$pb.TagNumber(10) $core.bool hasJsonName() => $_has(9); @$pb.TagNumber(10) @@ -1205,10 +1048,7 @@ @$pb.TagNumber(17) $core.bool get proto3Optional => $_getBF(10); @$pb.TagNumber(17) - set proto3Optional($core.bool v) { - $_setBool(10, v); - } - + set proto3Optional($core.bool value) => $_setBool(10, value); @$pb.TagNumber(17) $core.bool hasProto3Optional() => $_has(10); @$pb.TagNumber(17) @@ -1221,22 +1061,20 @@ $core.String? name, OneofOptions? options, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (options != null) { - $result.options = options; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (options != null) result.options = options; + return result; } - OneofDescriptorProto._() : super(); - 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._(); + + factory OneofDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory OneofDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'OneofDescriptorProto', @@ -1255,10 +1093,12 @@ super.copyWith((message) => updates(message as OneofDescriptorProto)) as OneofDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static OneofDescriptorProto create() => OneofDescriptorProto._(); + @$core.override OneofDescriptorProto createEmptyInstance() => create(); static $pb.PbList<OneofDescriptorProto> createRepeated() => $pb.PbList<OneofDescriptorProto>(); @@ -1270,10 +1110,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -1282,10 +1119,7 @@ @$pb.TagNumber(2) OneofOptions get options => $_getN(1); @$pb.TagNumber(2) - set options(OneofOptions v) { - $_setField(2, v); - } - + set options(OneofOptions value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasOptions() => $_has(1); @$pb.TagNumber(2) @@ -1305,23 +1139,21 @@ $core.int? start, $core.int? end, }) { - final $result = create(); - if (start != null) { - $result.start = start; - } - if (end != null) { - $result.end = end; - } - return $result; + final result = create(); + if (start != null) result.start = start; + if (end != null) result.end = end; + return result; } - EnumDescriptorProto_EnumReservedRange._() : super(); + + EnumDescriptorProto_EnumReservedRange._(); + factory EnumDescriptorProto_EnumReservedRange.fromBuffer( - $core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory EnumDescriptorProto_EnumReservedRange.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + $core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory EnumDescriptorProto_EnumReservedRange.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'EnumDescriptorProto.EnumReservedRange', @@ -1342,11 +1174,13 @@ updates(message as EnumDescriptorProto_EnumReservedRange)) as EnumDescriptorProto_EnumReservedRange; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EnumDescriptorProto_EnumReservedRange create() => EnumDescriptorProto_EnumReservedRange._(); + @$core.override EnumDescriptorProto_EnumReservedRange createEmptyInstance() => create(); static $pb.PbList<EnumDescriptorProto_EnumReservedRange> createRepeated() => $pb.PbList<EnumDescriptorProto_EnumReservedRange>(); @@ -1359,10 +1193,7 @@ @$pb.TagNumber(1) $core.int get start => $_getIZ(0); @$pb.TagNumber(1) - set start($core.int v) { - $_setSignedInt32(0, v); - } - + set start($core.int value) => $_setSignedInt32(0, value); @$pb.TagNumber(1) $core.bool hasStart() => $_has(0); @$pb.TagNumber(1) @@ -1371,10 +1202,7 @@ @$pb.TagNumber(2) $core.int get end => $_getIZ(1); @$pb.TagNumber(2) - set end($core.int v) { - $_setSignedInt32(1, v); - } - + set end($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasEnd() => $_has(1); @$pb.TagNumber(2) @@ -1391,34 +1219,24 @@ $core.Iterable<$core.String>? reservedName, SymbolVisibility? visibility, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (value != null) { - $result.value.addAll(value); - } - if (options != null) { - $result.options = options; - } - if (reservedRange != null) { - $result.reservedRange.addAll(reservedRange); - } - if (reservedName != null) { - $result.reservedName.addAll(reservedName); - } - if (visibility != null) { - $result.visibility = visibility; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (value != null) result.value.addAll(value); + if (options != null) result.options = options; + if (reservedRange != null) result.reservedRange.addAll(reservedRange); + if (reservedName != null) result.reservedName.addAll(reservedName); + if (visibility != null) result.visibility = visibility; + return result; } - EnumDescriptorProto._() : super(); - 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._(); + + factory EnumDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory EnumDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'EnumDescriptorProto', @@ -1448,10 +1266,12 @@ super.copyWith((message) => updates(message as EnumDescriptorProto)) as EnumDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EnumDescriptorProto create() => EnumDescriptorProto._(); + @$core.override EnumDescriptorProto createEmptyInstance() => create(); static $pb.PbList<EnumDescriptorProto> createRepeated() => $pb.PbList<EnumDescriptorProto>(); @@ -1463,10 +1283,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -1478,10 +1295,7 @@ @$pb.TagNumber(3) EnumOptions get options => $_getN(2); @$pb.TagNumber(3) - set options(EnumOptions v) { - $_setField(3, v); - } - + set options(EnumOptions value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasOptions() => $_has(2); @$pb.TagNumber(3) @@ -1505,10 +1319,7 @@ @$pb.TagNumber(6) SymbolVisibility get visibility => $_getN(5); @$pb.TagNumber(6) - set visibility(SymbolVisibility v) { - $_setField(6, v); - } - + set visibility(SymbolVisibility value) => $_setField(6, value); @$pb.TagNumber(6) $core.bool hasVisibility() => $_has(5); @$pb.TagNumber(6) @@ -1522,25 +1333,21 @@ $core.int? number, EnumValueOptions? options, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (number != null) { - $result.number = number; - } - if (options != null) { - $result.options = options; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (number != null) result.number = number; + if (options != null) result.options = options; + return result; } - EnumValueDescriptorProto._() : super(); - 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._(); + + factory EnumValueDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory EnumValueDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'EnumValueDescriptorProto', @@ -1561,10 +1368,12 @@ super.copyWith((message) => updates(message as EnumValueDescriptorProto)) as EnumValueDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EnumValueDescriptorProto create() => EnumValueDescriptorProto._(); + @$core.override EnumValueDescriptorProto createEmptyInstance() => create(); static $pb.PbList<EnumValueDescriptorProto> createRepeated() => $pb.PbList<EnumValueDescriptorProto>(); @@ -1576,10 +1385,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -1588,10 +1394,7 @@ @$pb.TagNumber(2) $core.int get number => $_getIZ(1); @$pb.TagNumber(2) - set number($core.int v) { - $_setSignedInt32(1, v); - } - + set number($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasNumber() => $_has(1); @$pb.TagNumber(2) @@ -1600,10 +1403,7 @@ @$pb.TagNumber(3) EnumValueOptions get options => $_getN(2); @$pb.TagNumber(3) - set options(EnumValueOptions v) { - $_setField(3, v); - } - + set options(EnumValueOptions value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasOptions() => $_has(2); @$pb.TagNumber(3) @@ -1619,25 +1419,21 @@ $core.Iterable<MethodDescriptorProto>? method, ServiceOptions? options, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (method != null) { - $result.method.addAll(method); - } - if (options != null) { - $result.options = options; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (method != null) result.method.addAll(method); + if (options != null) result.options = options; + return result; } - ServiceDescriptorProto._() : super(); - 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._(); + + factory ServiceDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory ServiceDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'ServiceDescriptorProto', @@ -1660,10 +1456,12 @@ super.copyWith((message) => updates(message as ServiceDescriptorProto)) as ServiceDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ServiceDescriptorProto create() => ServiceDescriptorProto._(); + @$core.override ServiceDescriptorProto createEmptyInstance() => create(); static $pb.PbList<ServiceDescriptorProto> createRepeated() => $pb.PbList<ServiceDescriptorProto>(); @@ -1675,10 +1473,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -1690,10 +1485,7 @@ @$pb.TagNumber(3) ServiceOptions get options => $_getN(2); @$pb.TagNumber(3) - set options(ServiceOptions v) { - $_setField(3, v); - } - + set options(ServiceOptions value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasOptions() => $_has(2); @$pb.TagNumber(3) @@ -1712,34 +1504,24 @@ $core.bool? clientStreaming, $core.bool? serverStreaming, }) { - final $result = create(); - if (name != null) { - $result.name = name; - } - if (inputType != null) { - $result.inputType = inputType; - } - if (outputType != null) { - $result.outputType = outputType; - } - if (options != null) { - $result.options = options; - } - if (clientStreaming != null) { - $result.clientStreaming = clientStreaming; - } - if (serverStreaming != null) { - $result.serverStreaming = serverStreaming; - } - return $result; + final result = create(); + if (name != null) result.name = name; + if (inputType != null) result.inputType = inputType; + if (outputType != null) result.outputType = outputType; + if (options != null) result.options = options; + if (clientStreaming != null) result.clientStreaming = clientStreaming; + if (serverStreaming != null) result.serverStreaming = serverStreaming; + return result; } - MethodDescriptorProto._() : super(); - 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._(); + + factory MethodDescriptorProto.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory MethodDescriptorProto.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'MethodDescriptorProto', @@ -1763,10 +1545,12 @@ super.copyWith((message) => updates(message as MethodDescriptorProto)) as MethodDescriptorProto; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MethodDescriptorProto create() => MethodDescriptorProto._(); + @$core.override MethodDescriptorProto createEmptyInstance() => create(); static $pb.PbList<MethodDescriptorProto> createRepeated() => $pb.PbList<MethodDescriptorProto>(); @@ -1778,10 +1562,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -1792,10 +1573,7 @@ @$pb.TagNumber(2) $core.String get inputType => $_getSZ(1); @$pb.TagNumber(2) - set inputType($core.String v) { - $_setString(1, v); - } - + set inputType($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasInputType() => $_has(1); @$pb.TagNumber(2) @@ -1804,10 +1582,7 @@ @$pb.TagNumber(3) $core.String get outputType => $_getSZ(2); @$pb.TagNumber(3) - set outputType($core.String v) { - $_setString(2, v); - } - + set outputType($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasOutputType() => $_has(2); @$pb.TagNumber(3) @@ -1816,10 +1591,7 @@ @$pb.TagNumber(4) MethodOptions get options => $_getN(3); @$pb.TagNumber(4) - set options(MethodOptions v) { - $_setField(4, v); - } - + set options(MethodOptions value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasOptions() => $_has(3); @$pb.TagNumber(4) @@ -1831,10 +1603,7 @@ @$pb.TagNumber(5) $core.bool get clientStreaming => $_getBF(4); @$pb.TagNumber(5) - set clientStreaming($core.bool v) { - $_setBool(4, v); - } - + set clientStreaming($core.bool value) => $_setBool(4, value); @$pb.TagNumber(5) $core.bool hasClientStreaming() => $_has(4); @$pb.TagNumber(5) @@ -1844,10 +1613,7 @@ @$pb.TagNumber(6) $core.bool get serverStreaming => $_getBF(5); @$pb.TagNumber(6) - set serverStreaming($core.bool v) { - $_setBool(5, v); - } - + set serverStreaming($core.bool value) => $_setBool(5, value); @$pb.TagNumber(6) $core.bool hasServerStreaming() => $_has(5); @$pb.TagNumber(6) @@ -1879,80 +1645,45 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (javaPackage != null) { - $result.javaPackage = javaPackage; - } - if (javaOuterClassname != null) { - $result.javaOuterClassname = javaOuterClassname; - } - if (optimizeFor != null) { - $result.optimizeFor = optimizeFor; - } - if (javaMultipleFiles != null) { - $result.javaMultipleFiles = javaMultipleFiles; - } - if (goPackage != null) { - $result.goPackage = goPackage; - } - if (ccGenericServices != null) { - $result.ccGenericServices = ccGenericServices; - } - if (javaGenericServices != null) { - $result.javaGenericServices = javaGenericServices; - } - if (pyGenericServices != null) { - $result.pyGenericServices = pyGenericServices; - } - if (javaGenerateEqualsAndHash != null) { - // ignore: deprecated_member_use_from_same_package - $result.javaGenerateEqualsAndHash = javaGenerateEqualsAndHash; - } - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (javaStringCheckUtf8 != null) { - $result.javaStringCheckUtf8 = javaStringCheckUtf8; - } - if (ccEnableArenas != null) { - $result.ccEnableArenas = ccEnableArenas; - } - if (objcClassPrefix != null) { - $result.objcClassPrefix = objcClassPrefix; - } - if (csharpNamespace != null) { - $result.csharpNamespace = csharpNamespace; - } - if (swiftPrefix != null) { - $result.swiftPrefix = swiftPrefix; - } - if (phpClassPrefix != null) { - $result.phpClassPrefix = phpClassPrefix; - } - if (phpNamespace != null) { - $result.phpNamespace = phpNamespace; - } - if (phpMetadataNamespace != null) { - $result.phpMetadataNamespace = phpMetadataNamespace; - } - if (rubyPackage != null) { - $result.rubyPackage = rubyPackage; - } - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (javaPackage != null) result.javaPackage = javaPackage; + if (javaOuterClassname != null) + result.javaOuterClassname = javaOuterClassname; + if (optimizeFor != null) result.optimizeFor = optimizeFor; + if (javaMultipleFiles != null) result.javaMultipleFiles = javaMultipleFiles; + if (goPackage != null) result.goPackage = goPackage; + if (ccGenericServices != null) result.ccGenericServices = ccGenericServices; + if (javaGenericServices != null) + result.javaGenericServices = javaGenericServices; + if (pyGenericServices != null) result.pyGenericServices = pyGenericServices; + if (javaGenerateEqualsAndHash != null) + result.javaGenerateEqualsAndHash = javaGenerateEqualsAndHash; + if (deprecated != null) result.deprecated = deprecated; + if (javaStringCheckUtf8 != null) + result.javaStringCheckUtf8 = javaStringCheckUtf8; + if (ccEnableArenas != null) result.ccEnableArenas = ccEnableArenas; + if (objcClassPrefix != null) result.objcClassPrefix = objcClassPrefix; + if (csharpNamespace != null) result.csharpNamespace = csharpNamespace; + if (swiftPrefix != null) result.swiftPrefix = swiftPrefix; + if (phpClassPrefix != null) result.phpClassPrefix = phpClassPrefix; + if (phpNamespace != null) result.phpNamespace = phpNamespace; + if (phpMetadataNamespace != null) + result.phpMetadataNamespace = phpMetadataNamespace; + if (rubyPackage != null) result.rubyPackage = rubyPackage; + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - FileOptions._() : super(); - 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._(); + + factory FileOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FileOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FileOptions', @@ -1998,10 +1729,12 @@ super.copyWith((message) => updates(message as FileOptions)) as FileOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FileOptions create() => FileOptions._(); + @$core.override FileOptions createEmptyInstance() => create(); static $pb.PbList<FileOptions> createRepeated() => $pb.PbList<FileOptions>(); @$core.pragma('dart2js:noInline') @@ -2016,10 +1749,7 @@ @$pb.TagNumber(1) $core.String get javaPackage => $_getSZ(0); @$pb.TagNumber(1) - set javaPackage($core.String v) { - $_setString(0, v); - } - + set javaPackage($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasJavaPackage() => $_has(0); @$pb.TagNumber(1) @@ -2033,10 +1763,7 @@ @$pb.TagNumber(8) $core.String get javaOuterClassname => $_getSZ(1); @$pb.TagNumber(8) - set javaOuterClassname($core.String v) { - $_setString(1, v); - } - + set javaOuterClassname($core.String value) => $_setString(1, value); @$pb.TagNumber(8) $core.bool hasJavaOuterClassname() => $_has(1); @$pb.TagNumber(8) @@ -2045,10 +1772,7 @@ @$pb.TagNumber(9) FileOptions_OptimizeMode get optimizeFor => $_getN(2); @$pb.TagNumber(9) - set optimizeFor(FileOptions_OptimizeMode v) { - $_setField(9, v); - } - + set optimizeFor(FileOptions_OptimizeMode value) => $_setField(9, value); @$pb.TagNumber(9) $core.bool hasOptimizeFor() => $_has(2); @$pb.TagNumber(9) @@ -2063,10 +1787,7 @@ @$pb.TagNumber(10) $core.bool get javaMultipleFiles => $_getBF(3); @$pb.TagNumber(10) - set javaMultipleFiles($core.bool v) { - $_setBool(3, v); - } - + set javaMultipleFiles($core.bool value) => $_setBool(3, value); @$pb.TagNumber(10) $core.bool hasJavaMultipleFiles() => $_has(3); @$pb.TagNumber(10) @@ -2080,10 +1801,7 @@ @$pb.TagNumber(11) $core.String get goPackage => $_getSZ(4); @$pb.TagNumber(11) - set goPackage($core.String v) { - $_setString(4, v); - } - + set goPackage($core.String value) => $_setString(4, value); @$pb.TagNumber(11) $core.bool hasGoPackage() => $_has(4); @$pb.TagNumber(11) @@ -2102,10 +1820,7 @@ @$pb.TagNumber(16) $core.bool get ccGenericServices => $_getBF(5); @$pb.TagNumber(16) - set ccGenericServices($core.bool v) { - $_setBool(5, v); - } - + set ccGenericServices($core.bool value) => $_setBool(5, value); @$pb.TagNumber(16) $core.bool hasCcGenericServices() => $_has(5); @$pb.TagNumber(16) @@ -2114,10 +1829,7 @@ @$pb.TagNumber(17) $core.bool get javaGenericServices => $_getBF(6); @$pb.TagNumber(17) - set javaGenericServices($core.bool v) { - $_setBool(6, v); - } - + set javaGenericServices($core.bool value) => $_setBool(6, value); @$pb.TagNumber(17) $core.bool hasJavaGenericServices() => $_has(6); @$pb.TagNumber(17) @@ -2126,10 +1838,7 @@ @$pb.TagNumber(18) $core.bool get pyGenericServices => $_getBF(7); @$pb.TagNumber(18) - set pyGenericServices($core.bool v) { - $_setBool(7, v); - } - + set pyGenericServices($core.bool value) => $_setBool(7, value); @$pb.TagNumber(18) $core.bool hasPyGenericServices() => $_has(7); @$pb.TagNumber(18) @@ -2141,10 +1850,7 @@ $core.bool get javaGenerateEqualsAndHash => $_getBF(8); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(20) - set javaGenerateEqualsAndHash($core.bool v) { - $_setBool(8, v); - } - + set javaGenerateEqualsAndHash($core.bool value) => $_setBool(8, value); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(20) $core.bool hasJavaGenerateEqualsAndHash() => $_has(8); @@ -2159,10 +1865,7 @@ @$pb.TagNumber(23) $core.bool get deprecated => $_getBF(9); @$pb.TagNumber(23) - set deprecated($core.bool v) { - $_setBool(9, v); - } - + set deprecated($core.bool value) => $_setBool(9, value); @$pb.TagNumber(23) $core.bool hasDeprecated() => $_has(9); @$pb.TagNumber(23) @@ -2181,10 +1884,7 @@ @$pb.TagNumber(27) $core.bool get javaStringCheckUtf8 => $_getBF(10); @$pb.TagNumber(27) - set javaStringCheckUtf8($core.bool v) { - $_setBool(10, v); - } - + set javaStringCheckUtf8($core.bool value) => $_setBool(10, value); @$pb.TagNumber(27) $core.bool hasJavaStringCheckUtf8() => $_has(10); @$pb.TagNumber(27) @@ -2195,10 +1895,7 @@ @$pb.TagNumber(31) $core.bool get ccEnableArenas => $_getB(11, true); @$pb.TagNumber(31) - set ccEnableArenas($core.bool v) { - $_setBool(11, v); - } - + set ccEnableArenas($core.bool value) => $_setBool(11, value); @$pb.TagNumber(31) $core.bool hasCcEnableArenas() => $_has(11); @$pb.TagNumber(31) @@ -2209,10 +1906,7 @@ @$pb.TagNumber(36) $core.String get objcClassPrefix => $_getSZ(12); @$pb.TagNumber(36) - set objcClassPrefix($core.String v) { - $_setString(12, v); - } - + set objcClassPrefix($core.String value) => $_setString(12, value); @$pb.TagNumber(36) $core.bool hasObjcClassPrefix() => $_has(12); @$pb.TagNumber(36) @@ -2222,10 +1916,7 @@ @$pb.TagNumber(37) $core.String get csharpNamespace => $_getSZ(13); @$pb.TagNumber(37) - set csharpNamespace($core.String v) { - $_setString(13, v); - } - + set csharpNamespace($core.String value) => $_setString(13, value); @$pb.TagNumber(37) $core.bool hasCsharpNamespace() => $_has(13); @$pb.TagNumber(37) @@ -2238,10 +1929,7 @@ @$pb.TagNumber(39) $core.String get swiftPrefix => $_getSZ(14); @$pb.TagNumber(39) - set swiftPrefix($core.String v) { - $_setString(14, v); - } - + set swiftPrefix($core.String value) => $_setString(14, value); @$pb.TagNumber(39) $core.bool hasSwiftPrefix() => $_has(14); @$pb.TagNumber(39) @@ -2252,10 +1940,7 @@ @$pb.TagNumber(40) $core.String get phpClassPrefix => $_getSZ(15); @$pb.TagNumber(40) - set phpClassPrefix($core.String v) { - $_setString(15, v); - } - + set phpClassPrefix($core.String value) => $_setString(15, value); @$pb.TagNumber(40) $core.bool hasPhpClassPrefix() => $_has(15); @$pb.TagNumber(40) @@ -2267,10 +1952,7 @@ @$pb.TagNumber(41) $core.String get phpNamespace => $_getSZ(16); @$pb.TagNumber(41) - set phpNamespace($core.String v) { - $_setString(16, v); - } - + set phpNamespace($core.String value) => $_setString(16, value); @$pb.TagNumber(41) $core.bool hasPhpNamespace() => $_has(16); @$pb.TagNumber(41) @@ -2282,10 +1964,7 @@ @$pb.TagNumber(44) $core.String get phpMetadataNamespace => $_getSZ(17); @$pb.TagNumber(44) - set phpMetadataNamespace($core.String v) { - $_setString(17, v); - } - + set phpMetadataNamespace($core.String value) => $_setString(17, value); @$pb.TagNumber(44) $core.bool hasPhpMetadataNamespace() => $_has(17); @$pb.TagNumber(44) @@ -2297,10 +1976,7 @@ @$pb.TagNumber(45) $core.String get rubyPackage => $_getSZ(18); @$pb.TagNumber(45) - set rubyPackage($core.String v) { - $_setString(18, v); - } - + set rubyPackage($core.String value) => $_setString(18, value); @$pb.TagNumber(45) $core.bool hasRubyPackage() => $_has(18); @$pb.TagNumber(45) @@ -2313,10 +1989,7 @@ @$pb.TagNumber(50) FeatureSet get features => $_getN(19); @$pb.TagNumber(50) - set features(FeatureSet v) { - $_setField(50, v); - } - + set features(FeatureSet value) => $_setField(50, value); @$pb.TagNumber(50) $core.bool hasFeatures() => $_has(19); @$pb.TagNumber(50) @@ -2341,39 +2014,30 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (messageSetWireFormat != null) { - $result.messageSetWireFormat = messageSetWireFormat; - } - if (noStandardDescriptorAccessor != null) { - $result.noStandardDescriptorAccessor = noStandardDescriptorAccessor; - } - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (mapEntry != null) { - $result.mapEntry = mapEntry; - } - if (deprecatedLegacyJsonFieldConflicts != null) { - // ignore: deprecated_member_use_from_same_package - $result.deprecatedLegacyJsonFieldConflicts = + final result = create(); + if (messageSetWireFormat != null) + result.messageSetWireFormat = messageSetWireFormat; + if (noStandardDescriptorAccessor != null) + result.noStandardDescriptorAccessor = noStandardDescriptorAccessor; + if (deprecated != null) result.deprecated = deprecated; + if (mapEntry != null) result.mapEntry = mapEntry; + if (deprecatedLegacyJsonFieldConflicts != null) + result.deprecatedLegacyJsonFieldConflicts = deprecatedLegacyJsonFieldConflicts; - } - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - MessageOptions._() : super(); - 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._(); + + factory MessageOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory MessageOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'MessageOptions', @@ -2399,10 +2063,12 @@ super.copyWith((message) => updates(message as MessageOptions)) as MessageOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MessageOptions create() => MessageOptions._(); + @$core.override MessageOptions createEmptyInstance() => create(); static $pb.PbList<MessageOptions> createRepeated() => $pb.PbList<MessageOptions>(); @@ -2432,10 +2098,7 @@ @$pb.TagNumber(1) $core.bool get messageSetWireFormat => $_getBF(0); @$pb.TagNumber(1) - set messageSetWireFormat($core.bool v) { - $_setBool(0, v); - } - + set messageSetWireFormat($core.bool value) => $_setBool(0, value); @$pb.TagNumber(1) $core.bool hasMessageSetWireFormat() => $_has(0); @$pb.TagNumber(1) @@ -2447,10 +2110,7 @@ @$pb.TagNumber(2) $core.bool get noStandardDescriptorAccessor => $_getBF(1); @$pb.TagNumber(2) - set noStandardDescriptorAccessor($core.bool v) { - $_setBool(1, v); - } - + set noStandardDescriptorAccessor($core.bool value) => $_setBool(1, value); @$pb.TagNumber(2) $core.bool hasNoStandardDescriptorAccessor() => $_has(1); @$pb.TagNumber(2) @@ -2463,10 +2123,7 @@ @$pb.TagNumber(3) $core.bool get deprecated => $_getBF(2); @$pb.TagNumber(3) - set deprecated($core.bool v) { - $_setBool(2, v); - } - + set deprecated($core.bool value) => $_setBool(2, value); @$pb.TagNumber(3) $core.bool hasDeprecated() => $_has(2); @$pb.TagNumber(3) @@ -2496,10 +2153,7 @@ @$pb.TagNumber(7) $core.bool get mapEntry => $_getBF(3); @$pb.TagNumber(7) - set mapEntry($core.bool v) { - $_setBool(3, v); - } - + set mapEntry($core.bool value) => $_setBool(3, value); @$pb.TagNumber(7) $core.bool hasMapEntry() => $_has(3); @$pb.TagNumber(7) @@ -2520,10 +2174,8 @@ $core.bool get deprecatedLegacyJsonFieldConflicts => $_getBF(4); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(11) - set deprecatedLegacyJsonFieldConflicts($core.bool v) { - $_setBool(4, v); - } - + set deprecatedLegacyJsonFieldConflicts($core.bool value) => + $_setBool(4, value); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(11) $core.bool hasDeprecatedLegacyJsonFieldConflicts() => $_has(4); @@ -2538,10 +2190,7 @@ @$pb.TagNumber(12) FeatureSet get features => $_getN(5); @$pb.TagNumber(12) - set features(FeatureSet v) { - $_setField(12, v); - } - + set features(FeatureSet value) => $_setField(12, value); @$pb.TagNumber(12) $core.bool hasFeatures() => $_has(5); @$pb.TagNumber(12) @@ -2559,22 +2208,20 @@ $core.String? value, Edition? edition, }) { - final $result = create(); - if (value != null) { - $result.value = value; - } - if (edition != null) { - $result.edition = edition; - } - return $result; + final result = create(); + if (value != null) result.value = value; + if (edition != null) result.edition = edition; + return result; } - FieldOptions_EditionDefault._() : super(); - factory FieldOptions_EditionDefault.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory FieldOptions_EditionDefault.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + FieldOptions_EditionDefault._(); + + factory FieldOptions_EditionDefault.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FieldOptions_EditionDefault.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FieldOptions.EditionDefault', @@ -2598,11 +2245,13 @@ (message) => updates(message as FieldOptions_EditionDefault)) as FieldOptions_EditionDefault; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FieldOptions_EditionDefault create() => FieldOptions_EditionDefault._(); + @$core.override FieldOptions_EditionDefault createEmptyInstance() => create(); static $pb.PbList<FieldOptions_EditionDefault> createRepeated() => $pb.PbList<FieldOptions_EditionDefault>(); @@ -2614,10 +2263,7 @@ @$pb.TagNumber(2) $core.String get value => $_getSZ(0); @$pb.TagNumber(2) - set value($core.String v) { - $_setString(0, v); - } - + set value($core.String value) => $_setString(0, value); @$pb.TagNumber(2) $core.bool hasValue() => $_has(0); @$pb.TagNumber(2) @@ -2626,10 +2272,7 @@ @$pb.TagNumber(3) Edition get edition => $_getN(1); @$pb.TagNumber(3) - set edition(Edition v) { - $_setField(3, v); - } - + set edition(Edition value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasEdition() => $_has(1); @$pb.TagNumber(3) @@ -2644,28 +2287,23 @@ $core.String? deprecationWarning, Edition? editionRemoved, }) { - final $result = create(); - if (editionIntroduced != null) { - $result.editionIntroduced = editionIntroduced; - } - if (editionDeprecated != null) { - $result.editionDeprecated = editionDeprecated; - } - if (deprecationWarning != null) { - $result.deprecationWarning = deprecationWarning; - } - if (editionRemoved != null) { - $result.editionRemoved = editionRemoved; - } - return $result; + final result = create(); + if (editionIntroduced != null) result.editionIntroduced = editionIntroduced; + if (editionDeprecated != null) result.editionDeprecated = editionDeprecated; + if (deprecationWarning != null) + result.deprecationWarning = deprecationWarning; + if (editionRemoved != null) result.editionRemoved = editionRemoved; + return result; } - FieldOptions_FeatureSupport._() : super(); - factory FieldOptions_FeatureSupport.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory FieldOptions_FeatureSupport.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + FieldOptions_FeatureSupport._(); + + factory FieldOptions_FeatureSupport.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FieldOptions_FeatureSupport.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FieldOptions.FeatureSupport', @@ -2699,11 +2337,13 @@ (message) => updates(message as FieldOptions_FeatureSupport)) as FieldOptions_FeatureSupport; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FieldOptions_FeatureSupport create() => FieldOptions_FeatureSupport._(); + @$core.override FieldOptions_FeatureSupport createEmptyInstance() => create(); static $pb.PbList<FieldOptions_FeatureSupport> createRepeated() => $pb.PbList<FieldOptions_FeatureSupport>(); @@ -2718,10 +2358,7 @@ @$pb.TagNumber(1) Edition get editionIntroduced => $_getN(0); @$pb.TagNumber(1) - set editionIntroduced(Edition v) { - $_setField(1, v); - } - + set editionIntroduced(Edition value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasEditionIntroduced() => $_has(0); @$pb.TagNumber(1) @@ -2732,10 +2369,7 @@ @$pb.TagNumber(2) Edition get editionDeprecated => $_getN(1); @$pb.TagNumber(2) - set editionDeprecated(Edition v) { - $_setField(2, v); - } - + set editionDeprecated(Edition value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasEditionDeprecated() => $_has(1); @$pb.TagNumber(2) @@ -2746,10 +2380,7 @@ @$pb.TagNumber(3) $core.String get deprecationWarning => $_getSZ(2); @$pb.TagNumber(3) - set deprecationWarning($core.String v) { - $_setString(2, v); - } - + set deprecationWarning($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasDeprecationWarning() => $_has(2); @$pb.TagNumber(3) @@ -2761,10 +2392,7 @@ @$pb.TagNumber(4) Edition get editionRemoved => $_getN(3); @$pb.TagNumber(4) - set editionRemoved(Edition v) { - $_setField(4, v); - } - + set editionRemoved(Edition value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasEditionRemoved() => $_has(3); @$pb.TagNumber(4) @@ -2788,58 +2416,33 @@ FieldOptions_FeatureSupport? featureSupport, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (ctype != null) { - $result.ctype = ctype; - } - if (packed != null) { - $result.packed = packed; - } - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (lazy != null) { - $result.lazy = lazy; - } - if (jstype != null) { - $result.jstype = jstype; - } - if (weak != null) { - $result.weak = weak; - } - if (unverifiedLazy != null) { - $result.unverifiedLazy = unverifiedLazy; - } - if (debugRedact != null) { - $result.debugRedact = debugRedact; - } - if (retention != null) { - $result.retention = retention; - } - if (targets != null) { - $result.targets.addAll(targets); - } - if (editionDefaults != null) { - $result.editionDefaults.addAll(editionDefaults); - } - if (features != null) { - $result.features = features; - } - if (featureSupport != null) { - $result.featureSupport = featureSupport; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (ctype != null) result.ctype = ctype; + if (packed != null) result.packed = packed; + if (deprecated != null) result.deprecated = deprecated; + if (lazy != null) result.lazy = lazy; + if (jstype != null) result.jstype = jstype; + if (weak != null) result.weak = weak; + if (unverifiedLazy != null) result.unverifiedLazy = unverifiedLazy; + if (debugRedact != null) result.debugRedact = debugRedact; + if (retention != null) result.retention = retention; + if (targets != null) result.targets.addAll(targets); + if (editionDefaults != null) result.editionDefaults.addAll(editionDefaults); + if (features != null) result.features = features; + if (featureSupport != null) result.featureSupport = featureSupport; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - FieldOptions._() : super(); - 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._(); + + factory FieldOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FieldOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FieldOptions', @@ -2892,10 +2495,12 @@ super.copyWith((message) => updates(message as FieldOptions)) as FieldOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FieldOptions create() => FieldOptions._(); + @$core.override FieldOptions createEmptyInstance() => create(); static $pb.PbList<FieldOptions> createRepeated() => $pb.PbList<FieldOptions>(); @@ -2914,10 +2519,7 @@ @$pb.TagNumber(1) FieldOptions_CType get ctype => $_getN(0); @$pb.TagNumber(1) - set ctype(FieldOptions_CType v) { - $_setField(1, v); - } - + set ctype(FieldOptions_CType value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasCtype() => $_has(0); @$pb.TagNumber(1) @@ -2933,10 +2535,7 @@ @$pb.TagNumber(2) $core.bool get packed => $_getBF(1); @$pb.TagNumber(2) - set packed($core.bool v) { - $_setBool(1, v); - } - + set packed($core.bool value) => $_setBool(1, value); @$pb.TagNumber(2) $core.bool hasPacked() => $_has(1); @$pb.TagNumber(2) @@ -2949,10 +2548,7 @@ @$pb.TagNumber(3) $core.bool get deprecated => $_getBF(2); @$pb.TagNumber(3) - set deprecated($core.bool v) { - $_setBool(2, v); - } - + set deprecated($core.bool value) => $_setBool(2, value); @$pb.TagNumber(3) $core.bool hasDeprecated() => $_has(2); @$pb.TagNumber(3) @@ -2983,10 +2579,7 @@ @$pb.TagNumber(5) $core.bool get lazy => $_getBF(3); @$pb.TagNumber(5) - set lazy($core.bool v) { - $_setBool(3, v); - } - + set lazy($core.bool value) => $_setBool(3, value); @$pb.TagNumber(5) $core.bool hasLazy() => $_has(3); @$pb.TagNumber(5) @@ -3006,10 +2599,7 @@ @$pb.TagNumber(6) FieldOptions_JSType get jstype => $_getN(4); @$pb.TagNumber(6) - set jstype(FieldOptions_JSType v) { - $_setField(6, v); - } - + set jstype(FieldOptions_JSType value) => $_setField(6, value); @$pb.TagNumber(6) $core.bool hasJstype() => $_has(4); @$pb.TagNumber(6) @@ -3019,10 +2609,7 @@ @$pb.TagNumber(10) $core.bool get weak => $_getBF(5); @$pb.TagNumber(10) - set weak($core.bool v) { - $_setBool(5, v); - } - + set weak($core.bool value) => $_setBool(5, value); @$pb.TagNumber(10) $core.bool hasWeak() => $_has(5); @$pb.TagNumber(10) @@ -3034,10 +2621,7 @@ @$pb.TagNumber(15) $core.bool get unverifiedLazy => $_getBF(6); @$pb.TagNumber(15) - set unverifiedLazy($core.bool v) { - $_setBool(6, v); - } - + set unverifiedLazy($core.bool value) => $_setBool(6, value); @$pb.TagNumber(15) $core.bool hasUnverifiedLazy() => $_has(6); @$pb.TagNumber(15) @@ -3048,10 +2632,7 @@ @$pb.TagNumber(16) $core.bool get debugRedact => $_getBF(7); @$pb.TagNumber(16) - set debugRedact($core.bool v) { - $_setBool(7, v); - } - + set debugRedact($core.bool value) => $_setBool(7, value); @$pb.TagNumber(16) $core.bool hasDebugRedact() => $_has(7); @$pb.TagNumber(16) @@ -3060,10 +2641,7 @@ @$pb.TagNumber(17) FieldOptions_OptionRetention get retention => $_getN(8); @$pb.TagNumber(17) - set retention(FieldOptions_OptionRetention v) { - $_setField(17, v); - } - + set retention(FieldOptions_OptionRetention value) => $_setField(17, value); @$pb.TagNumber(17) $core.bool hasRetention() => $_has(8); @$pb.TagNumber(17) @@ -3082,10 +2660,7 @@ @$pb.TagNumber(21) FeatureSet get features => $_getN(11); @$pb.TagNumber(21) - set features(FeatureSet v) { - $_setField(21, v); - } - + set features(FeatureSet value) => $_setField(21, value); @$pb.TagNumber(21) $core.bool hasFeatures() => $_has(11); @$pb.TagNumber(21) @@ -3096,10 +2671,8 @@ @$pb.TagNumber(22) FieldOptions_FeatureSupport get featureSupport => $_getN(12); @$pb.TagNumber(22) - set featureSupport(FieldOptions_FeatureSupport v) { - $_setField(22, v); - } - + set featureSupport(FieldOptions_FeatureSupport value) => + $_setField(22, value); @$pb.TagNumber(22) $core.bool hasFeatureSupport() => $_has(12); @$pb.TagNumber(22) @@ -3117,22 +2690,21 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - OneofOptions._() : super(); - 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._(); + + factory OneofOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory OneofOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'OneofOptions', @@ -3153,10 +2725,12 @@ super.copyWith((message) => updates(message as OneofOptions)) as OneofOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static OneofOptions create() => OneofOptions._(); + @$core.override OneofOptions createEmptyInstance() => create(); static $pb.PbList<OneofOptions> createRepeated() => $pb.PbList<OneofOptions>(); @@ -3172,10 +2746,7 @@ @$pb.TagNumber(1) FeatureSet get features => $_getN(0); @$pb.TagNumber(1) - set features(FeatureSet v) { - $_setField(1, v); - } - + set features(FeatureSet value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasFeatures() => $_has(0); @$pb.TagNumber(1) @@ -3197,33 +2768,26 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (allowAlias != null) { - $result.allowAlias = allowAlias; - } - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (deprecatedLegacyJsonFieldConflicts != null) { - // ignore: deprecated_member_use_from_same_package - $result.deprecatedLegacyJsonFieldConflicts = + final result = create(); + if (allowAlias != null) result.allowAlias = allowAlias; + if (deprecated != null) result.deprecated = deprecated; + if (deprecatedLegacyJsonFieldConflicts != null) + result.deprecatedLegacyJsonFieldConflicts = deprecatedLegacyJsonFieldConflicts; - } - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - EnumOptions._() : super(); - 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._(); + + factory EnumOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory EnumOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'EnumOptions', @@ -3247,10 +2811,12 @@ super.copyWith((message) => updates(message as EnumOptions)) as EnumOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EnumOptions create() => EnumOptions._(); + @$core.override EnumOptions createEmptyInstance() => create(); static $pb.PbList<EnumOptions> createRepeated() => $pb.PbList<EnumOptions>(); @$core.pragma('dart2js:noInline') @@ -3263,10 +2829,7 @@ @$pb.TagNumber(2) $core.bool get allowAlias => $_getBF(0); @$pb.TagNumber(2) - set allowAlias($core.bool v) { - $_setBool(0, v); - } - + set allowAlias($core.bool value) => $_setBool(0, value); @$pb.TagNumber(2) $core.bool hasAllowAlias() => $_has(0); @$pb.TagNumber(2) @@ -3279,10 +2842,7 @@ @$pb.TagNumber(3) $core.bool get deprecated => $_getBF(1); @$pb.TagNumber(3) - set deprecated($core.bool v) { - $_setBool(1, v); - } - + set deprecated($core.bool value) => $_setBool(1, value); @$pb.TagNumber(3) $core.bool hasDeprecated() => $_has(1); @$pb.TagNumber(3) @@ -3299,10 +2859,8 @@ $core.bool get deprecatedLegacyJsonFieldConflicts => $_getBF(2); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(6) - set deprecatedLegacyJsonFieldConflicts($core.bool v) { - $_setBool(2, v); - } - + set deprecatedLegacyJsonFieldConflicts($core.bool value) => + $_setBool(2, value); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(6) $core.bool hasDeprecatedLegacyJsonFieldConflicts() => $_has(2); @@ -3317,10 +2875,7 @@ @$pb.TagNumber(7) FeatureSet get features => $_getN(3); @$pb.TagNumber(7) - set features(FeatureSet v) { - $_setField(7, v); - } - + set features(FeatureSet value) => $_setField(7, value); @$pb.TagNumber(7) $core.bool hasFeatures() => $_has(3); @$pb.TagNumber(7) @@ -3341,31 +2896,24 @@ FieldOptions_FeatureSupport? featureSupport, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (features != null) { - $result.features = features; - } - if (debugRedact != null) { - $result.debugRedact = debugRedact; - } - if (featureSupport != null) { - $result.featureSupport = featureSupport; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (deprecated != null) result.deprecated = deprecated; + if (features != null) result.features = features; + if (debugRedact != null) result.debugRedact = debugRedact; + if (featureSupport != null) result.featureSupport = featureSupport; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - EnumValueOptions._() : super(); - 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._(); + + factory EnumValueOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory EnumValueOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'EnumValueOptions', @@ -3391,10 +2939,12 @@ super.copyWith((message) => updates(message as EnumValueOptions)) as EnumValueOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EnumValueOptions create() => EnumValueOptions._(); + @$core.override EnumValueOptions createEmptyInstance() => create(); static $pb.PbList<EnumValueOptions> createRepeated() => $pb.PbList<EnumValueOptions>(); @@ -3410,10 +2960,7 @@ @$pb.TagNumber(1) $core.bool get deprecated => $_getBF(0); @$pb.TagNumber(1) - set deprecated($core.bool v) { - $_setBool(0, v); - } - + set deprecated($core.bool value) => $_setBool(0, value); @$pb.TagNumber(1) $core.bool hasDeprecated() => $_has(0); @$pb.TagNumber(1) @@ -3426,10 +2973,7 @@ @$pb.TagNumber(2) FeatureSet get features => $_getN(1); @$pb.TagNumber(2) - set features(FeatureSet v) { - $_setField(2, v); - } - + set features(FeatureSet value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasFeatures() => $_has(1); @$pb.TagNumber(2) @@ -3443,10 +2987,7 @@ @$pb.TagNumber(3) $core.bool get debugRedact => $_getBF(2); @$pb.TagNumber(3) - set debugRedact($core.bool v) { - $_setBool(2, v); - } - + set debugRedact($core.bool value) => $_setBool(2, value); @$pb.TagNumber(3) $core.bool hasDebugRedact() => $_has(2); @$pb.TagNumber(3) @@ -3456,10 +2997,7 @@ @$pb.TagNumber(4) FieldOptions_FeatureSupport get featureSupport => $_getN(3); @$pb.TagNumber(4) - set featureSupport(FieldOptions_FeatureSupport v) { - $_setField(4, v); - } - + set featureSupport(FieldOptions_FeatureSupport value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasFeatureSupport() => $_has(3); @$pb.TagNumber(4) @@ -3478,25 +3016,22 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (deprecated != null) result.deprecated = deprecated; + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - ServiceOptions._() : super(); - 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._(); + + factory ServiceOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory ServiceOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'ServiceOptions', @@ -3518,10 +3053,12 @@ super.copyWith((message) => updates(message as ServiceOptions)) as ServiceOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ServiceOptions create() => ServiceOptions._(); + @$core.override ServiceOptions createEmptyInstance() => create(); static $pb.PbList<ServiceOptions> createRepeated() => $pb.PbList<ServiceOptions>(); @@ -3537,10 +3074,7 @@ @$pb.TagNumber(33) $core.bool get deprecated => $_getBF(0); @$pb.TagNumber(33) - set deprecated($core.bool v) { - $_setBool(0, v); - } - + set deprecated($core.bool value) => $_setBool(0, value); @$pb.TagNumber(33) $core.bool hasDeprecated() => $_has(0); @$pb.TagNumber(33) @@ -3553,10 +3087,7 @@ @$pb.TagNumber(34) FeatureSet get features => $_getN(1); @$pb.TagNumber(34) - set features(FeatureSet v) { - $_setField(34, v); - } - + set features(FeatureSet value) => $_setField(34, value); @$pb.TagNumber(34) $core.bool hasFeatures() => $_has(1); @$pb.TagNumber(34) @@ -3576,28 +3107,23 @@ FeatureSet? features, $core.Iterable<UninterpretedOption>? uninterpretedOption, }) { - final $result = create(); - if (deprecated != null) { - $result.deprecated = deprecated; - } - if (idempotencyLevel != null) { - $result.idempotencyLevel = idempotencyLevel; - } - if (features != null) { - $result.features = features; - } - if (uninterpretedOption != null) { - $result.uninterpretedOption.addAll(uninterpretedOption); - } - return $result; + final result = create(); + if (deprecated != null) result.deprecated = deprecated; + if (idempotencyLevel != null) result.idempotencyLevel = idempotencyLevel; + if (features != null) result.features = features; + if (uninterpretedOption != null) + result.uninterpretedOption.addAll(uninterpretedOption); + return result; } - MethodOptions._() : super(); - 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._(); + + factory MethodOptions.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory MethodOptions.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'MethodOptions', @@ -3624,10 +3150,12 @@ super.copyWith((message) => updates(message as MethodOptions)) as MethodOptions; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MethodOptions create() => MethodOptions._(); + @$core.override MethodOptions createEmptyInstance() => create(); static $pb.PbList<MethodOptions> createRepeated() => $pb.PbList<MethodOptions>(); @@ -3643,10 +3171,7 @@ @$pb.TagNumber(33) $core.bool get deprecated => $_getBF(0); @$pb.TagNumber(33) - set deprecated($core.bool v) { - $_setBool(0, v); - } - + set deprecated($core.bool value) => $_setBool(0, value); @$pb.TagNumber(33) $core.bool hasDeprecated() => $_has(0); @$pb.TagNumber(33) @@ -3655,10 +3180,8 @@ @$pb.TagNumber(34) MethodOptions_IdempotencyLevel get idempotencyLevel => $_getN(1); @$pb.TagNumber(34) - set idempotencyLevel(MethodOptions_IdempotencyLevel v) { - $_setField(34, v); - } - + set idempotencyLevel(MethodOptions_IdempotencyLevel value) => + $_setField(34, value); @$pb.TagNumber(34) $core.bool hasIdempotencyLevel() => $_has(1); @$pb.TagNumber(34) @@ -3671,10 +3194,7 @@ @$pb.TagNumber(35) FeatureSet get features => $_getN(2); @$pb.TagNumber(35) - set features(FeatureSet v) { - $_setField(35, v); - } - + set features(FeatureSet value) => $_setField(35, value); @$pb.TagNumber(35) $core.bool hasFeatures() => $_has(2); @$pb.TagNumber(35) @@ -3697,22 +3217,20 @@ $core.String? namePart, $core.bool? isExtension, }) { - final $result = create(); - if (namePart != null) { - $result.namePart = namePart; - } - if (isExtension != null) { - $result.isExtension = isExtension; - } - return $result; + final result = create(); + if (namePart != null) result.namePart = namePart; + if (isExtension != null) result.isExtension = isExtension; + return result; } - UninterpretedOption_NamePart._() : super(); - 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._(); + + factory UninterpretedOption_NamePart.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory UninterpretedOption_NamePart.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'UninterpretedOption.NamePart', @@ -3733,11 +3251,13 @@ (message) => updates(message as UninterpretedOption_NamePart)) as UninterpretedOption_NamePart; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static UninterpretedOption_NamePart create() => UninterpretedOption_NamePart._(); + @$core.override UninterpretedOption_NamePart createEmptyInstance() => create(); static $pb.PbList<UninterpretedOption_NamePart> createRepeated() => $pb.PbList<UninterpretedOption_NamePart>(); @@ -3749,10 +3269,7 @@ @$pb.TagNumber(1) $core.String get namePart => $_getSZ(0); @$pb.TagNumber(1) - set namePart($core.String v) { - $_setString(0, v); - } - + set namePart($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasNamePart() => $_has(0); @$pb.TagNumber(1) @@ -3761,10 +3278,7 @@ @$pb.TagNumber(2) $core.bool get isExtension => $_getBF(1); @$pb.TagNumber(2) - set isExtension($core.bool v) { - $_setBool(1, v); - } - + set isExtension($core.bool value) => $_setBool(1, value); @$pb.TagNumber(2) $core.bool hasIsExtension() => $_has(1); @$pb.TagNumber(2) @@ -3787,37 +3301,25 @@ $core.List<$core.int>? stringValue, $core.String? aggregateValue, }) { - final $result = create(); - if (name != null) { - $result.name.addAll(name); - } - if (identifierValue != null) { - $result.identifierValue = identifierValue; - } - if (positiveIntValue != null) { - $result.positiveIntValue = positiveIntValue; - } - if (negativeIntValue != null) { - $result.negativeIntValue = negativeIntValue; - } - if (doubleValue != null) { - $result.doubleValue = doubleValue; - } - if (stringValue != null) { - $result.stringValue = stringValue; - } - if (aggregateValue != null) { - $result.aggregateValue = aggregateValue; - } - return $result; + final result = create(); + if (name != null) result.name.addAll(name); + if (identifierValue != null) result.identifierValue = identifierValue; + if (positiveIntValue != null) result.positiveIntValue = positiveIntValue; + if (negativeIntValue != null) result.negativeIntValue = negativeIntValue; + if (doubleValue != null) result.doubleValue = doubleValue; + if (stringValue != null) result.stringValue = stringValue; + if (aggregateValue != null) result.aggregateValue = aggregateValue; + return result; } - UninterpretedOption._() : super(); - 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._(); + + factory UninterpretedOption.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory UninterpretedOption.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'UninterpretedOption', @@ -3845,10 +3347,12 @@ super.copyWith((message) => updates(message as UninterpretedOption)) as UninterpretedOption; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static UninterpretedOption create() => UninterpretedOption._(); + @$core.override UninterpretedOption createEmptyInstance() => create(); static $pb.PbList<UninterpretedOption> createRepeated() => $pb.PbList<UninterpretedOption>(); @@ -3865,10 +3369,7 @@ @$pb.TagNumber(3) $core.String get identifierValue => $_getSZ(1); @$pb.TagNumber(3) - set identifierValue($core.String v) { - $_setString(1, v); - } - + set identifierValue($core.String value) => $_setString(1, value); @$pb.TagNumber(3) $core.bool hasIdentifierValue() => $_has(1); @$pb.TagNumber(3) @@ -3877,10 +3378,7 @@ @$pb.TagNumber(4) $fixnum.Int64 get positiveIntValue => $_getI64(2); @$pb.TagNumber(4) - set positiveIntValue($fixnum.Int64 v) { - $_setInt64(2, v); - } - + set positiveIntValue($fixnum.Int64 value) => $_setInt64(2, value); @$pb.TagNumber(4) $core.bool hasPositiveIntValue() => $_has(2); @$pb.TagNumber(4) @@ -3889,10 +3387,7 @@ @$pb.TagNumber(5) $fixnum.Int64 get negativeIntValue => $_getI64(3); @$pb.TagNumber(5) - set negativeIntValue($fixnum.Int64 v) { - $_setInt64(3, v); - } - + set negativeIntValue($fixnum.Int64 value) => $_setInt64(3, value); @$pb.TagNumber(5) $core.bool hasNegativeIntValue() => $_has(3); @$pb.TagNumber(5) @@ -3901,10 +3396,7 @@ @$pb.TagNumber(6) $core.double get doubleValue => $_getN(4); @$pb.TagNumber(6) - set doubleValue($core.double v) { - $_setDouble(4, v); - } - + set doubleValue($core.double value) => $_setDouble(4, value); @$pb.TagNumber(6) $core.bool hasDoubleValue() => $_has(4); @$pb.TagNumber(6) @@ -3913,10 +3405,7 @@ @$pb.TagNumber(7) $core.List<$core.int> get stringValue => $_getN(5); @$pb.TagNumber(7) - set stringValue($core.List<$core.int> v) { - $_setBytes(5, v); - } - + set stringValue($core.List<$core.int> value) => $_setBytes(5, value); @$pb.TagNumber(7) $core.bool hasStringValue() => $_has(5); @$pb.TagNumber(7) @@ -3925,10 +3414,7 @@ @$pb.TagNumber(8) $core.String get aggregateValue => $_getSZ(6); @$pb.TagNumber(8) - set aggregateValue($core.String v) { - $_setString(6, v); - } - + set aggregateValue($core.String value) => $_setString(6, value); @$pb.TagNumber(8) $core.bool hasAggregateValue() => $_has(6); @$pb.TagNumber(8) @@ -3937,13 +3423,15 @@ class FeatureSet_VisibilityFeature extends $pb.GeneratedMessage { factory FeatureSet_VisibilityFeature() => create(); - FeatureSet_VisibilityFeature._() : super(); - factory FeatureSet_VisibilityFeature.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory FeatureSet_VisibilityFeature.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + FeatureSet_VisibilityFeature._(); + + factory FeatureSet_VisibilityFeature.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FeatureSet_VisibilityFeature.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FeatureSet.VisibilityFeature', @@ -3962,11 +3450,13 @@ (message) => updates(message as FeatureSet_VisibilityFeature)) as FeatureSet_VisibilityFeature; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FeatureSet_VisibilityFeature create() => FeatureSet_VisibilityFeature._(); + @$core.override FeatureSet_VisibilityFeature createEmptyInstance() => create(); static $pb.PbList<FeatureSet_VisibilityFeature> createRepeated() => $pb.PbList<FeatureSet_VisibilityFeature>(); @@ -3994,40 +3484,29 @@ FeatureSet_VisibilityFeature_DefaultSymbolVisibility? defaultSymbolVisibility, }) { - final $result = create(); - if (fieldPresence != null) { - $result.fieldPresence = fieldPresence; - } - if (enumType != null) { - $result.enumType = enumType; - } - if (repeatedFieldEncoding != null) { - $result.repeatedFieldEncoding = repeatedFieldEncoding; - } - if (utf8Validation != null) { - $result.utf8Validation = utf8Validation; - } - if (messageEncoding != null) { - $result.messageEncoding = messageEncoding; - } - if (jsonFormat != null) { - $result.jsonFormat = jsonFormat; - } - if (enforceNamingStyle != null) { - $result.enforceNamingStyle = enforceNamingStyle; - } - if (defaultSymbolVisibility != null) { - $result.defaultSymbolVisibility = defaultSymbolVisibility; - } - return $result; + final result = create(); + if (fieldPresence != null) result.fieldPresence = fieldPresence; + if (enumType != null) result.enumType = enumType; + if (repeatedFieldEncoding != null) + result.repeatedFieldEncoding = repeatedFieldEncoding; + if (utf8Validation != null) result.utf8Validation = utf8Validation; + if (messageEncoding != null) result.messageEncoding = messageEncoding; + if (jsonFormat != null) result.jsonFormat = jsonFormat; + if (enforceNamingStyle != null) + result.enforceNamingStyle = enforceNamingStyle; + if (defaultSymbolVisibility != null) + result.defaultSymbolVisibility = defaultSymbolVisibility; + return result; } - FeatureSet._() : super(); - factory FeatureSet.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory FeatureSet.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + FeatureSet._(); + + factory FeatureSet.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FeatureSet.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FeatureSet', @@ -4085,10 +3564,12 @@ FeatureSet copyWith(void Function(FeatureSet) updates) => super.copyWith((message) => updates(message as FeatureSet)) as FeatureSet; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FeatureSet create() => FeatureSet._(); + @$core.override FeatureSet createEmptyInstance() => create(); static $pb.PbList<FeatureSet> createRepeated() => $pb.PbList<FeatureSet>(); @$core.pragma('dart2js:noInline') @@ -4099,10 +3580,7 @@ @$pb.TagNumber(1) FeatureSet_FieldPresence get fieldPresence => $_getN(0); @$pb.TagNumber(1) - set fieldPresence(FeatureSet_FieldPresence v) { - $_setField(1, v); - } - + set fieldPresence(FeatureSet_FieldPresence value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasFieldPresence() => $_has(0); @$pb.TagNumber(1) @@ -4111,10 +3589,7 @@ @$pb.TagNumber(2) FeatureSet_EnumType get enumType => $_getN(1); @$pb.TagNumber(2) - set enumType(FeatureSet_EnumType v) { - $_setField(2, v); - } - + set enumType(FeatureSet_EnumType value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasEnumType() => $_has(1); @$pb.TagNumber(2) @@ -4123,10 +3598,8 @@ @$pb.TagNumber(3) FeatureSet_RepeatedFieldEncoding get repeatedFieldEncoding => $_getN(2); @$pb.TagNumber(3) - set repeatedFieldEncoding(FeatureSet_RepeatedFieldEncoding v) { - $_setField(3, v); - } - + set repeatedFieldEncoding(FeatureSet_RepeatedFieldEncoding value) => + $_setField(3, value); @$pb.TagNumber(3) $core.bool hasRepeatedFieldEncoding() => $_has(2); @$pb.TagNumber(3) @@ -4135,10 +3608,7 @@ @$pb.TagNumber(4) FeatureSet_Utf8Validation get utf8Validation => $_getN(3); @$pb.TagNumber(4) - set utf8Validation(FeatureSet_Utf8Validation v) { - $_setField(4, v); - } - + set utf8Validation(FeatureSet_Utf8Validation value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasUtf8Validation() => $_has(3); @$pb.TagNumber(4) @@ -4147,10 +3617,7 @@ @$pb.TagNumber(5) FeatureSet_MessageEncoding get messageEncoding => $_getN(4); @$pb.TagNumber(5) - set messageEncoding(FeatureSet_MessageEncoding v) { - $_setField(5, v); - } - + set messageEncoding(FeatureSet_MessageEncoding value) => $_setField(5, value); @$pb.TagNumber(5) $core.bool hasMessageEncoding() => $_has(4); @$pb.TagNumber(5) @@ -4159,10 +3626,7 @@ @$pb.TagNumber(6) FeatureSet_JsonFormat get jsonFormat => $_getN(5); @$pb.TagNumber(6) - set jsonFormat(FeatureSet_JsonFormat v) { - $_setField(6, v); - } - + set jsonFormat(FeatureSet_JsonFormat value) => $_setField(6, value); @$pb.TagNumber(6) $core.bool hasJsonFormat() => $_has(5); @$pb.TagNumber(6) @@ -4171,10 +3635,8 @@ @$pb.TagNumber(7) FeatureSet_EnforceNamingStyle get enforceNamingStyle => $_getN(6); @$pb.TagNumber(7) - set enforceNamingStyle(FeatureSet_EnforceNamingStyle v) { - $_setField(7, v); - } - + set enforceNamingStyle(FeatureSet_EnforceNamingStyle value) => + $_setField(7, value); @$pb.TagNumber(7) $core.bool hasEnforceNamingStyle() => $_has(6); @$pb.TagNumber(7) @@ -4185,10 +3647,8 @@ get defaultSymbolVisibility => $_getN(7); @$pb.TagNumber(8) set defaultSymbolVisibility( - FeatureSet_VisibilityFeature_DefaultSymbolVisibility v) { - $_setField(8, v); - } - + FeatureSet_VisibilityFeature_DefaultSymbolVisibility value) => + $_setField(8, value); @$pb.TagNumber(8) $core.bool hasDefaultSymbolVisibility() => $_has(7); @$pb.TagNumber(8) @@ -4205,26 +3665,24 @@ FeatureSet? overridableFeatures, FeatureSet? fixedFeatures, }) { - final $result = create(); - if (edition != null) { - $result.edition = edition; - } - if (overridableFeatures != null) { - $result.overridableFeatures = overridableFeatures; - } - if (fixedFeatures != null) { - $result.fixedFeatures = fixedFeatures; - } - return $result; + final result = create(); + if (edition != null) result.edition = edition; + if (overridableFeatures != null) + result.overridableFeatures = overridableFeatures; + if (fixedFeatures != null) result.fixedFeatures = fixedFeatures; + return result; } - FeatureSetDefaults_FeatureSetEditionDefault._() : super(); + + FeatureSetDefaults_FeatureSetEditionDefault._(); + factory FeatureSetDefaults_FeatureSetEditionDefault.fromBuffer( - $core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory FeatureSetDefaults_FeatureSetEditionDefault.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + $core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FeatureSetDefaults_FeatureSetEditionDefault.fromJson( + $core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FeatureSetDefaults.FeatureSetEditionDefault', @@ -4250,11 +3708,13 @@ updates(message as FeatureSetDefaults_FeatureSetEditionDefault)) as FeatureSetDefaults_FeatureSetEditionDefault; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FeatureSetDefaults_FeatureSetEditionDefault create() => FeatureSetDefaults_FeatureSetEditionDefault._(); + @$core.override FeatureSetDefaults_FeatureSetEditionDefault createEmptyInstance() => create(); static $pb.PbList<FeatureSetDefaults_FeatureSetEditionDefault> createRepeated() => @@ -4268,10 +3728,7 @@ @$pb.TagNumber(3) Edition get edition => $_getN(0); @$pb.TagNumber(3) - set edition(Edition v) { - $_setField(3, v); - } - + set edition(Edition value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasEdition() => $_has(0); @$pb.TagNumber(3) @@ -4281,10 +3738,7 @@ @$pb.TagNumber(4) FeatureSet get overridableFeatures => $_getN(1); @$pb.TagNumber(4) - set overridableFeatures(FeatureSet v) { - $_setField(4, v); - } - + set overridableFeatures(FeatureSet value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasOverridableFeatures() => $_has(1); @$pb.TagNumber(4) @@ -4296,10 +3750,7 @@ @$pb.TagNumber(5) FeatureSet get fixedFeatures => $_getN(2); @$pb.TagNumber(5) - set fixedFeatures(FeatureSet v) { - $_setField(5, v); - } - + set fixedFeatures(FeatureSet value) => $_setField(5, value); @$pb.TagNumber(5) $core.bool hasFixedFeatures() => $_has(2); @$pb.TagNumber(5) @@ -4318,25 +3769,21 @@ Edition? minimumEdition, Edition? maximumEdition, }) { - final $result = create(); - if (defaults != null) { - $result.defaults.addAll(defaults); - } - if (minimumEdition != null) { - $result.minimumEdition = minimumEdition; - } - if (maximumEdition != null) { - $result.maximumEdition = maximumEdition; - } - return $result; + final result = create(); + if (defaults != null) result.defaults.addAll(defaults); + if (minimumEdition != null) result.minimumEdition = minimumEdition; + if (maximumEdition != null) result.maximumEdition = maximumEdition; + return result; } - FeatureSetDefaults._() : super(); - factory FeatureSetDefaults.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory FeatureSetDefaults.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + FeatureSetDefaults._(); + + factory FeatureSetDefaults.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory FeatureSetDefaults.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'FeatureSetDefaults', @@ -4362,10 +3809,12 @@ super.copyWith((message) => updates(message as FeatureSetDefaults)) as FeatureSetDefaults; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static FeatureSetDefaults create() => FeatureSetDefaults._(); + @$core.override FeatureSetDefaults createEmptyInstance() => create(); static $pb.PbList<FeatureSetDefaults> createRepeated() => $pb.PbList<FeatureSetDefaults>(); @@ -4383,10 +3832,7 @@ @$pb.TagNumber(4) Edition get minimumEdition => $_getN(1); @$pb.TagNumber(4) - set minimumEdition(Edition v) { - $_setField(4, v); - } - + set minimumEdition(Edition value) => $_setField(4, value); @$pb.TagNumber(4) $core.bool hasMinimumEdition() => $_has(1); @$pb.TagNumber(4) @@ -4397,10 +3843,7 @@ @$pb.TagNumber(5) Edition get maximumEdition => $_getN(2); @$pb.TagNumber(5) - set maximumEdition(Edition v) { - $_setField(5, v); - } - + set maximumEdition(Edition value) => $_setField(5, value); @$pb.TagNumber(5) $core.bool hasMaximumEdition() => $_has(2); @$pb.TagNumber(5) @@ -4415,31 +3858,24 @@ $core.String? trailingComments, $core.Iterable<$core.String>? leadingDetachedComments, }) { - final $result = create(); - if (path != null) { - $result.path.addAll(path); - } - if (span != null) { - $result.span.addAll(span); - } - if (leadingComments != null) { - $result.leadingComments = leadingComments; - } - if (trailingComments != null) { - $result.trailingComments = trailingComments; - } - if (leadingDetachedComments != null) { - $result.leadingDetachedComments.addAll(leadingDetachedComments); - } - return $result; + final result = create(); + if (path != null) result.path.addAll(path); + if (span != null) result.span.addAll(span); + if (leadingComments != null) result.leadingComments = leadingComments; + if (trailingComments != null) result.trailingComments = trailingComments; + if (leadingDetachedComments != null) + result.leadingDetachedComments.addAll(leadingDetachedComments); + return result; } - SourceCodeInfo_Location._() : super(); - 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._(); + + factory SourceCodeInfo_Location.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory SourceCodeInfo_Location.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'SourceCodeInfo.Location', @@ -4462,10 +3898,12 @@ super.copyWith((message) => updates(message as SourceCodeInfo_Location)) as SourceCodeInfo_Location; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static SourceCodeInfo_Location create() => SourceCodeInfo_Location._(); + @$core.override SourceCodeInfo_Location createEmptyInstance() => create(); static $pb.PbList<SourceCodeInfo_Location> createRepeated() => $pb.PbList<SourceCodeInfo_Location>(); @@ -4558,10 +3996,7 @@ @$pb.TagNumber(3) $core.String get leadingComments => $_getSZ(2); @$pb.TagNumber(3) - set leadingComments($core.String v) { - $_setString(2, v); - } - + set leadingComments($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasLeadingComments() => $_has(2); @$pb.TagNumber(3) @@ -4570,10 +4005,7 @@ @$pb.TagNumber(4) $core.String get trailingComments => $_getSZ(3); @$pb.TagNumber(4) - set trailingComments($core.String v) { - $_setString(3, v); - } - + set trailingComments($core.String value) => $_setString(3, value); @$pb.TagNumber(4) $core.bool hasTrailingComments() => $_has(3); @$pb.TagNumber(4) @@ -4589,19 +4021,19 @@ factory SourceCodeInfo({ $core.Iterable<SourceCodeInfo_Location>? location, }) { - final $result = create(); - if (location != null) { - $result.location.addAll(location); - } - return $result; + final result = create(); + if (location != null) result.location.addAll(location); + return result; } - SourceCodeInfo._() : super(); - 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._(); + + factory SourceCodeInfo.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory SourceCodeInfo.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'SourceCodeInfo', @@ -4620,10 +4052,12 @@ super.copyWith((message) => updates(message as SourceCodeInfo)) as SourceCodeInfo; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static SourceCodeInfo create() => SourceCodeInfo._(); + @$core.override SourceCodeInfo createEmptyInstance() => create(); static $pb.PbList<SourceCodeInfo> createRepeated() => $pb.PbList<SourceCodeInfo>(); @@ -4687,31 +4121,23 @@ $core.int? end, GeneratedCodeInfo_Annotation_Semantic? semantic, }) { - final $result = create(); - if (path != null) { - $result.path.addAll(path); - } - if (sourceFile != null) { - $result.sourceFile = sourceFile; - } - if (begin != null) { - $result.begin = begin; - } - if (end != null) { - $result.end = end; - } - if (semantic != null) { - $result.semantic = semantic; - } - return $result; + final result = create(); + if (path != null) result.path.addAll(path); + if (sourceFile != null) result.sourceFile = sourceFile; + if (begin != null) result.begin = begin; + if (end != null) result.end = end; + if (semantic != null) result.semantic = semantic; + return result; } - GeneratedCodeInfo_Annotation._() : super(); - 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._(); + + factory GeneratedCodeInfo_Annotation.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory GeneratedCodeInfo_Annotation.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'GeneratedCodeInfo.Annotation', @@ -4739,11 +4165,13 @@ (message) => updates(message as GeneratedCodeInfo_Annotation)) as GeneratedCodeInfo_Annotation; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static GeneratedCodeInfo_Annotation create() => GeneratedCodeInfo_Annotation._(); + @$core.override GeneratedCodeInfo_Annotation createEmptyInstance() => create(); static $pb.PbList<GeneratedCodeInfo_Annotation> createRepeated() => $pb.PbList<GeneratedCodeInfo_Annotation>(); @@ -4761,10 +4189,7 @@ @$pb.TagNumber(2) $core.String get sourceFile => $_getSZ(1); @$pb.TagNumber(2) - set sourceFile($core.String v) { - $_setString(1, v); - } - + set sourceFile($core.String value) => $_setString(1, value); @$pb.TagNumber(2) $core.bool hasSourceFile() => $_has(1); @$pb.TagNumber(2) @@ -4775,10 +4200,7 @@ @$pb.TagNumber(3) $core.int get begin => $_getIZ(2); @$pb.TagNumber(3) - set begin($core.int v) { - $_setSignedInt32(2, v); - } - + set begin($core.int value) => $_setSignedInt32(2, value); @$pb.TagNumber(3) $core.bool hasBegin() => $_has(2); @$pb.TagNumber(3) @@ -4790,10 +4212,7 @@ @$pb.TagNumber(4) $core.int get end => $_getIZ(3); @$pb.TagNumber(4) - set end($core.int v) { - $_setSignedInt32(3, v); - } - + set end($core.int value) => $_setSignedInt32(3, value); @$pb.TagNumber(4) $core.bool hasEnd() => $_has(3); @$pb.TagNumber(4) @@ -4802,10 +4221,8 @@ @$pb.TagNumber(5) GeneratedCodeInfo_Annotation_Semantic get semantic => $_getN(4); @$pb.TagNumber(5) - set semantic(GeneratedCodeInfo_Annotation_Semantic v) { - $_setField(5, v); - } - + set semantic(GeneratedCodeInfo_Annotation_Semantic value) => + $_setField(5, value); @$pb.TagNumber(5) $core.bool hasSemantic() => $_has(4); @$pb.TagNumber(5) @@ -4819,19 +4236,19 @@ factory GeneratedCodeInfo({ $core.Iterable<GeneratedCodeInfo_Annotation>? annotation, }) { - final $result = create(); - if (annotation != null) { - $result.annotation.addAll(annotation); - } - return $result; + final result = create(); + if (annotation != null) result.annotation.addAll(annotation); + return result; } - GeneratedCodeInfo._() : super(); - 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._(); + + factory GeneratedCodeInfo.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory GeneratedCodeInfo.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'GeneratedCodeInfo', @@ -4850,10 +4267,12 @@ super.copyWith((message) => updates(message as GeneratedCodeInfo)) as GeneratedCodeInfo; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static GeneratedCodeInfo create() => GeneratedCodeInfo._(); + @$core.override GeneratedCodeInfo createEmptyInstance() => create(); static $pb.PbList<GeneratedCodeInfo> createRepeated() => $pb.PbList<GeneratedCodeInfo>(); @@ -4868,6 +4287,7 @@ $pb.PbList<GeneratedCodeInfo_Annotation> get annotation => $_getList(0); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart index 362e0c3..d8b96fe 100644 --- a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart +++ b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -79,7 +80,7 @@ $pb.ProtobufEnum.initByValue(values); static Edition? valueOf($core.int value) => _byValue[value]; - const Edition._(super.v, super.n); + const Edition._(super.value, super.name); } /// Describes the 'visibility' of a symbol with respect to the proto import @@ -106,7 +107,7 @@ static SymbolVisibility? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const SymbolVisibility._(super.v, super.n); + const SymbolVisibility._(super.value, super.name); } /// The verification state of the extension range. @@ -130,7 +131,7 @@ static ExtensionRangeOptions_VerificationState? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const ExtensionRangeOptions_VerificationState._(super.v, super.n); + const ExtensionRangeOptions_VerificationState._(super.value, super.name); } class FieldDescriptorProto_Type extends $pb.ProtobufEnum { @@ -214,7 +215,7 @@ static FieldDescriptorProto_Type? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FieldDescriptorProto_Type._(super.v, super.n); + const FieldDescriptorProto_Type._(super.value, super.name); } class FieldDescriptorProto_Label extends $pb.ProtobufEnum { @@ -242,7 +243,7 @@ static FieldDescriptorProto_Label? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FieldDescriptorProto_Label._(super.v, super.n); + const FieldDescriptorProto_Label._(super.value, super.name); } /// Generated classes can be optimized for speed or code size. @@ -268,7 +269,7 @@ static FileOptions_OptimizeMode? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FileOptions_OptimizeMode._(super.v, super.n); + const FileOptions_OptimizeMode._(super.value, super.name); } class FieldOptions_CType extends $pb.ProtobufEnum { @@ -298,7 +299,7 @@ static FieldOptions_CType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FieldOptions_CType._(super.v, super.n); + const FieldOptions_CType._(super.value, super.name); } class FieldOptions_JSType extends $pb.ProtobufEnum { @@ -325,7 +326,7 @@ static FieldOptions_JSType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FieldOptions_JSType._(super.v, super.n); + const FieldOptions_JSType._(super.value, super.name); } /// If set to RETENTION_SOURCE, the option will be omitted from the binary. @@ -352,7 +353,7 @@ static FieldOptions_OptionRetention? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FieldOptions_OptionRetention._(super.v, super.n); + const FieldOptions_OptionRetention._(super.value, super.name); } /// This indicates the types of entities that the field may apply to when used @@ -409,7 +410,7 @@ static FieldOptions_OptionTargetType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FieldOptions_OptionTargetType._(super.v, super.n); + const FieldOptions_OptionTargetType._(super.value, super.name); } /// Is this method side-effect-free (or safe in HTTP parlance), or idempotent, @@ -437,7 +438,7 @@ static MethodOptions_IdempotencyLevel? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const MethodOptions_IdempotencyLevel._(super.v, super.n); + const MethodOptions_IdempotencyLevel._(super.value, super.name); } class FeatureSet_FieldPresence extends $pb.ProtobufEnum { @@ -464,7 +465,7 @@ static FeatureSet_FieldPresence? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_FieldPresence._(super.v, super.n); + const FeatureSet_FieldPresence._(super.value, super.name); } class FeatureSet_EnumType extends $pb.ProtobufEnum { @@ -486,7 +487,7 @@ static FeatureSet_EnumType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_EnumType._(super.v, super.n); + const FeatureSet_EnumType._(super.value, super.name); } class FeatureSet_RepeatedFieldEncoding extends $pb.ProtobufEnum { @@ -510,7 +511,7 @@ static FeatureSet_RepeatedFieldEncoding? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_RepeatedFieldEncoding._(super.v, super.n); + const FeatureSet_RepeatedFieldEncoding._(super.value, super.name); } class FeatureSet_Utf8Validation extends $pb.ProtobufEnum { @@ -534,7 +535,7 @@ static FeatureSet_Utf8Validation? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_Utf8Validation._(super.v, super.n); + const FeatureSet_Utf8Validation._(super.value, super.name); } class FeatureSet_MessageEncoding extends $pb.ProtobufEnum { @@ -558,7 +559,7 @@ static FeatureSet_MessageEncoding? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_MessageEncoding._(super.v, super.n); + const FeatureSet_MessageEncoding._(super.value, super.name); } class FeatureSet_JsonFormat extends $pb.ProtobufEnum { @@ -581,7 +582,7 @@ static FeatureSet_JsonFormat? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_JsonFormat._(super.v, super.n); + const FeatureSet_JsonFormat._(super.value, super.name); } class FeatureSet_EnforceNamingStyle extends $pb.ProtobufEnum { @@ -605,7 +606,7 @@ static FeatureSet_EnforceNamingStyle? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const FeatureSet_EnforceNamingStyle._(super.v, super.n); + const FeatureSet_EnforceNamingStyle._(super.value, super.name); } class FeatureSet_VisibilityFeature_DefaultSymbolVisibility @@ -653,7 +654,7 @@ value < 0 || value >= _byValue.length ? null : _byValue[value]; const FeatureSet_VisibilityFeature_DefaultSymbolVisibility._( - super.v, super.n); + super.value, super.name); } /// Represents the identified object's effect on the element in the original @@ -683,7 +684,8 @@ static GeneratedCodeInfo_Annotation_Semantic? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const GeneratedCodeInfo_Annotation_Semantic._(super.v, super.n); + const GeneratedCodeInfo_Annotation_Semantic._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = + $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart b/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart index 5f8439b..7ec7a47 100644 --- a/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart +++ b/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart
@@ -5,10 +5,11 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, implementation_imports -// ignore_for_file: library_prefixes, non_constant_identifier_names -// ignore_for_file: prefer_final_fields, unnecessary_import, unnecessary_this -// ignore_for_file: unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package +// ignore_for_file: implementation_imports, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -81,22 +82,20 @@ $fixnum.Int64? seconds, $core.int? nanos, }) { - final $result = create(); - if (seconds != null) { - $result.seconds = seconds; - } - if (nanos != null) { - $result.nanos = nanos; - } - return $result; + final result = create(); + if (seconds != null) result.seconds = seconds; + if (nanos != null) result.nanos = nanos; + return result; } - Duration._() : super(); - factory Duration.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Duration.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + + Duration._(); + + factory Duration.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Duration.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'Duration', @@ -115,10 +114,12 @@ Duration copyWith(void Function(Duration) updates) => super.copyWith((message) => updates(message as Duration)) as Duration; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Duration create() => Duration._(); + @$core.override Duration createEmptyInstance() => create(); static $pb.PbList<Duration> createRepeated() => $pb.PbList<Duration>(); @$core.pragma('dart2js:noInline') @@ -132,10 +133,7 @@ @$pb.TagNumber(1) $fixnum.Int64 get seconds => $_getI64(0); @$pb.TagNumber(1) - set seconds($fixnum.Int64 v) { - $_setInt64(0, v); - } - + set seconds($fixnum.Int64 value) => $_setInt64(0, value); @$pb.TagNumber(1) $core.bool hasSeconds() => $_has(0); @$pb.TagNumber(1) @@ -150,10 +148,7 @@ @$pb.TagNumber(2) $core.int get nanos => $_getIZ(1); @$pb.TagNumber(2) - set nanos($core.int v) { - $_setSignedInt32(1, v); - } - + set nanos($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasNanos() => $_has(1); @$pb.TagNumber(2) @@ -175,6 +170,7 @@ (duration.inMicroseconds % $core.Duration.microsecondsPerSecond) * 1000; } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/lib/src/message_generator.dart b/protoc_plugin/lib/src/message_generator.dart index 09d3251..be88f9f 100644 --- a/protoc_plugin/lib/src/message_generator.dart +++ b/protoc_plugin/lib/src/message_generator.dart
@@ -338,16 +338,21 @@ ], () { _generateFactory(out); - out.printlnAnnotated('$classname._() : super();', [ + out.println(); + + out.printlnAnnotated('$classname._();', [ NamedLocation(name: classname, fieldPathSegment: fieldPath, start: 0) ]); + + out.println(); + out.println( - 'factory $classname.fromBuffer($coreImportPrefix.List<$coreImportPrefix.int> i,' - ' [$protobufImportPrefix.ExtensionRegistry r = $protobufImportPrefix.ExtensionRegistry.EMPTY])' - ' => create()..mergeFromBuffer(i, r);'); - out.println('factory $classname.fromJson($coreImportPrefix.String i,' - ' [$protobufImportPrefix.ExtensionRegistry r = $protobufImportPrefix.ExtensionRegistry.EMPTY])' - ' => create()..mergeFromJson(i, r);'); + 'factory $classname.fromBuffer($coreImportPrefix.List<$coreImportPrefix.int> data,' + ' [$protobufImportPrefix.ExtensionRegistry registry = $protobufImportPrefix.ExtensionRegistry.EMPTY])' + ' => create()..mergeFromBuffer(data, registry);'); + out.println('factory $classname.fromJson($coreImportPrefix.String json,' + ' [$protobufImportPrefix.ExtensionRegistry registry = $protobufImportPrefix.ExtensionRegistry.EMPTY])' + ' => create()..mergeFromJson(json, registry);'); out.println(); for (final oneof in _oneofNames) { @@ -408,13 +413,15 @@ ' super.copyWith((message) => updates(message as $classname))' ' as $classname;'); - out.println(''); + out.println(); + out.println('@$coreImportPrefix.override'); out.println('$protobufImportPrefix.BuilderInfo get info_ => _i;'); // Factory functions which can be used as default value closures. - out.println(''); + out.println(); out.println("@$coreImportPrefix.pragma('dart2js:noInline')"); out.println('static $classname create() => $classname._();'); + out.println('@$coreImportPrefix.override'); out.println('$classname createEmptyInstance() => create();'); out.println( @@ -452,28 +459,30 @@ ' ${field.getDartType()}? ${field.memberNames!.fieldName},'); } } - out.println('}) {'); - // Add '$' prefix to avoid proto field name conflicts. - out.println(' final \$result = create();'); - for (final field in _fieldList) { - out.println(' if (${field.memberNames!.fieldName} != null) {'); - if (field.isDeprecated) { - out.println(' // ignore: deprecated_member_use_from_same_package'); - } - if (field.isRepeated && !field.isMapField) { - out.println( - ' \$result.${field.memberNames!.fieldName}.addAll(${field.memberNames!.fieldName});'); - } else if (field.isMapField) { - out.println( - ' \$result.${field.memberNames!.fieldName}.addEntries(${field.memberNames!.fieldName});'); - } else { - out.println( - ' \$result.${field.memberNames!.fieldName} = ${field.memberNames!.fieldName};'); - } - out.println(' }'); + out.print('}) '); + + final names = _fieldList.map((f) => f.memberNames!.fieldName).toSet(); + var result = 'result'; + if (names.contains(result)) { + result += r'$'; } - out.println(' return \$result;'); - out.println('}'); + out.addBlock('{', '}', () { + out.println('final $result = create();'); + for (final field in _fieldList) { + out.print('if (${field.memberNames!.fieldName} != null) '); + if (field.isRepeated && !field.isMapField) { + out.println( + '$result.${field.memberNames!.fieldName}.addAll(${field.memberNames!.fieldName});'); + } else if (field.isMapField) { + out.println( + '$result.${field.memberNames!.fieldName}.addEntries(${field.memberNames!.fieldName});'); + } else { + out.println( + '$result.${field.memberNames!.fieldName} = ${field.memberNames!.fieldName};'); + } + } + out.println('return $result;'); + }); } else { out.println('factory $classname() => create();'); } @@ -587,28 +596,26 @@ _emitIndexAnnotation(field.number, out); if (fastSetter != null) { out.printlnAnnotated( - 'set ${names.fieldName}' - '($fieldTypeString v) { ' - '$fastSetter(${field.index}, v);' - ' }', - [ - NamedLocation( - name: names.fieldName, - fieldPathSegment: memberFieldPath, - start: 'set '.length) - ]); + 'set ${names.fieldName}($fieldTypeString value) => ' + '$fastSetter(${field.index}, value);', + [ + NamedLocation( + name: names.fieldName, + fieldPathSegment: memberFieldPath, + start: 'set '.length) + ], + ); } else { out.printlnAnnotated( - 'set ${names.fieldName}' - '($fieldTypeString v) { ' - '\$_setField(${field.number}, v);' - ' }', - [ - NamedLocation( - name: names.fieldName, - fieldPathSegment: memberFieldPath, - start: 'set '.length) - ]); + 'set ${names.fieldName}($fieldTypeString value) => ' + '\$_setField(${field.number}, value);', + [ + NamedLocation( + name: names.fieldName, + fieldPathSegment: memberFieldPath, + start: 'set '.length) + ], + ); } if (field.hasPresence) { _emitDeprecatedIf(field.isDeprecated, out);
diff --git a/protoc_plugin/lib/src/service_generator.dart b/protoc_plugin/lib/src/service_generator.dart index ce7bf3c..df19c73 100644 --- a/protoc_plugin/lib/src/service_generator.dart +++ b/protoc_plugin/lib/src/service_generator.dart
@@ -177,11 +177,11 @@ for (final m in _methodDescriptors) { final methodName = _methodName(m.name); final inputClass = _getDartClassName(m.inputType); - out.println("case '${m.name}': return this.$methodName" - '(ctx, request as $inputClass);'); + out.println("case '${m.name}': " + 'return $methodName(ctx, request as $inputClass);'); } - out.println('default: ' - "throw $coreImportPrefix.ArgumentError('Unknown method: \$methodName');"); + out.println('default: throw $coreImportPrefix.ArgumentError(' + "'Unknown method: \$methodName');"); }); }); out.println();
diff --git a/protoc_plugin/pubspec.yaml b/protoc_plugin/pubspec.yaml index 88c1b9c..44e0f3b 100644 --- a/protoc_plugin/pubspec.yaml +++ b/protoc_plugin/pubspec.yaml
@@ -4,7 +4,7 @@ repository: https://github.com/google/protobuf.dart/tree/master/protoc_plugin environment: - sdk: '^3.6.0' + sdk: ^3.6.0 resolution: workspace
diff --git a/protoc_plugin/test/goldens/client b/protoc_plugin/test/goldens/client index 01ee8de..9aa1275 100644 --- a/protoc_plugin/test/goldens/client +++ b/protoc_plugin/test/goldens/client
@@ -1,5 +1,6 @@ class TestApi { - $pb.RpcClient _client; + final $pb.RpcClient _client; + TestApi(this._client); $async.Future<SomeReply> aMethod($pb.ClientContext? ctx, SomeRequest request) =>
diff --git a/protoc_plugin/test/goldens/deprecations b/protoc_plugin/test/goldens/deprecations index f8db67b..a625285 100644 --- a/protoc_plugin/test/goldens/deprecations +++ b/protoc_plugin/test/goldens/deprecations
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:async' as $async; import 'dart:core' as $core; @@ -21,13 +22,15 @@ @$core.Deprecated('This message is deprecated') class HelloRequest extends $pb.GeneratedMessage { factory HelloRequest() => create(); - HelloRequest._() : super(); - 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._(); + + factory HelloRequest.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory HelloRequest.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'HelloRequest', @@ -43,10 +46,12 @@ super.copyWith((message) => updates(message as HelloRequest)) as HelloRequest; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HelloRequest create() => HelloRequest._(); + @$core.override HelloRequest createEmptyInstance() => create(); static $pb.PbList<HelloRequest> createRepeated() => $pb.PbList<HelloRequest>(); @@ -60,10 +65,7 @@ $core.String get name => $_getSZ(0); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @@ -74,13 +76,15 @@ class HelloReply extends $pb.GeneratedMessage { factory HelloReply() => create(); - HelloReply._() : super(); - 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._(); + + factory HelloReply.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory HelloReply.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'HelloReply', @@ -95,10 +99,12 @@ HelloReply copyWith(void Function(HelloReply) updates) => super.copyWith((message) => updates(message as HelloReply)) as HelloReply; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HelloReply create() => HelloReply._(); + @$core.override HelloReply createEmptyInstance() => create(); static $pb.PbList<HelloReply> createRepeated() => $pb.PbList<HelloReply>(); @$core.pragma('dart2js:noInline') @@ -109,10 +115,7 @@ @$pb.TagNumber(1) $core.String get message => $_getSZ(0); @$pb.TagNumber(1) - set message($core.String v) { - $_setString(0, v); - } - + set message($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasMessage() => $_has(0); @$pb.TagNumber(1) @@ -121,7 +124,8 @@ @$core.Deprecated('This service is deprecated') class GreeterApi { - $pb.RpcClient _client; + final $pb.RpcClient _client; + GreeterApi(this._client); @$core.Deprecated('This method is deprecated') @@ -131,6 +135,7 @@ ctx, 'Greeter', 'SayHello', request, HelloReply()); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/deprecations.pbenum b/protoc_plugin/test/goldens/deprecations.pbenum index c21797e..2230917 100644 --- a/protoc_plugin/test/goldens/deprecations.pbenum +++ b/protoc_plugin/test/goldens/deprecations.pbenum
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -29,7 +30,8 @@ static A? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const A._(super.v, super.n); + const A._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = + $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/test/goldens/doc_comments b/protoc_plugin/test/goldens/doc_comments index e2bb23f..c75e577 100644 --- a/protoc_plugin/test/goldens/doc_comments +++ b/protoc_plugin/test/goldens/doc_comments
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:async' as $async; import 'dart:core' as $core; @@ -21,13 +22,15 @@ /// This is a message. class HelloRequest extends $pb.GeneratedMessage { factory HelloRequest() => create(); - HelloRequest._() : super(); - 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._(); + + factory HelloRequest.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory HelloRequest.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'HelloRequest', @@ -43,10 +46,12 @@ super.copyWith((message) => updates(message as HelloRequest)) as HelloRequest; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HelloRequest create() => HelloRequest._(); + @$core.override HelloRequest createEmptyInstance() => create(); static $pb.PbList<HelloRequest> createRepeated() => $pb.PbList<HelloRequest>(); @@ -59,10 +64,7 @@ @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -71,13 +73,15 @@ class HelloReply extends $pb.GeneratedMessage { factory HelloReply() => create(); - HelloReply._() : super(); - 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._(); + + factory HelloReply.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory HelloReply.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( _omitMessageNames ? '' : 'HelloReply', @@ -92,10 +96,12 @@ HelloReply copyWith(void Function(HelloReply) updates) => super.copyWith((message) => updates(message as HelloReply)) as HelloReply; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HelloReply create() => HelloReply._(); + @$core.override HelloReply createEmptyInstance() => create(); static $pb.PbList<HelloReply> createRepeated() => $pb.PbList<HelloReply>(); @$core.pragma('dart2js:noInline') @@ -106,10 +112,7 @@ @$pb.TagNumber(1) $core.String get message => $_getSZ(0); @$pb.TagNumber(1) - set message($core.String v) { - $_setString(0, v); - } - + set message($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasMessage() => $_has(0); @$pb.TagNumber(1) @@ -118,7 +121,8 @@ /// This is a service. class GreeterApi { - $pb.RpcClient _client; + final $pb.RpcClient _client; + GreeterApi(this._client); /// This is a service method. @@ -128,6 +132,7 @@ ctx, 'Greeter', 'SayHello', request, HelloReply()); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/doc_comments.pbenum b/protoc_plugin/test/goldens/doc_comments.pbenum index 1a35f24..2a94e45 100644 --- a/protoc_plugin/test/goldens/doc_comments.pbenum +++ b/protoc_plugin/test/goldens/doc_comments.pbenum
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -31,7 +32,8 @@ static A? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const A._(super.v, super.n); + const A._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = + $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/test/goldens/enum b/protoc_plugin/test/goldens/enum index 2dca720..809bfed 100644 --- a/protoc_plugin/test/goldens/enum +++ b/protoc_plugin/test/goldens/enum
@@ -14,8 +14,8 @@ static final $core.List<PhoneType?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 2); static PhoneType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const PhoneType._(super.v, super.n); + const PhoneType._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/test/goldens/extension b/protoc_plugin/test/goldens/extension index 2bb43cd..32a5dcb 100644 --- a/protoc_plugin/test/goldens/extension +++ b/protoc_plugin/test/goldens/extension
@@ -1,4 +1,4 @@ static final clientInfo = $pb.Extension<$core.String>(_omitMessageNames ? '' : 'Card', _omitFieldNames ? '' : 'clientInfo', 261486461, $pb.PbFieldType.OS); -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/grpc_service.pb b/protoc_plugin/test/goldens/grpc_service.pb index 2831114..7ebc981 100644 --- a/protoc_plugin/test/goldens/grpc_service.pb +++ b/protoc_plugin/test/goldens/grpc_service.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -17,9 +18,11 @@ class Empty extends $pb.GeneratedMessage { factory Empty() => create(); - Empty._() : super(); - 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._(); + + factory Empty.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry); + factory Empty.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Empty', createEmptyInstance: create) ..hasRequiredFields = false @@ -30,10 +33,12 @@ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') Empty copyWith(void Function(Empty) updates) => super.copyWith((message) => updates(message as Empty)) as Empty; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Empty create() => Empty._(); + @$core.override Empty createEmptyInstance() => create(); static $pb.PbList<Empty> createRepeated() => $pb.PbList<Empty>(); @$core.pragma('dart2js:noInline') @@ -42,4 +47,4 @@ } -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/grpc_service.pbgrpc b/protoc_plugin/test/goldens/grpc_service.pbgrpc index eb99c20..1fa8fa4 100644 --- a/protoc_plugin/test/goldens/grpc_service.pbgrpc +++ b/protoc_plugin/test/goldens/grpc_service.pbgrpc
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:async' as $async; import 'dart:core' as $core;
diff --git a/protoc_plugin/test/goldens/header_in_package.pb b/protoc_plugin/test/goldens/header_in_package.pb index a123b07..4b86dd5 100644 --- a/protoc_plugin/test/goldens/header_in_package.pb +++ b/protoc_plugin/test/goldens/header_in_package.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core;
diff --git a/protoc_plugin/test/goldens/header_with_fixnum.pb b/protoc_plugin/test/goldens/header_with_fixnum.pb index 69f20e0..bf6e914 100644 --- a/protoc_plugin/test/goldens/header_with_fixnum.pb +++ b/protoc_plugin/test/goldens/header_with_fixnum.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core;
diff --git a/protoc_plugin/test/goldens/imports.pb b/protoc_plugin/test/goldens/imports.pb index 23c06c0..27448ea 100644 --- a/protoc_plugin/test/goldens/imports.pb +++ b/protoc_plugin/test/goldens/imports.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -20,9 +21,11 @@ class M extends $pb.GeneratedMessage { factory M() => create(); - M._() : super(); - 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._(); + + factory M.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry); + factory M.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'M', createEmptyInstance: create) ..aOM<M>(1, _omitFieldNames ? '' : 'm', subBuilder: M.create) @@ -36,10 +39,12 @@ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') M copyWith(void Function(M) updates) => super.copyWith((message) => updates(message as M)) as M; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static M create() => M._(); + @$core.override M createEmptyInstance() => create(); static $pb.PbList<M> createRepeated() => $pb.PbList<M>(); @$core.pragma('dart2js:noInline') @@ -49,7 +54,7 @@ @$pb.TagNumber(1) M get m => $_getN(0); @$pb.TagNumber(1) - set m(M v) { $_setField(1, v); } + set m(M value) => $_setField(1, value); @$pb.TagNumber(1) $core.bool hasM() => $_has(0); @$pb.TagNumber(1) @@ -60,7 +65,7 @@ @$pb.TagNumber(2) $1.M get m1 => $_getN(1); @$pb.TagNumber(2) - set m1($1.M v) { $_setField(2, v); } + set m1($1.M value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasM1() => $_has(1); @$pb.TagNumber(2) @@ -71,7 +76,7 @@ @$pb.TagNumber(3) $2.M get m2 => $_getN(2); @$pb.TagNumber(3) - set m2($2.M v) { $_setField(3, v); } + set m2($2.M value) => $_setField(3, value); @$pb.TagNumber(3) $core.bool hasM2() => $_has(2); @$pb.TagNumber(3) @@ -81,5 +86,5 @@ } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/imports.pbjson b/protoc_plugin/test/goldens/imports.pbjson index 4a3248a..f5f7191 100644 --- a/protoc_plugin/test/goldens/imports.pbjson +++ b/protoc_plugin/test/goldens/imports.pbjson
@@ -5,7 +5,8 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names
diff --git a/protoc_plugin/test/goldens/int64.pb b/protoc_plugin/test/goldens/int64.pb index 7a4166c..697176d 100644 --- a/protoc_plugin/test/goldens/int64.pb +++ b/protoc_plugin/test/goldens/int64.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -18,9 +19,11 @@ class Int64 extends $pb.GeneratedMessage { factory Int64() => create(); - Int64._() : super(); - factory Int64.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Int64.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + Int64._(); + + factory Int64.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry); + factory Int64.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Int64', createEmptyInstance: create) ..aInt64(1, _omitFieldNames ? '' : 'value') @@ -32,10 +35,12 @@ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') Int64 copyWith(void Function(Int64) updates) => super.copyWith((message) => updates(message as Int64)) as Int64; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Int64 create() => Int64._(); + @$core.override Int64 createEmptyInstance() => create(); static $pb.PbList<Int64> createRepeated() => $pb.PbList<Int64>(); @$core.pragma('dart2js:noInline') @@ -45,7 +50,7 @@ @$pb.TagNumber(1) $fixnum.Int64 get value => $_getI64(0); @$pb.TagNumber(1) - set value($fixnum.Int64 v) { $_setInt64(0, v); } + set value($fixnum.Int64 value) => $_setInt64(0, value); @$pb.TagNumber(1) $core.bool hasValue() => $_has(0); @$pb.TagNumber(1) @@ -53,5 +58,5 @@ } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/messageGenerator b/protoc_plugin/test/goldens/messageGenerator index a26c8b0..15d05a3 100644 --- a/protoc_plugin/test/goldens/messageGenerator +++ b/protoc_plugin/test/goldens/messageGenerator
@@ -1,8 +1,10 @@ class PhoneNumber extends $pb.GeneratedMessage { factory PhoneNumber() => create(); - PhoneNumber._() : super(); - 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._(); + + factory PhoneNumber.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry); + factory PhoneNumber.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PhoneNumber', createEmptyInstance: create) ..aQS(1, _omitFieldNames ? '' : 'number') @@ -16,10 +18,12 @@ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') PhoneNumber copyWith(void Function(PhoneNumber) updates) => super.copyWith((message) => updates(message as PhoneNumber)) as PhoneNumber; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PhoneNumber create() => PhoneNumber._(); + @$core.override PhoneNumber createEmptyInstance() => create(); static $pb.PbList<PhoneNumber> createRepeated() => $pb.PbList<PhoneNumber>(); @$core.pragma('dart2js:noInline') @@ -29,7 +33,7 @@ @$pb.TagNumber(1) $core.String get number => $_getSZ(0); @$pb.TagNumber(1) - set number($core.String v) { $_setString(0, v); } + set number($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasNumber() => $_has(0); @$pb.TagNumber(1) @@ -38,7 +42,7 @@ @$pb.TagNumber(2) PhoneNumber_PhoneType get type => $_getN(1); @$pb.TagNumber(2) - set type(PhoneNumber_PhoneType v) { $_setField(2, v); } + set type(PhoneNumber_PhoneType value) => $_setField(2, value); @$pb.TagNumber(2) $core.bool hasType() => $_has(1); @$pb.TagNumber(2) @@ -47,7 +51,7 @@ @$pb.TagNumber(3) $core.String get name => $_getS(2, '\$'); @$pb.TagNumber(3) - set name($core.String v) { $_setString(2, v); } + set name($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasName() => $_has(2); @$pb.TagNumber(3) @@ -58,7 +62,7 @@ $core.String get deprecatedField => $_getSZ(3); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(4) - set deprecatedField($core.String v) { $_setString(3, v); } + set deprecatedField($core.String value) => $_setString(3, value); @$core.Deprecated('This field is deprecated.') @$pb.TagNumber(4) $core.bool hasDeprecatedField() => $_has(3); @@ -68,5 +72,5 @@ } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/messageGenerator.meta b/protoc_plugin/test/goldens/messageGenerator.meta index 52b316b..faefae9 100644 --- a/protoc_plugin/test/goldens/messageGenerator.meta +++ b/protoc_plugin/test/goldens/messageGenerator.meta
@@ -9,8 +9,8 @@ path: 4 path: 0 sourceFile: - begin: 88 - end: 99 + begin: 89 + end: 100 } annotation: { path: 4 @@ -18,8 +18,8 @@ path: 2 path: 1 sourceFile: - begin: 1786 - end: 1792 + begin: 1854 + end: 1860 } annotation: { path: 4 @@ -27,8 +27,8 @@ path: 2 path: 1 sourceFile: - begin: 1834 - end: 1840 + begin: 1902 + end: 1908 } annotation: { path: 4 @@ -36,8 +36,8 @@ path: 2 path: 1 sourceFile: - begin: 1913 - end: 1922 + begin: 1988 + end: 1997 } annotation: { path: 4 @@ -45,8 +45,8 @@ path: 2 path: 1 sourceFile: - begin: 1965 - end: 1976 + begin: 2040 + end: 2051 } annotation: { path: 4 @@ -54,8 +54,8 @@ path: 2 path: 0 sourceFile: - begin: 2048 - end: 2052 + begin: 2123 + end: 2127 } annotation: { path: 4 @@ -63,8 +63,8 @@ path: 2 path: 0 sourceFile: - begin: 2093 - end: 2097 + begin: 2168 + end: 2172 } annotation: { path: 4 @@ -72,8 +72,8 @@ path: 2 path: 0 sourceFile: - begin: 2178 - end: 2185 + begin: 2260 + end: 2267 } annotation: { path: 4 @@ -81,8 +81,8 @@ path: 2 path: 0 sourceFile: - begin: 2228 - end: 2237 + begin: 2310 + end: 2319 } annotation: { path: 4 @@ -90,8 +90,8 @@ path: 2 path: 2 sourceFile: - begin: 2300 - end: 2304 + begin: 2382 + end: 2386 } annotation: { path: 4 @@ -99,8 +99,8 @@ path: 2 path: 2 sourceFile: - begin: 2351 - end: 2355 + begin: 2433 + end: 2437 } annotation: { path: 4 @@ -108,8 +108,8 @@ path: 2 path: 2 sourceFile: - begin: 2428 - end: 2435 + begin: 2517 + end: 2524 } annotation: { path: 4 @@ -117,8 +117,8 @@ path: 2 path: 2 sourceFile: - begin: 2478 - end: 2487 + begin: 2567 + end: 2576 } annotation: { path: 4 @@ -126,8 +126,8 @@ path: 2 path: 3 sourceFile: - begin: 2599 - end: 2614 + begin: 2688 + end: 2703 } annotation: { path: 4 @@ -135,8 +135,8 @@ path: 2 path: 3 sourceFile: - begin: 2705 - end: 2720 + begin: 2794 + end: 2809 } annotation: { path: 4 @@ -144,8 +144,8 @@ path: 2 path: 3 sourceFile: - begin: 2842 - end: 2860 + begin: 2938 + end: 2956 } annotation: { path: 4 @@ -153,6 +153,6 @@ path: 2 path: 3 sourceFile: - begin: 2952 - end: 2972 + begin: 3048 + end: 3068 }
diff --git a/protoc_plugin/test/goldens/messageGeneratorEnums b/protoc_plugin/test/goldens/messageGeneratorEnums index 3d673da..a9ba534 100644 --- a/protoc_plugin/test/goldens/messageGeneratorEnums +++ b/protoc_plugin/test/goldens/messageGeneratorEnums
@@ -14,8 +14,8 @@ static final $core.List<PhoneNumber_PhoneType?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 2); static PhoneNumber_PhoneType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const PhoneNumber_PhoneType._(super.v, super.n); + const PhoneNumber_PhoneType._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/test/goldens/oneMessage.pb b/protoc_plugin/test/goldens/oneMessage.pb index 2ad0d7e..1ca462f 100644 --- a/protoc_plugin/test/goldens/oneMessage.pb +++ b/protoc_plugin/test/goldens/oneMessage.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -17,9 +18,11 @@ class PhoneNumber extends $pb.GeneratedMessage { factory PhoneNumber() => create(); - PhoneNumber._() : super(); - 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._(); + + factory PhoneNumber.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry); + factory PhoneNumber.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PhoneNumber', createEmptyInstance: create) ..aQS(1, _omitFieldNames ? '' : 'number') @@ -32,10 +35,12 @@ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') PhoneNumber copyWith(void Function(PhoneNumber) updates) => super.copyWith((message) => updates(message as PhoneNumber)) as PhoneNumber; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PhoneNumber create() => PhoneNumber._(); + @$core.override PhoneNumber createEmptyInstance() => create(); static $pb.PbList<PhoneNumber> createRepeated() => $pb.PbList<PhoneNumber>(); @$core.pragma('dart2js:noInline') @@ -45,7 +50,7 @@ @$pb.TagNumber(1) $core.String get number => $_getSZ(0); @$pb.TagNumber(1) - set number($core.String v) { $_setString(0, v); } + set number($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasNumber() => $_has(0); @$pb.TagNumber(1) @@ -54,7 +59,7 @@ @$pb.TagNumber(2) $core.int get type => $_getIZ(1); @$pb.TagNumber(2) - set type($core.int v) { $_setSignedInt32(1, v); } + set type($core.int value) => $_setSignedInt32(1, value); @$pb.TagNumber(2) $core.bool hasType() => $_has(1); @$pb.TagNumber(2) @@ -63,7 +68,7 @@ @$pb.TagNumber(3) $core.String get name => $_getS(2, '\$'); @$pb.TagNumber(3) - set name($core.String v) { $_setString(2, v); } + set name($core.String value) => $_setString(2, value); @$pb.TagNumber(3) $core.bool hasName() => $_has(2); @$pb.TagNumber(3) @@ -71,5 +76,5 @@ } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/oneMessage.pb.meta b/protoc_plugin/test/goldens/oneMessage.pb.meta index c69336a..5c089c8 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: 525 - end: 536 + begin: 552 + end: 563 } annotation: { path: 4 path: 0 sourceFile: test - begin: 607 - end: 618 + begin: 635 + end: 646 } annotation: { path: 4 @@ -18,8 +18,8 @@ path: 2 path: 0 sourceFile: test - begin: 2110 - end: 2116 + begin: 2205 + end: 2211 } annotation: { path: 4 @@ -27,8 +27,8 @@ path: 2 path: 0 sourceFile: test - begin: 2158 - end: 2164 + begin: 2253 + end: 2259 } annotation: { path: 4 @@ -36,8 +36,8 @@ path: 2 path: 0 sourceFile: test - begin: 2237 - end: 2246 + begin: 2339 + end: 2348 } annotation: { path: 4 @@ -45,8 +45,8 @@ path: 2 path: 0 sourceFile: test - begin: 2289 - end: 2300 + begin: 2391 + end: 2402 } annotation: { path: 4 @@ -54,8 +54,8 @@ path: 2 path: 1 sourceFile: test - begin: 2360 - end: 2364 + begin: 2462 + end: 2466 } annotation: { path: 4 @@ -63,8 +63,8 @@ path: 2 path: 1 sourceFile: test - begin: 2406 - end: 2410 + begin: 2508 + end: 2512 } annotation: { path: 4 @@ -72,8 +72,8 @@ path: 2 path: 1 sourceFile: test - begin: 2485 - end: 2492 + begin: 2594 + end: 2601 } annotation: { path: 4 @@ -81,8 +81,8 @@ path: 2 path: 1 sourceFile: test - begin: 2535 - end: 2544 + begin: 2644 + end: 2653 } annotation: { path: 4 @@ -90,8 +90,8 @@ path: 2 path: 2 sourceFile: test - begin: 2607 - end: 2611 + begin: 2716 + end: 2720 } annotation: { path: 4 @@ -99,8 +99,8 @@ path: 2 path: 2 sourceFile: test - begin: 2658 - end: 2662 + begin: 2767 + end: 2771 } annotation: { path: 4 @@ -108,8 +108,8 @@ path: 2 path: 2 sourceFile: test - begin: 2735 - end: 2742 + begin: 2851 + end: 2858 } annotation: { path: 4 @@ -117,6 +117,6 @@ path: 2 path: 2 sourceFile: test - begin: 2785 - end: 2794 + begin: 2901 + end: 2910 }
diff --git a/protoc_plugin/test/goldens/oneMessage.pbjson b/protoc_plugin/test/goldens/oneMessage.pbjson index 093e111..44aa575 100644 --- a/protoc_plugin/test/goldens/oneMessage.pbjson +++ b/protoc_plugin/test/goldens/oneMessage.pbjson
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:convert' as $convert; import 'dart:core' as $core;
diff --git a/protoc_plugin/test/goldens/service.pb b/protoc_plugin/test/goldens/service.pb index 3de3da2..dfc131a 100644 --- a/protoc_plugin/test/goldens/service.pb +++ b/protoc_plugin/test/goldens/service.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:async' as $async; import 'dart:core' as $core; @@ -18,9 +19,11 @@ class Empty extends $pb.GeneratedMessage { factory Empty() => create(); - Empty._() : super(); - 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._(); + + factory Empty.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry); + factory Empty.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Empty', createEmptyInstance: create) ..hasRequiredFields = false @@ -31,10 +34,12 @@ @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') Empty copyWith(void Function(Empty) updates) => super.copyWith((message) => updates(message as Empty)) as Empty; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Empty create() => Empty._(); + @$core.override Empty createEmptyInstance() => create(); static $pb.PbList<Empty> createRepeated() => $pb.PbList<Empty>(); @$core.pragma('dart2js:noInline') @@ -43,7 +48,8 @@ } class TestApi { - $pb.RpcClient _client; + final $pb.RpcClient _client; + TestApi(this._client); $async.Future<Empty> ping($pb.ClientContext? ctx, Empty request) => @@ -52,4 +58,4 @@ } -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/protoc_plugin/test/goldens/service.pbserver b/protoc_plugin/test/goldens/service.pbserver index 3957d38..8d03b15 100644 --- a/protoc_plugin/test/goldens/service.pbserver +++ b/protoc_plugin/test/goldens/service.pbserver
@@ -6,9 +6,9 @@ // ignore_for_file: annotate_overrides, camel_case_types, comment_references // ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: non_constant_identifier_names import 'dart:async' as $async; import 'dart:core' as $core; @@ -32,7 +32,7 @@ $async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx, $core.String methodName, $pb.GeneratedMessage request) { switch (methodName) { - case 'Ping': return this.ping(ctx, request as $0.Empty); + case 'Ping': return ping(ctx, request as $0.Empty); default: throw $core.ArgumentError('Unknown method: $methodName'); } }
diff --git a/protoc_plugin/test/goldens/serviceGenerator b/protoc_plugin/test/goldens/serviceGenerator index 9f3f86a..7f3d8d0 100644 --- a/protoc_plugin/test/goldens/serviceGenerator +++ b/protoc_plugin/test/goldens/serviceGenerator
@@ -12,8 +12,8 @@ $async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx, $core.String methodName, $pb.GeneratedMessage request) { switch (methodName) { - case 'AMethod': return this.aMethod(ctx, request as $0.SomeRequest); - case 'AnotherMethod': return this.anotherMethod(ctx, request as $1.EmptyMessage); + case 'AMethod': return aMethod(ctx, request as $0.SomeRequest); + case 'AnotherMethod': return anotherMethod(ctx, request as $1.EmptyMessage); default: throw $core.ArgumentError('Unknown method: $methodName'); } }
diff --git a/protoc_plugin/test/goldens/serviceGenerator.pb.json b/protoc_plugin/test/goldens/serviceGenerator.pb.json index 80429a8..84cce20 100644 --- a/protoc_plugin/test/goldens/serviceGenerator.pb.json +++ b/protoc_plugin/test/goldens/serviceGenerator.pb.json
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:convert' as $convert; import 'dart:core' as $core;
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pb b/protoc_plugin/test/goldens/topLevelEnum.pb index 4fb6447..2c05f49 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pb +++ b/protoc_plugin/test/goldens/topLevelEnum.pb
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core;
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbenum b/protoc_plugin/test/goldens/topLevelEnum.pbenum index 69cb70d..66756fe 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pbenum +++ b/protoc_plugin/test/goldens/topLevelEnum.pbenum
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:core' as $core; @@ -29,8 +30,8 @@ static final $core.List<PhoneType?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 2); static PhoneType? valueOf($core.int value) => value < 0 || value >= _byValue.length ? null : _byValue[value]; - const PhoneType._(super.v, super.n); + const PhoneType._(super.value, super.name); } -const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); +const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta b/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta index fc667d4..3ee0be2 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta +++ b/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta
@@ -2,8 +2,8 @@ path: 5 path: 0 sourceFile: test - begin: 444 - end: 453 + begin: 471 + end: 480 } annotation: { path: 5 @@ -11,8 +11,8 @@ path: 2 path: 0 sourceFile: test - begin: 506 - end: 512 + begin: 533 + end: 539 } annotation: { path: 5 @@ -20,8 +20,8 @@ path: 2 path: 1 sourceFile: test - begin: 588 - end: 592 + begin: 615 + end: 619 } annotation: { path: 5 @@ -29,8 +29,8 @@ path: 2 path: 2 sourceFile: test - begin: 666 - end: 670 + begin: 693 + end: 697 } annotation: { path: 5 @@ -38,6 +38,6 @@ path: 2 path: 3 sourceFile: test - begin: 745 - end: 753 + begin: 772 + end: 780 }
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbjson b/protoc_plugin/test/goldens/topLevelEnum.pbjson index 092d9a0..f5056fc 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pbjson +++ b/protoc_plugin/test/goldens/topLevelEnum.pbjson
@@ -5,9 +5,10 @@ // @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names import 'dart:convert' as $convert; import 'dart:core' as $core;
diff --git a/pubspec.yaml b/pubspec.yaml index 82dd031..7896dba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml
@@ -1,7 +1,9 @@ -name: _ +name: workspace publish_to: none + environment: sdk: ^3.6.0 + workspace: - benchmarks - protobuf