Error code validation updates.

pkg/analyzer/lib/src/task/options.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.task.options;
 
 import 'dart:collection';
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/plugin/options.dart';
@@ skipping 34 matching lines @@
   static const String exclude = 'exclude';
   static const String language = 'language';
   static const String plugins = 'plugins';
   static const String strong_mode = 'strong-mode';
 
   /// Ways to say `ignore`.
   static const List<String> ignoreSynonyms = const ['ignore', 'false'];
 
   /// Valid error `severity`s.
   static final List<String> severities =
-      ErrorSeverity.values.map((s) => s.name).toList();
+      new List.unmodifiable(severityMap.keys);
 
   /// Ways to say `include`.
   static const List<String> includeSynonyms = const ['include', 'true'];
 
   /// Ways to say `true` or `false`.
   static const List<String> trueOrFalse = const ['true', 'false'];
 
   /// Supported top-level `analyzer` options.
   static const List<String> topLevel = const [
     errors,
@@ skipping 48 matching lines @@
     }
   }
   AnalysisOptionsWarningCode get pluralProposalCode =>
       AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUES;
 
   AnalysisOptionsWarningCode get singularProposalCode =>
       AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUE;
 
   /// Report an unsupported [node] value, defined in the given [scopeName].
   void reportError(ErrorReporter reporter, String scopeName, YamlNode node) {
-    reporter.reportErrorForSpan(
-        code, node.span, [scopeName, node.value, proposal]);
+    reporter
+        .reportErrorForSpan(code, node.span, [scopeName, node.value, proposal]);
   }
 }
 
 /// Validates `analyzer` error filter options.
 class ErrorFilterOptionValidator extends OptionsValidator {
-  /// Pretty list of legal includes.
-  static final String legalIncludes = StringUtilities.printListOfQuotedNames(
+  /// Legal values.
+  static final List<String> legalValues =
       new List.from(AnalyzerOptions.ignoreSynonyms)
-        ..addAll(AnalyzerOptions.includeSynonyms));
+        ..addAll(AnalyzerOptions.includeSynonyms)
+        ..addAll(AnalyzerOptions.severities);
+
+  /// Pretty String listing legal values.
+  static final String legalValueString =
+      StringUtilities.printListOfQuotedNames(legalValues);
 
   /// Lazily populated set of error codes (hashed for speedy lookup).
   static HashSet<String> _errorCodes;
 
   /// Legal error code names.
   static Set<String> get errorCodes {
     if (_errorCodes == null) {
       _errorCodes = new HashSet<String>();
       // Engine codes.
       _errorCodes.addAll(ErrorCode.values.map((ErrorCode code) => code.name));
@@ skipping 18 matching lines @@
           value = toUpperCase(k.value);
           if (!errorCodes.contains(value)) {
             reporter.reportErrorForSpan(
                 AnalysisOptionsWarningCode.UNRECOGNIZED_ERROR_CODE,
                 k.span,
                 [k.value?.toString()]);
           }
         }
         if (v is YamlScalar) {
           value = toLowerCase(v.value);
-          if (!AnalyzerOptions.ignoreSynonyms.contains(value) &&
-              !AnalyzerOptions.includeSynonyms.contains(value)) {
+          if (!legalValues.contains(value)) {
             reporter.reportErrorForSpan(
                 AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUES,
-                v.span,
-                [AnalyzerOptions.errors, v.value?.toString(), legalIncludes]);
+                v.span, [
+              AnalyzerOptions.errors,
+              v.value?.toString(),
+              legalValueString
+            ]);
           }
         }
       });
     }
   }
 }
 
 /// A task that generates errors for an `.analysis_options` file.
 class GenerateOptionsErrorsTask extends SourceBasedAnalysisTask {
   /// The name of the input whose value is the content of the file.
@@ skipping 255 matching lines @@
           setLanguageOption(context, feature, v.value);
         }
       });
     } else if (configs is Map) {
       configs.forEach((k, v) => setLanguageOption(context, k, v));
     }
   }
 
   void setProcessors(AnalysisContext context, Object codes) {
     ErrorConfig config = new ErrorConfig(codes);
-    context.setConfigurationData(CONFIGURED_ERROR_PROCESSORS, config.processors);
+    context.setConfigurationData(
+        CONFIGURED_ERROR_PROCESSORS, config.processors);
   }
 
   void setStrongMode(AnalysisContext context, Object strongMode) {
     bool strong = strongMode is bool ? strongMode : false;
     if (context.analysisOptions.strongMode != strong) {
       AnalysisOptionsImpl options =
           new AnalysisOptionsImpl.from(context.analysisOptions);
       options.strongMode = strong;
       context.analysisOptions = options;
     }
   }
 }