google · osa1 · May 10, 2023 · Apr 13, 2023 · Apr 13, 2023
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -13,6 +13,8 @@ linter:
   - directives_ordering
   - no_leading_underscores_for_local_identifiers
   - omit_local_variable_types
+  - prefer_final_in_for_each
+  - prefer_final_locals
   - prefer_relative_imports
   - prefer_single_quotes
   - prefer_spread_collections

diff --git a/protobuf/lib/src/protobuf/builder_info.dart b/protobuf/lib/src/protobuf/builder_info.dart
@@ -64,7 +64,7 @@ class BuilderInfo {
       ValueOfFunc? valueOf,
       List<ProtobufEnum>? enumValues,
       {String? protoName}) {
-    var index = byIndex.length;
+    final index = byIndex.length;
     final fieldInfo = (tagNumber == 0)
         ? FieldInfo.dummy(index)
         : FieldInfo<T>(name, tagNumber, index, fieldType!,
@@ -85,7 +85,7 @@ class BuilderInfo {
       CreateBuilderFunc? valueCreator,
       {ProtobufEnum? defaultEnumValue,
       String? protoName}) {
-    var index = byIndex.length;
+    final index = byIndex.length;
     _addField(MapFieldInfo<K, V>(name, tagNumber, index, PbFieldType.M,
         keyFieldType, valueFieldType, mapEntryBuilderInfo, valueCreator,
         defaultEnumValue: defaultEnumValue, protoName: protoName));
@@ -101,7 +101,7 @@ class BuilderInfo {
       List<ProtobufEnum>? enumValues,
       {ProtobufEnum? defaultEnumValue,
       String? protoName}) {
-    var index = byIndex.length;
+    final index = byIndex.length;
     _addField(FieldInfo<T>.repeated(
         name, tagNumber, index, fieldType, check, subBuilder,
         valueOf: valueOf,
@@ -226,7 +226,7 @@ class BuilderInfo {
 
   // oneof declarations.
   void oo(int oneofIndex, List<int> tags) {
-    for (var tag in tags) {
+    for (final tag in tags) {
       oneofs[tag] = oneofIndex;
     }
   }
@@ -243,7 +243,8 @@ class BuilderInfo {
       PackageName packageName = const PackageName(''),
       String? protoName,
       dynamic valueDefaultOrMaker}) {
-    var mapEntryBuilderInfo = BuilderInfo(entryClassName, package: packageName)
+    final mapEntryBuilderInfo = BuilderInfo(entryClassName,
+        package: packageName)
       ..add(PbMap._keyFieldNumber, 'key', keyFieldType, null, null, null, null)
       ..add(PbMap._valueFieldNumber, 'value', valueFieldType,
           valueDefaultOrMaker, valueCreator, valueOf, enumValues);
@@ -256,38 +257,38 @@ class BuilderInfo {
   bool containsTagNumber(int tagNumber) => fieldInfo.containsKey(tagNumber);
 
   dynamic defaultValue(int tagNumber) {
-    var func = makeDefault(tagNumber);
+    final func = makeDefault(tagNumber);
     return func == null ? null : func();
   }
 
   // Returns the field name for a given tag number, for debugging purposes.
   String? fieldName(int tagNumber) {
-    var i = fieldInfo[tagNumber];
+    final i = fieldInfo[tagNumber];
     return i?.name;
   }
 
   int? fieldType(int tagNumber) {
-    var i = fieldInfo[tagNumber];
+    final i = fieldInfo[tagNumber];
     return i?.type;
   }
 
   MakeDefaultFunc? makeDefault(int tagNumber) {
-    var i = fieldInfo[tagNumber];
+    final i = fieldInfo[tagNumber];
     return i?.makeDefault;
   }
 
   CreateBuilderFunc? subBuilder(int tagNumber) {
-    var i = fieldInfo[tagNumber];
+    final i = fieldInfo[tagNumber];
     return i?.subBuilder;
   }
 
   int? tagNumber(String fieldName) {
-    var i = byName[fieldName];
+    final i = byName[fieldName];
     return i?.tagNumber;
   }
 
   ValueOfFunc? valueOfFunc(int tagNumber) {
-    var i = fieldInfo[tagNumber];
+    final i = fieldInfo[tagNumber];
     return i?.valueOf;
   }
 

diff --git a/protobuf/lib/src/protobuf/coded_buffer.dart b/protobuf/lib/src/protobuf/coded_buffer.dart
@@ -9,16 +9,16 @@ void _writeToCodedBufferWriter(_FieldSet fs, CodedBufferWriter out) {
   // performance optimizations for the receiver. See:
   // https://developers.google.com/protocol-buffers/docs/encoding?hl=en#order
 
-  for (var fi in fs._infosSortedByTag) {
-    var value = fs._values[fi.index!];
+  for (final fi in fs._infosSortedByTag) {
+    final value = fs._values[fi.index!];
     if (value == null) continue;
     out.writeField(fi.tagNumber, fi.type, value);
   }
 
   final extensions = fs._extensions;
   if (extensions != null) {
-    for (var tagNumber in _sorted(extensions._tagNumbers)) {
-      var fi = extensions._getInfoOrNull(tagNumber)!;
+    for (final tagNumber in _sorted(extensions._tagNumbers)) {
+      final fi = extensions._getInfoOrNull(tagNumber)!;
       out.writeField(tagNumber, fi.type, extensions._getFieldOrNull(fi));
     }
   }
@@ -34,10 +34,10 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
   ArgumentError.checkNotNull(registry);
   fs._ensureWritable();
   while (true) {
-    var tag = input.readTag();
+    final tag = input.readTag();
     if (tag == 0) return;
-    var wireType = tag & 0x7;
-    var tagNumber = tag >> 3;
+    final wireType = tag & 0x7;
+    final tagNumber = tag >> 3;
 
     var fi = fs._nonExtensionInfo(meta, tagNumber);
     fi ??= registry.getExtension(meta.qualifiedMessageName, tagNumber);
@@ -69,18 +69,18 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
         fs._setFieldUnchecked(meta, fi, input.readDouble());
         break;
       case PbFieldType._OPTIONAL_ENUM:
-        var rawValue = input.readEnum();
-        var value = meta._decodeEnum(tagNumber, registry, rawValue);
+        final rawValue = input.readEnum();
+        final value = meta._decodeEnum(tagNumber, registry, rawValue);
         if (value == null) {
-          var unknown = fs._ensureUnknownFields();
+          final unknown = fs._ensureUnknownFields();
           unknown.mergeVarintField(tagNumber, Int64(rawValue));
         } else {
           fs._setFieldUnchecked(meta, fi, value);
         }
         break;
       case PbFieldType._OPTIONAL_GROUP:
-        var subMessage = meta._makeEmptyMessage(tagNumber, registry);
-        var oldValue = fs._getFieldOrNull(fi);
+        final subMessage = meta._makeEmptyMessage(tagNumber, registry);
+        final oldValue = fs._getFieldOrNull(fi);
         if (oldValue != null) {
           subMessage.mergeFromMessage(oldValue);
         }
@@ -118,11 +118,11 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
         fs._setFieldUnchecked(meta, fi, input.readSfixed64());
         break;
       case PbFieldType._OPTIONAL_MESSAGE:
-        GeneratedMessage? oldValue = fs._getFieldOrNull(fi);
+        final GeneratedMessage? oldValue = fs._getFieldOrNull(fi);
         if (oldValue != null) {
           input.readMessage(oldValue, registry);
         } else {
-          var subMessage = meta._makeEmptyMessage(tagNumber, registry);
+          final subMessage = meta._makeEmptyMessage(tagNumber, registry);
           input.readMessage(subMessage, registry);
           fs._setFieldUnchecked(meta, fi, subMessage);
         }
@@ -149,7 +149,7 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
             meta, fs, input, wireType, fi, tagNumber, registry);
         break;
       case PbFieldType._REPEATED_GROUP:
-        var subMessage = meta._makeEmptyMessage(tagNumber, registry);
+        final subMessage = meta._makeEmptyMessage(tagNumber, registry);
         input.readGroup(tagNumber, subMessage, registry);
         fs._ensureRepeatedField(meta, fi).add(subMessage);
         break;
@@ -184,7 +184,7 @@ void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
         _readPackable(meta, fs, input, wireType, fi, input.readSfixed64);
         break;
       case PbFieldType._REPEATED_MESSAGE:
-        var subMessage = meta._makeEmptyMessage(tagNumber, registry);
+        final subMessage = meta._makeEmptyMessage(tagNumber, registry);
         input.readMessage(subMessage, registry);
         fs._ensureRepeatedField(meta, fi).add(subMessage);
         break;
@@ -216,10 +216,10 @@ void _readPackableToListEnum(
     int tagNumber,
     ExtensionRegistry registry) {
   void readToList(List list) {
-    var rawValue = input.readEnum();
-    var value = meta._decodeEnum(tagNumber, registry, rawValue);
+    final rawValue = input.readEnum();
+    final value = meta._decodeEnum(tagNumber, registry, rawValue);
     if (value == null) {
-      var unknown = fs._ensureUnknownFields();
+      final unknown = fs._ensureUnknownFields();
       unknown.mergeVarintField(tagNumber, Int64(rawValue));
     } else {
       list.add(value);
@@ -236,7 +236,7 @@ void _readPackableToList(
     int wireType,
     FieldInfo fi,
     Function(List) readToList) {
-  var list = fs._ensureRepeatedField(meta, fi);
+  final list = fs._ensureRepeatedField(meta, fi);
 
   if (wireType == WIRETYPE_LENGTH_DELIMITED) {
     // Packed.

diff --git a/protobuf/lib/src/protobuf/coded_buffer_reader.dart b/protobuf/lib/src/protobuf/coded_buffer_reader.dart
@@ -52,7 +52,7 @@ class CodedBufferReader {
           ' which claimed to have negative size.');
     }
     byteLimit += _bufferPos;
-    var oldLimit = _currentLimit;
+    final oldLimit = _currentLimit;
     if ((oldLimit != -1 && byteLimit > oldLimit) || byteLimit > _sizeLimit) {
       _throwTruncatedMessageError(byteLimit);
     }
@@ -85,7 +85,7 @@ class CodedBufferReader {
       throw InvalidProtocolBufferException.recursionLimitExceeded();
     }
     ++_recursionDepth;
-    var unknownFieldSet = UnknownFieldSet();
+    final unknownFieldSet = UnknownFieldSet();
     unknownFieldSet.mergeFromCodedBufferReader(this);
     checkLastTagWas(makeTag(fieldNumber, WIRETYPE_END_GROUP));
     --_recursionDepth;
@@ -94,7 +94,7 @@ class CodedBufferReader {
 
   void readMessage(
       GeneratedMessage message, ExtensionRegistry extensionRegistry) {
-    var length = readInt32();
+    final length = readInt32();
     if (_recursionDepth >= _recursionLimit) {
       throw InvalidProtocolBufferException.recursionLimitExceeded();
     }
@@ -104,7 +104,7 @@ class CodedBufferReader {
           ' which claimed to have negative size.');
     }
 
-    var oldLimit = _currentLimit;
+    final oldLimit = _currentLimit;
     _currentLimit = _bufferPos + length;
     if (_currentLimit > oldLimit) {
       _throwTruncatedMessageError(_currentLimit);
@@ -127,14 +127,14 @@ class CodedBufferReader {
   Int64 readFixed64() => readSfixed64();
   int readSfixed32() => _readByteData(4).getInt32(0, Endian.little);
   Int64 readSfixed64() {
-    var data = _readByteData(8);
-    var view = Uint8List.view(data.buffer, data.offsetInBytes, 8);
+    final data = _readByteData(8);
+    final view = Uint8List.view(data.buffer, data.offsetInBytes, 8);
     return Int64.fromBytes(view);
   }
 
   bool readBool() => _readRawVarint32(true) != 0;
   List<int> readBytes() {
-    var length = readInt32();
+    final length = readInt32();
     _checkLimit(length);
     return Uint8List.view(
         _buffer.buffer, _buffer.offsetInBytes + _bufferPos - length, length);
@@ -184,7 +184,7 @@ class CodedBufferReader {
     if (bytes > 10) bytes = 10;
     var result = 0;
     for (var i = 0; i < bytes; i++) {
-      var byte = _buffer[bufferPos++];
+      final byte = _buffer[bufferPos++];
       result |= (byte & 0x7f) << (i * 7);
       if ((byte & 0x80) == 0) {
         result &= 0xffffffff;
@@ -202,14 +202,14 @@ class CodedBufferReader {
 
     // Read low 28 bits.
     for (var i = 0; i < 4; i++) {
-      var byte = _readRawVarintByte();
+      final byte = _readRawVarintByte();
       lo |= (byte & 0x7f) << (i * 7);
       if ((byte & 0x80) == 0) return Int64.fromInts(hi, lo);
     }
 
     // Read middle 7 bits: 4 low belong to low part above,
     // 3 remaining belong to hi.
-    var byte = _readRawVarintByte();
+    final byte = _readRawVarintByte();
     lo |= (byte & 0xf) << 28;
     hi = (byte >> 4) & 0x7;
     if ((byte & 0x80) == 0) {
@@ -218,7 +218,7 @@ class CodedBufferReader {
 
     // Read remaining bits of hi.
     for (var i = 0; i < 5; i++) {
-      var byte = _readRawVarintByte();
+      final byte = _readRawVarintByte();
       hi |= (byte & 0x7f) << ((i * 7) + 3);
       if ((byte & 0x80) == 0) return Int64.fromInts(hi, lo);
     }

diff --git a/protobuf/lib/src/protobuf/coded_buffer_writer.dart b/protobuf/lib/src/protobuf/coded_buffer_writer.dart
@@ -72,7 +72,7 @@ class CodedBufferWriter {
       if (list.isNotEmpty) {
         _writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
         final mark = _startLengthDelimited();
-        for (var value in list) {
+        for (final value in list) {
           _writeValueAs(valueType, value);
         }
         _endLengthDelimited(mark);
@@ -110,7 +110,7 @@ class CodedBufferWriter {
   }
 
   Uint8List toBuffer() {
-    var result = Uint8List(_bytesTotal);
+    final result = Uint8List(_bytesTotal);
     writeTo(result);
     return result;
   }
@@ -236,7 +236,7 @@ class CodedBufferWriter {
   /// of bytes written into the reserved slice space.
   int _startLengthDelimited() {
     _commitSplice();
-    var index = _splices.length;
+    final index = _splices.length;
     // Reserve a space for a splice and use it to record the current number of
     // bytes written so that we can compute the length of data later in
     // _endLengthDelimited.
@@ -423,14 +423,14 @@ class CodedBufferWriter {
   /// Has a specialization for Uint8List for performance.
   int _copyInto(Uint8List buffer, int pos, TypedData value) {
     if (value is Uint8List) {
-      var len = value.length;
+      final len = value.length;
       for (var j = 0; j < len; j++) {
         buffer[pos++] = value[j];
       }
       return pos;
     } else {
-      var len = value.lengthInBytes;
-      var u8 = Uint8List.view(
+      final len = value.lengthInBytes;
+      final u8 = Uint8List.view(
           value.buffer, value.offsetInBytes, value.lengthInBytes);
       for (var j = 0; j < len; j++) {
         buffer[pos++] = u8[j];

diff --git a/protobuf/lib/src/protobuf/extension.dart b/protobuf/lib/src/protobuf/extension.dart
@@ -37,7 +37,7 @@ class Extension<T> extends FieldInfo<T> {
   bool operator ==(Object other) {
     if (other is! Extension) return false;
 
-    var o = other;
+    final o = other;
     return extendee == o.extendee && tagNumber == o.tagNumber;
   }
 }