commit 283ce865c835ee1058b3c8cb5679a30ba33b19cc
author Paul Berry <paulberry@google.com> Tue Sep 14 19:24:38 2021 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue Sep 14 19:24:38 2021 +0000
tree afad232bf3f0bfe83af5f9ee4b79dc612b68beef
parent d90b29716697d6bdaaa53b968d63bdeabdf28576

Migrate pkg/analyzer/tool/messages/generate.dart to null safety

Change-Id: Ib0c80b380f895dc4d72aebbfb23f57c5e5978534
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/213282
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>

pkg/analyzer/tool/messages/generate.dart

diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart
index 17946b6..4ca88ae 100644
--- a/pkg/analyzer/tool/messages/generate.dart
+++ b/pkg/analyzer/tool/messages/generate.dart
@@ -1,4 +1,3 @@
-// @dart = 2.9
 /// This file contains code to generate scanner and parser message
 /// based on the information in pkg/front_end/messages.yaml.
 ///
@@ -168,7 +167,7 @@
     }
     sortedErrorCodes.sort();
     for (var errorCode in sortedErrorCodes) {
-      final entry = entryMap[errorCode];
+      final entry = entryMap[errorCode]!;
       final className = nameForEntry(entry)[0];
       out.writeln();
       out.writeln('const $className _$errorCode =');
@@ -188,7 +187,7 @@
   }
 
   void generateFastaAnalyzerErrorCodeList() {
-    final sorted = List<Map>.filled(translatedEntries.length, null);
+    final sorted = List<Map?>.filled(translatedEntries.length, null);
     for (var entry in translatedEntries) {
       var index = entry['index'];
       if (index is int && index >= 1 && index <= sorted.length) {
@@ -201,7 +200,7 @@
     }
     out.writeln('final fastaAnalyzerErrorCodes = <ErrorCode?>[null,');
     for (var entry in sorted) {
-      List<String> name = nameForEntry(entry);
+      List<String> name = nameForEntry(entry!);
       out.writeln('_${name[1]},');
     }
     out.writeln('];');
@@ -266,7 +265,7 @@
       print('');
       print('The following ParserErrorCodes could be auto generated:');
       for (String analyzerName in analyzerToFasta.keys.toList()..sort()) {
-        List<String> fastaNames = analyzerToFasta[analyzerName];
+        List<String> fastaNames = analyzerToFasta[analyzerName]!;
         if (fastaNames.length == 1) {
           print('  $analyzerName = ${fastaNames.first}');
         } else {
@@ -283,7 +282,7 @@
     Token token = scanString(parserSource).tokens;
     while (!token.isEof) {
       if (token.isIdentifier) {
-        String fastaErrorCode;
+        String? fastaErrorCode;
         String lexeme = token.lexeme;
         if (lexeme.length > 7) {
           if (lexeme.startsWith('message')) {
@@ -299,7 +298,7 @@
           untranslatedFastaErrorCodes.add(fastaErrorCode);
         }
       }
-      token = token.next;
+      token = token.next!;
     }
     if (untranslatedFastaErrorCodes.isNotEmpty) {
       print('');