Require Dart 2.19, update to latest lints

Author: kevmoo

pkgs/yaml_edit/.github/workflows/test-package.yml

@@ -47,7 +47,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [2.12.0, stable, dev]
+        sdk: [2.19.0, stable, dev]
         platform: [vm, chrome]
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c

pkgs/yaml_edit/CHANGELOG.md

@@ -1,6 +1,6 @@
-## 2.1.1
+## 2.1.1-dev
 
-- Update to work with an unreleased version of `package:yaml`.
+- Require Dart 2.19
 
 ## 2.1.0
 - **Breaking** `wrapAsYamlNode(value, collectionStyle, scalarStyle)` will apply
@@ -9,7 +9,7 @@
   While this may change the style of the YAML documents written by applications
   that rely on the old behavior, such YAML documents should still be valid.
   Hence, we hope it is reasonable to make this change in a minor release.
-- Fix for cases that can't be encodded correctedly with
+- Fix for cases that can't be encoded correctly with
   `scalarStyle: ScalarStyle.SINGLE_QUOTED`.
 - Fix YamlEditor `appendToList` and `insertIntoList` functions inserts new item into next yaml item
   rather than at end of list.

pkgs/yaml_edit/analysis_options.yaml

@@ -1 +1 @@
-include: package:lints/recommended.yaml
+include: package:dart_flutter_team_lints/analysis_options.yaml

pkgs/yaml_edit/lib/src/editor.dart

@@ -14,7 +14,7 @@ import 'strings.dart';
 import 'utils.dart';
 import 'wrap.dart';
 
-/// An interface for modififying [YAML][1] documents while preserving comments
+/// An interface for modifying [YAML][1] documents while preserving comments
 /// and whitespaces.
 ///
 /// YAML parsing is supported by `package:yaml`, and modifications are performed
