Migration: don't overcount "whereOrNull" fixes.

stereotype441 · commit-bot@chromium.org · commit 3103e1e0f669 · 2020-11-13T18:51:30.000Z
Fixes #44174. Bug: #44174 Change-Id: Ida53a11afc2e265cd510b0ac63c50f6b5ac93fdd Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/171962 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/pkg/nnbd_migration/lib/src/front_end/info_builder.dart b/pkg/nnbd_migration/lib/src/front_end/info_builder.dart
@@ -361,7 +361,7 @@ class InfoBuilder {
 
     var lineInfo = result.unit.lineInfo;
     var insertions = <int, List<AtomicEdit>>{};
-    var hintsSeen = <HintComment>{};
+    var infosSeen = Set<AtomicEditInfo>.identity();
 
     // Apply edits and build the regions.
     var changes = sourceInfo.changes ?? {};
@@ -392,8 +392,7 @@ class InfoBuilder {
             ? const <TraceInfo>[]
             : _computeTraces(info.fixReasons);
         var description = info?.description;
-        var hint = info?.hintComment;
-        var isCounted = hint == null || hintsSeen.add(hint);
+        var isCounted = info != null && infosSeen.add(info);
         var explanation = description?.appliedMessage;
         var kind = description?.kind;
         if (edit.isInsertion) {
diff --git a/pkg/nnbd_migration/test/front_end/unit_renderer_test.dart b/pkg/nnbd_migration/test/front_end/unit_renderer_test.dart
@@ -161,6 +161,26 @@ bool  b = a!.isEven;
             ['1 late final hint converted to late and final keywords']));
   }
 
+  Future<void> test_editList_countsWhereOrNullSingly() async {
+    await buildInfoForSingleTestFile(
+        '''
+import 'package:collection/collection.dart';
+
+int firstEven(Iterable<int> x)
+    => x.firstWhere((x) => x.isEven, orElse: () => null);
+''',
+        removeViaComments: false,
+        migratedContent: '''
+import 'package:collection/collection.dart';
+
+int? firstEven(Iterable<int >  x)
+    => x.firstWherefirstWhereOrNull((x) => x.isEven, orElse: () => null);
+''');
+    var output = renderUnits()[0];
+    expect(output.edits.keys,
+        unorderedEquals(['1 method name changed', '1 type made nullable']));
+  }
+
   Future<void> test_editList_pluralHeader() async {
     await buildInfoForSingleTestFile('''
 int a = null;
