[fix] fix unnecessary_ignore eol ignore corrections

Change-Id: Ifdae16f0a401d28322796b3fecc2e575896fca37
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405246
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>

Author: pq

pkg/analysis_server/test/src/services/correction/fix/remove_ignore_comment_test.dart

@@ -74,6 +74,19 @@ class C {
 class C {
   void f(){}
 }
+''');
+  }
+
+  Future<void> test_line_eol() async {
+    await resolveTestCode('''
+class C {
+  void f(){} // ignore: unused_local_variable
+}
+''');
+    await assertHasFix('''
+class C {
+  void f(){}
+}
 ''');
   }
 }

pkg/analysis_server/test/src/services/correction/fix/remove_ignored_diagnostic_test.dart

@@ -94,6 +94,30 @@ int f() => null;
 ''');
   }
 
+  Future<void> test_file_first_eol() async {
+    await resolveTestCode('''
+import 'dart:io'; // ignore_for_file: unused_local_variable, unused_import
+void f() {}
+''');
+    await assertHasFix('''
+import 'dart:io'; // ignore_for_file: unused_import
+void f() {}
+''');
+  }
+
+  Future<void> test_file_first_leading_and_eol() async {
+    await resolveTestCode('''
+// ignore_for_file: return_of_invalid_type
+import 'dart:io'; // ignore_for_file: unused_local_variable, unused_import
+int f() => null;
+''');
+    await assertHasFix('''
+// ignore_for_file: return_of_invalid_type
+import 'dart:io'; // ignore_for_file: unused_import
+int f() => null;
+''');
+  }
+
   Future<void> test_file_last() async {
     await resolveTestCode('''
 // ignore_for_file: return_of_invalid_type, unused_local_variable
@@ -127,6 +151,30 @@ int f() => null;
 ''');
   }
 
+  Future<void> test_line_first_eol() async {
+    await resolveTestCode('''
+class C {
+  int f() => null; // ignore: unused_local_variable, return_of_invalid_type
+}''');
+    await assertHasFix('''
+class C {
+  int f() => null; // ignore: return_of_invalid_type
+}''');
+  }
+
+  Future<void> test_line_first_leading_and_eol() async {
+    await resolveTestCode('''
+class C {
+  // ignore: private_optional_parameter
+  int f({required _a}) => null; // ignore: unused_local_variable, return_of_invalid_type
+}''');
+    await assertHasFix('''
+class C {
+  // ignore: private_optional_parameter
+  int f({required _a}) => null; // ignore: return_of_invalid_type
+}''');
+  }
+
   Future<void> test_line_last() async {
     await resolveTestCode('''
 // ignore: return_of_invalid_type, unused_local_variable

pkg/analyzer/lib/src/error/ignore_validator.dart

@@ -215,21 +215,34 @@ class IgnoreValidator {
           }
         }
 
-        var diagnosticsOnLine = 0;
+        // We need to calculate if there are multiple diagnostic names in this
+        // ignore comment.
+        //
+        // (This will determine what kind of fix to propose.)
+
         var currentLine = _lineInfo.getLocation(ignoredName.offset).lineNumber;
 
-        // Calculate if there are multiple diagnostic names in this ignore comment.
-        // (This will determine what kind of fix to propose.)
+        // First we need to collect the (possibly) relevant ignores.
+        late Iterable<IgnoredElement> ignoredElements;
         if (forFile) {
-          for (var ignore in _ignoreInfo.ignoredForFile) {
-            if (ignore is IgnoredDiagnosticName) {
-              var ignoreLine = _lineInfo.getLocation(ignore.offset).lineNumber;
-              if (ignoreLine == currentLine) diagnosticsOnLine++;
-            }
-          }
+          ignoredElements = _ignoreInfo.ignoredForFile;
         } else {
-          diagnosticsOnLine =
-              _ignoreInfo.ignoredOnLine[currentLine + 1]?.length ?? 0;
+          // To account for preceding and same-line ignore comments, we look at
+          // the current line and its next.
+          ignoredElements = {
+            ...?_ignoreInfo.ignoredOnLine[currentLine],
+            ...?_ignoreInfo.ignoredOnLine[currentLine + 1],
+          };
+        }
+
+        // Then we further narrow them down to ignored diagnostics that correspond
+        // to the [currentLine].
+        var diagnosticsOnLine = 0;
+        for (var ignore in ignoredElements) {
+          if (ignore is IgnoredDiagnosticName) {
+            var ignoreLine = _lineInfo.getLocation(ignore.offset).lineNumber;
+            if (ignoreLine == currentLine) diagnosticsOnLine++;
+          }
         }
 
         late ErrorCode lintCode;