Use @Dart = 2.7 in generated files (google#455)

* Use @Dart = 2.7 in genereted files * More in changelog * Fix goldens * Fix lints * Fix more lints
aebrahim · Jan 5, 2021 · 27d382d · 27d382d
1 parent 7ac17d0
commit 27d382d
Show file tree

Hide file tree

Showing 26 changed files with 773 additions and 62 deletions.
diff --git a/protobuf/lib/src/protobuf/field_set.dart b/protobuf/lib/src/protobuf/field_set.dart
@@ -103,12 +103,12 @@ class _FieldSet {
 
   static List _makeValueList(int length) {
     if (length == 0) return _zeroList;
-    return List(length);
+    return List.filled(length, null, growable: false);
   }
 
   // Use a fixed length list and not a constant list to ensure that _values
   // always has the same implementation type.
-  static final List _zeroList = List(0);
+  static final List _zeroList = [];
 
   // Metadata about multiple fields
 

diff --git a/protoc_plugin/CHANGELOG.md b/protoc_plugin/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 19.3.0
+
+* Generate constructors with optional named arguments for prefilling fields.
+* Output language version 2.7 in generated files to support extension methods.
 ## 19.2.1
 
 * Support optional proto3 fields.

diff --git a/protoc_plugin/lib/file_generator.dart b/protoc_plugin/lib/file_generator.dart
@@ -559,7 +559,7 @@ class FileGenerator extends ProtobufContainer {
 //  Generated code. Do not modify.
 //  source: ${descriptor.name}
 //
-// @dart = 2.3
+// @dart = 2.7
 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 ''');
   }

diff --git a/protoc_plugin/lib/names.dart b/protoc_plugin/lib/names.dart
@@ -258,7 +258,7 @@ MemberNames messageMemberNames(DescriptorProto descriptor,
 
   var existingNames = <String>{}..addAll(reservedMemberNames)..addAll(reserved);
 
-  var fieldNames = List<FieldNames>(indexes.length);
+  var fieldNames = List<FieldNames>.filled(indexes.length, null);
 
   void takeFieldNames(FieldNames chosen) {
     fieldNames[chosen.index] = chosen;

diff --git a/protoc_plugin/lib/src/dart_options.pb.dart b/protoc_plugin/lib/src/dart_options.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: dart_options.proto
 //
-// @dart = 2.3
+// @dart = 2.7
 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
 import 'dart:core' as $core;
@@ -37,7 +37,23 @@ class DartMixin extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   DartMixin._() : super();
-  factory DartMixin() => create();
+  factory DartMixin({
+    $core.String name,
+    $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;
+  }
   factory DartMixin.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
@@ -121,7 +137,15 @@ class Imports extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   Imports._() : super();
-  factory Imports() => create();
+  factory Imports({
+    $core.Iterable<DartMixin> mixins,
+  }) {
+    final _result = create();
+    if (mixins != null) {
+      _result.mixins.addAll(mixins);
+    }
+    return _result;
+  }
   factory Imports.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);