@@ -124,7 +124,7 @@ class YamlEditor {
       if (visited.add(node)) {
         if (node is YamlMap) {
           node.nodes.forEach((key, value) {
-            collectAliases(key);
+            collectAliases(key as YamlNode);
             collectAliases(value);
           });
         } else if (node is YamlList) {
@@ -194,7 +194,8 @@ class YamlEditor {
   /// Sets [value] in the [path].
   ///
   /// There is a subtle difference between [update] and [remove] followed by
-  /// an [insertIntoList], because [update] preserves comments at the same level.
+  /// an [insertIntoList], because [update] preserves comments at the same
+  /// level.
   ///
   /// Throws a [ArgumentError] if [path] is invalid.
   ///
@@ -291,8 +292,8 @@ class YamlEditor {
 
   /// Prepends [value] to the list at [path].
   ///
-  /// Throws a [ArgumentError] if the element at the given path is not a [YamlList]
-  /// or if the path is invalid.
+  /// Throws a [ArgumentError] if the element at the given path is not a
+  /// [YamlList] or if the path is invalid.
   ///
   /// **Example:**
   /// ```dart
@@ -354,11 +355,11 @@ class YamlEditor {
 
     final nodesToRemove = list.nodes.getRange(index, index + deleteCount);
 
-    /// Perform addition of elements before removal to avoid scenarioes where
-    /// a block list gets emptied out to {} to avoid changing collection styles
-    /// where possible.
+    // Perform addition of elements before removal to avoid scenarios where
+    // a block list gets emptied out to {} to avoid changing collection styles
+    // where possible.
 
-    /// Reverse [values] and insert them.
+    // Reverse [values] and insert them.
     final reversedValues = values.toList().reversed;
     for (final value in reversedValues) {
       insertIntoList(path, index, value);
@@ -512,7 +513,9 @@ class YamlEditor {
       final keyList = node.keys.toList();
       for (var i = 0; i < node.length; i++) {
         final updatedPath = [...path, keyList[i]];
-        if (_aliases.contains(keyList[i])) throw AliasError(path, keyList[i]);
+        if (_aliases.contains(keyList[i])) {
+          throw AliasError(path, keyList[i] as YamlNode);
+        }
         _assertNoChildAlias(updatedPath, node.nodes[keyList[i]]);
       }
     }
@@ -604,8 +607,11 @@ class YamlEditor {
     if (tree is YamlMap) {
       return updatedYamlMap(
           tree,
-          (nodes) => nodes[keyOrIndex] = _deepModify(nodes[keyOrIndex], path,
-              path.take(subPath.length + 1), expectedNode));
+          (nodes) => nodes[keyOrIndex] = _deepModify(
+              nodes[keyOrIndex] as YamlNode,
+              path,
+              path.take(subPath.length + 1),
+              expectedNode));
     }
 
     /// Should not ever reach here.

pkgs/yaml_edit/lib/src/equality.dart

@@ -80,7 +80,7 @@ int deepHashCode(Object? value) {
   } else if (value is Iterable) {
     return const IterableEquality().hash(value.map(deepHashCode));
   } else if (value is YamlScalar) {
-    return value.value.hashCode;
+    return (value.value as Object?).hashCode;
   }
 
   return value.hashCode;
@@ -97,7 +97,7 @@ YamlNode? getNextKeyNode(YamlMap map, Object? key) {
   final keyIterator = map.nodes.keys.iterator;
   while (keyIterator.moveNext()) {
     if (deepEquals(keyIterator.current, key) && keyIterator.moveNext()) {
-      return keyIterator.current;
+      return keyIterator.current as YamlNode?;
     }
   }
 

pkgs/yaml_edit/lib/src/errors.dart

@@ -59,11 +59,11 @@ class AliasError extends UnsupportedError {
 
   AliasError(this.path, this.anchor)
       : super('Encountered an alias node along $path! '
-            'Alias nodes are nodes that refer to a previously serialized nodes, '
-            'and are denoted by either the "*" or the "&" indicators in the '
-            'original YAML. As the resulting behavior of mutations on these '
-            'nodes is not well-defined, the operation will not be supported '
-            'by this library.\n\n'
+            'Alias nodes are nodes that refer to a previously serialized '
+            'nodes, and are denoted by either the "*" or the "&" indicators in '
+            'the original YAML. As the resulting behavior of mutations on '
+            'these nodes is not well-defined, the operation will not be '
+            'supported by this library.\n\n'
             '${anchor.span.message('The alias was first defined here.')}');
 }
 

pkgs/yaml_edit/lib/src/list_mutations.dart

@@ -38,16 +38,15 @@ SourceEdit updateInList(
     if ((newValue is List && (newValue as List).isNotEmpty) ||
         (newValue is Map && (newValue as Map).isNotEmpty)) {
       valueString = valueString.substring(indentation);
-    } else if (isCollection(currValue) &&
-        getStyle(currValue) == CollectionStyle.BLOCK) {
+    } else if (currValue.collectionStyle == CollectionStyle.BLOCK) {
       valueString += lineEnding;
     }
 
     var end = getContentSensitiveEnd(currValue);
     if (end <= offset) {
       offset++;
       end = offset;
-      valueString = ' ' + valueString;
+      valueString = ' $valueString';
     }
 
     return SourceEdit(offset, end - offset, valueString);
@@ -107,14 +106,16 @@ SourceEdit _appendToFlowList(
 }
 
 /// Returns a [SourceEdit] describing the change to be made on [yaml] to achieve
-/// the effect of addition [item] into [nodes], noting that this is a block list.
+/// the effect of addition [item] into [nodes], noting that this is a block
+/// list.
 SourceEdit _appendToBlockList(
     YamlEditor yamlEdit, YamlList list, YamlNode item) {
   var formattedValue = _formatNewBlock(yamlEdit, list, item);
   final yaml = yamlEdit.toString();
   var offset = list.span.end.offset;
 
-  // Adjusts offset to after the trailing newline of the last entry, if it exists
+  // Adjusts offset to after the trailing newline of the last entry, if it
+  // exists
   if (list.isNotEmpty) {
     final lastValueSpanEnd = list.nodes.last.span.end.offset;
     final nextNewLineIndex = yaml.indexOf('\n', lastValueSpanEnd - 1);
@@ -139,7 +140,7 @@ String _formatNewBlock(YamlEditor yamlEdit, YamlList list, YamlNode item) {
   if (isCollection(item) && !isFlowYamlCollectionNode(item) && !isEmpty(item)) {
     valueString = valueString.substring(newIndentation);
   }
-  final indentedHyphen = ' ' * listIndentation + '- ';
+  final indentedHyphen = '${' ' * listIndentation}- ';
 
   return '$indentedHyphen$valueString$lineEnding';
 }

pkgs/yaml_edit/lib/src/map_mutations.dart

@@ -87,9 +87,9 @@ SourceEdit _addToBlockMap(
   if (isCollection(newValue) &&
       !isFlowYamlCollectionNode(newValue) &&
       !isEmpty(newValue)) {
-    formattedValue += '$keyString:' + lineEnding + valueString + lineEnding;
+    formattedValue += '$keyString:$lineEnding$valueString$lineEnding';
   } else {
-    formattedValue += '$keyString: ' + valueString + lineEnding;
+    formattedValue += '$keyString: $valueString$lineEnding';
   }
 
   return SourceEdit(offset, 0, formattedValue);
@@ -141,7 +141,7 @@ SourceEdit _replaceInBlockMap(
 
   if (!valueAsString.startsWith(lineEnding)) {
     // prepend whitespace to ensure there is space after colon.
-    valueAsString = ' ' + valueAsString;
+    valueAsString = ' $valueAsString';
   }
 
   /// +1 accounts for the colon

pkgs/yaml_edit/lib/src/source_edit.dart

@@ -15,7 +15,8 @@ import 'package:meta/meta.dart';
 /// ```
 /// foo: barbar
 /// ```
-/// will be represented by `SourceEdit(offset: 4, length: 3, replacement: 'bar')`
+/// will be represented by
+/// `SourceEdit(offset: 4, length: 3, replacement: 'bar')`
 @sealed
 class SourceEdit {
   /// The offset from the start of the string where the modification begins.

pkgs/yaml_edit/lib/src/strings.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:yaml/yaml.dart';
+
 import 'utils.dart';
 
 /// Given [value], tries to format it into a plain string recognizable by YAML.
@@ -100,9 +101,9 @@ String _tryYamlEncodeFolded(String string, int indentation, String lineEnding) {
   final removedPortion = string.substring(trimmedString.length);
 
   if (removedPortion.contains('\n')) {
-    result = '>+\n' + ' ' * indentation;
+    result = '>+\n${' ' * indentation}';
   } else {
-    result = '>-\n' + ' ' * indentation;
+    result = '>-\n${' ' * indentation}';
   }
 
   /// Duplicating the newline for folded strings preserves it in YAML.
@@ -131,15 +132,15 @@ String _tryYamlEncodeLiteral(
 /// if possible.
 ///
 /// If [value] is a [YamlScalar], we try to respect its [style] parameter where
-/// possible. Certain cases make this impossible (e.g. a plain string scalar that
-/// starts with '>'), in which case we will produce [value] with default styling
-/// options.
+/// possible. Certain cases make this impossible (e.g. a plain string scalar
+/// that starts with '>'), in which case we will produce [value] with default
+/// styling options.
 String _yamlEncodeFlowScalar(YamlNode value) {
   if (value is YamlScalar) {
     assertValidScalar(value.value);
 
-    if (value.value is String) {
-      final val = value.value as String;
+    final val = value.value;
+    if (val is String) {
       if (_hasUnprintableCharacters(val) ||
           value.style == ScalarStyle.DOUBLE_QUOTED) {
         return _yamlEncodeDoubleQuoted(val);
@@ -172,8 +173,8 @@ String yamlEncodeBlockScalar(
   if (value is YamlScalar) {
     assertValidScalar(value.value);
 
-    if (value.value is String) {
-      final val = value.value as String;
+    final val = value.value;
+    if (val is String) {
       if (_hasUnprintableCharacters(val)) {
         return _yamlEncodeDoubleQuoted(val);
       }
@@ -215,15 +216,15 @@ String yamlEncodeFlowString(YamlNode value) {
     final list = value.nodes;
 
     final safeValues = list.map(yamlEncodeFlowString);
-    return '[' + safeValues.join(', ') + ']';
+    return '[${safeValues.join(', ')}]';
   } else if (value is YamlMap) {
     final safeEntries = value.nodes.entries.map((entry) {
-      final safeKey = yamlEncodeFlowString(entry.key);
+      final safeKey = yamlEncodeFlowString(entry.key as YamlNode);
       final safeValue = yamlEncodeFlowString(entry.value);
       return '$safeKey: $safeValue';
     });
 
-    return '{' + safeEntries.join(', ') + '}';
+    return '{${safeEntries.join(', ')}}';
   }
 
   return _yamlEncodeFlowScalar(value);
@@ -244,7 +245,7 @@ String yamlEncodeBlockString(
   final newIndentation = indentation + additionalIndentation;
 
   if (value is YamlList) {
-    if (value.isEmpty) return ' ' * indentation + '[]';
+    if (value.isEmpty) return '${' ' * indentation}[]';
 
     Iterable<String> safeValues;
 
@@ -257,26 +258,26 @@ String yamlEncodeBlockString(
         valueString = valueString.substring(newIndentation);
       }
 
-      return ' ' * indentation + '- $valueString';
+      return '${' ' * indentation}- $valueString';
     });
 
     return safeValues.join(lineEnding);
   } else if (value is YamlMap) {
-    if (value.isEmpty) return ' ' * indentation + '{}';
+    if (value.isEmpty) return '${' ' * indentation}{}';
 
     return value.nodes.entries.map((entry) {
-      final safeKey = yamlEncodeFlowString(entry.key);
+      final safeKey = yamlEncodeFlowString(entry.key as YamlNode);
       final formattedKey = ' ' * indentation + safeKey;
       final formattedValue =
           yamlEncodeBlockString(entry.value, newIndentation, lineEnding);
 
       /// Empty collections are always encoded in flow-style, so new-line must
       /// be avoided
       if (isCollection(entry.value) && !isEmpty(entry.value)) {
-        return formattedKey + ':\n' + formattedValue;
+        return '$formattedKey:\n$formattedValue';
       }
 
-      return formattedKey + ': ' + formattedValue;
+      return '$formattedKey: $formattedValue';
     }).join(lineEnding);
   }