[messages] Change diagnostic code maps to lists.

Changes the variables `analyzerMessages`, `feAnalyzerSharedMessages`,
`frontEndMessages`, and `lintMessages` from maps (keyed by analyzer
code or front end code) to lists. The map functionality is no longer
needed now that analyzer and front end codes are stored in the
`Message` objects, and maps are available in `diagnosticTables` for
looking up messages by name when needed.

Change-Id: I6a6a6964138f9bd17d3595b3ed8aaf4aadd9ecfd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/457540
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Paul Berry <[email protected]>

Author: stereotype441

pkg/analyzer_utilities/lib/analyzer_messages.dart

@@ -174,8 +174,9 @@ const transformSetErrorCodeFile = GeneratedDiagnosticFile(
 );
 
 /// Decoded messages from the analyzer's `messages.yaml` file.
-final Map<AnalyzerCode, AnalyzerMessage> analyzerMessages =
-    decodeAnalyzerMessagesYaml(analyzerPkgPath);
+final List<AnalyzerMessage> analyzerMessages = decodeAnalyzerMessagesYaml(
+  analyzerPkgPath,
+);
 
 /// The path to the `analyzer` package.
 final String analyzerPkgPath = normalize(
@@ -186,20 +187,20 @@ final String analyzerPkgPath = normalize(
 final String linterPkgPath = normalize(join(pkg_root.packageRoot, 'linter'));
 
 /// Decoded messages from the linter's `messages.yaml` file.
-final Map<AnalyzerCode, AnalyzerMessage> lintMessages =
-    decodeAnalyzerMessagesYaml(linterPkgPath);
+final List<AnalyzerMessage> lintMessages = decodeAnalyzerMessagesYaml(
+  linterPkgPath,
+);
 
-/// Decodes a YAML object (obtained from a `messages.yaml` file) into a map.
-Map<AnalyzerCode, AnalyzerMessage> decodeAnalyzerMessagesYaml(
-  String packagePath,
-) {
+/// Decodes a YAML object (in analyzer style `messages.yaml` format) into a list
+/// of [AnalyzerMessage]s.
+List<AnalyzerMessage> decodeAnalyzerMessagesYaml(String packagePath) {
   var path = join(packagePath, 'messages.yaml');
   var yaml = loadYamlNode(
     File(path).readAsStringSync(),
     sourceUrl: Uri.file(path),
   );
 
-  var result = <AnalyzerCode, AnalyzerMessage>{};
+  var result = <AnalyzerMessage>[];
   if (yaml is! YamlMap) {
     throw LocatedError('root node is not a map', node: yaml);
   }
@@ -241,12 +242,13 @@ Map<AnalyzerCode, AnalyzerMessage> decodeAnalyzerMessagesYaml(
           diagnosticClass: DiagnosticClassInfo.byName(className),
           snakeCaseName: diagnosticName,
         );
-        return result[analyzerCode] = AnalyzerMessage.fromYaml(
+        return AnalyzerMessage.fromYaml(
           diagnosticValue,
           keyNode: keyNode,
           analyzerCode: analyzerCode,
         );
       });
+      result.add(message);
       if (message.hasPublishedDocs == null) {
         throw LocatedError('Missing hasPublishedDocs', node: diagnosticValue);
       }

pkg/analyzer_utilities/lib/messages.dart

@@ -31,27 +31,26 @@ const Map<String, String> severityEnumNames = <String, String>{
 /// For details see the documentation for fields in the [DiagnosticTables]
 /// class.
 final DiagnosticTables diagnosticTables = DiagnosticTables._([
-  ...frontEndMessages.values,
-  ...feAnalyzerSharedMessages.values,
-  ...analyzerMessages.values,
-  ...lintMessages.values,
+  ...frontEndMessages,
+  ...feAnalyzerSharedMessages,
+  ...analyzerMessages,
+  ...lintMessages,
 ]);
 
 /// Decoded messages from the `_fe_analyzer_shared` package's `messages.yaml`
 /// file.
-final Map<String, SharedMessage> feAnalyzerSharedMessages =
-    _loadCfeStyleMessages(
-      feAnalyzerSharedPkgPath,
-      decodeMessage: SharedMessage.fromYaml,
-    );
+final List<SharedMessage> feAnalyzerSharedMessages = _loadCfeStyleMessages(
+  feAnalyzerSharedPkgPath,
+  decodeMessage: SharedMessage.fromYaml,
+);
 
 /// The path to the `fe_analyzer_shared` package.
 final String feAnalyzerSharedPkgPath = normalize(
   join(pkg_root.packageRoot, '_fe_analyzer_shared'),
 );
 
 /// Decoded messages from the front end's `messages.yaml` file.
-final Map<String, FrontEndMessage> frontEndMessages = _loadCfeStyleMessages(
+final List<FrontEndMessage> frontEndMessages = _loadCfeStyleMessages(
   frontEndPkgPath,
   decodeMessage: FrontEndMessage.fromYaml,
 );
@@ -86,14 +85,14 @@ String convertTemplate(List<TemplatePart> template) {
       .join();
 }
 
-/// Decodes a YAML object (in CFE style `messages.yaml` format) into a map from
-/// diagnostic name to [Message].
-Map<String, T> decodeCfeStyleMessagesYaml<T extends CfeStyleMessage>(
+/// Decodes a YAML object (in CFE style `messages.yaml` format) into a list of
+/// [CfeStyleMessage]s.
+List<T> decodeCfeStyleMessagesYaml<T extends CfeStyleMessage>(
   YamlNode yaml, {
   required T Function(YamlMap, {required YamlScalar keyNode}) decodeMessage,
   required String path,
 }) {
-  var result = <String, T>{};
+  var result = <T>[];
   if (yaml is! YamlMap) {
     throw LocatedError('root node is not a map', node: yaml);
   }
@@ -113,16 +112,18 @@ Map<String, T> decodeCfeStyleMessagesYaml<T extends CfeStyleMessage>(
         node: diagnosticValue,
       );
     }
-    result[diagnosticName] = LocatedError.wrap(
-      node: diagnosticValue,
-      () => decodeMessage(diagnosticValue, keyNode: keyNode),
+    result.add(
+      LocatedError.wrap(
+        node: diagnosticValue,
+        () => decodeMessage(diagnosticValue, keyNode: keyNode),
+      ),
     );
   }
   return result;
 }
 
 /// Loads messages in CFE style `messages.yaml` format.
-Map<String, T> _loadCfeStyleMessages<T extends CfeStyleMessage>(
+List<T> _loadCfeStyleMessages<T extends CfeStyleMessage>(
   String packagePath, {
   required T Function(YamlMap, {required YamlScalar keyNode}) decodeMessage,
 }) {

pkg/linter/tool/generate_lints.dart

@@ -47,7 +47,7 @@ part of 'lint_codes.dart';
 class LinterLintCode extends LintCodeWithExpectedTypes {
 ''');
       var memberAccumulator = MemberAccumulator();
-      for (var message in lintMessages.values) {
+      for (var message in lintMessages) {
         var analyzerCode = message.analyzerCode;
         var lintName = message.sharedName ?? analyzerCode.snakeCaseName;
         if (messagesRuleInfo[lintName]!.removed) continue;