Rename AnalysisOptionsimpl.unignorableNames to .unignorableDiagnosticCodeNames

'unignorableNames' is ambiguous.

Change-Id: Ieb42d7cb612c27eb285f1eabdaa7a7584b63e96b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/434521
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analysis_server_plugin/lib/src/correction/ignore_diagnostic.dart

@@ -247,7 +247,7 @@ abstract class _BaseIgnoreDiagnostic extends ResolvedCorrectionProducer {
   /// - `error.code` is already ignored in the `errors` list.
   bool get _isCodeUnignorable {
     var cannotIgnore = (analysisOptions as AnalysisOptionsImpl)
-        .unignorableNames
+        .unignorableDiagnosticCodeNames
         .contains(diagnostic.diagnosticCode.name);
 
     if (cannotIgnore) {

pkg/analyzer/lib/src/dart/analysis/analysis_options.dart

@@ -59,7 +59,7 @@ final class AnalysisOptionsBuilder {
 
   FormatterOptions formatterOptions = FormatterOptions();
 
-  Set<String> unignorableNames = {};
+  Set<String> unignorableDiagnosticCodeNames = {};
 
   List<PluginConfiguration> pluginConfigurations = [];
 
@@ -81,7 +81,7 @@ final class AnalysisOptionsBuilder {
       chromeOsManifestChecks: chromeOsManifestChecks,
       codeStyleOptions: codeStyleOptions,
       formatterOptions: formatterOptions,
-      unignorableNames: unignorableNames,
+      unignorableDiagnosticCodeNames: unignorableDiagnosticCodeNames,
     );
   }
 
@@ -315,17 +315,19 @@ final class AnalysisOptionsBuilder {
           );
           if (processors.isNotEmpty &&
               processors.first.severity?.displayName == severity) {
-            unignorableNames.add(e.name);
+            unignorableDiagnosticCodeNames.add(e.name);
             continue;
           }
           // Otherwise, add [error] if its default severity is [severity].
           if (e.severity.displayName == severity) {
-            unignorableNames.add(e.name);
+            unignorableDiagnosticCodeNames.add(e.name);
           }
         }
       }
     }
-    unignorableNames.addAll(stringValues.map((name) => name.toUpperCase()));
+    unignorableDiagnosticCodeNames.addAll(
+      stringValues.map((name) => name.toUpperCase()),
+    );
   }
 }
 
@@ -402,10 +404,9 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   @override
   final FormatterOptions formatterOptions;
 
-  /// The set of "un-ignorable" error names, as parsed from an analysis options
-  /// file.
-  // TODO(srawlins): Rename to `unignorableCodes`. 'Names' is ambiguous.
-  final Set<String> unignorableNames;
+  /// The set of "un-ignorable" diagnostic names, as parsed from an analysis
+  /// options file.
+  final Set<String> unignorableDiagnosticCodeNames;
 
   /// Returns a newly instantiated [AnalysisOptionsImpl].
   ///
@@ -514,7 +515,7 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     required this.chromeOsManifestChecks,
     required this.codeStyleOptions,
     required this.formatterOptions,
-    required this.unignorableNames,
+    required this.unignorableDiagnosticCodeNames,
   }) : _contextFeatures = contextFeatures {
     (codeStyleOptions as CodeStyleOptionsImpl).options = this;
   }

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

@@ -374,7 +374,7 @@ class LibraryAnalyzer {
         fileAnalysis.diagnosticListener.diagnostics,
         fileAnalysis.ignoreInfo,
         fileAnalysis.unit.lineInfo,
-        _analysisOptions.unignorableNames,
+        _analysisOptions.unignorableDiagnosticCodeNames,
         validateUnnecessaryIgnores,
       ).reportErrors();
     }
@@ -573,7 +573,7 @@ class LibraryAnalyzer {
       return diagnostics;
     }
 
-    var unignorableCodes = _analysisOptions.unignorableNames;
+    var unignorableCodes = _analysisOptions.unignorableDiagnosticCodeNames;
 
     bool isIgnored(Diagnostic diagnostic) {
       var code = diagnostic.diagnosticCode;

pkg/analyzer/test/src/options/analysis_options_test.dart

@@ -53,8 +53,11 @@ analyzer:
     - another
 ''');
 
-    var unignorableNames = analysisOptions.unignorableNames;
-    expect(unignorableNames, unorderedEquals(['ONE_ERROR_CODE', 'ANOTHER']));
+    var unignorableCodeNames = analysisOptions.unignorableDiagnosticCodeNames;
+    expect(
+      unignorableCodeNames,
+      unorderedEquals(['ONE_ERROR_CODE', 'ANOTHER']),
+    );
   }
 
   test_analyzer_cannotIgnore_severity() {
@@ -64,9 +67,9 @@ analyzer:
     - error
 ''');
 
-    var unignorableNames = analysisOptions.unignorableNames;
-    expect(unignorableNames, contains('INVALID_ANNOTATION'));
-    expect(unignorableNames.length, greaterThan(500));
+    var unignorableCodeNames = analysisOptions.unignorableDiagnosticCodeNames;
+    expect(unignorableCodeNames, contains('INVALID_ANNOTATION'));
+    expect(unignorableCodeNames.length, greaterThan(500));
   }
 
   test_analyzer_cannotIgnore_severity_withProcessor() {
@@ -78,8 +81,8 @@ analyzer:
     - error
 ''');
 
-    var unignorableNames = analysisOptions.unignorableNames;
-    expect(unignorableNames, contains('UNUSED_IMPORT'));
+    var unignorableCodeNames = analysisOptions.unignorableDiagnosticCodeNames;
+    expect(unignorableCodeNames, contains('UNUSED_IMPORT'));
   }
 
   test_analyzer_chromeos_checks() {