analyzer: Make LintRule.reportLintForToken.token non-nullable

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

Author: srawlins

pkg/analyzer/lib/src/lint/linter.dart

@@ -284,12 +284,12 @@ abstract class LintRule {
   }
 
   void reportLintForToken(
-    Token? token, {
+    Token token, {
     List<Object> arguments = const [],
     List<DiagnosticMessage>? contextMessages,
     ErrorCode? errorCode,
   }) {
-    if (token != null && !token.isSynthetic) {
+    if (!token.isSynthetic) {
       reporter.atToken(
         token,
         errorCode ?? lintCode,

pkg/linter/lib/src/rules/avoid_catches_without_on_clauses.dart

@@ -144,6 +144,9 @@ class _Visitor extends SimpleAstVisitor<void> {
     node.body.accept(validUseVisitor);
     if (validUseVisitor.hasValidUse) return;
 
-    rule.reportLintForToken(node.catchKeyword);
+    var catchKeyword = node.catchKeyword;
+    if (catchKeyword == null) return;
+
+    rule.reportLintForToken(catchKeyword);
   }
 }

pkg/linter/lib/src/rules/hash_and_equals.dart

@@ -51,8 +51,10 @@ class _Visitor extends SimpleAstVisitor<void> {
         if (hash is MethodDeclaration) {
           rule.reportLintForToken(hash.name, arguments: ['==', 'hashCode']);
         } else if (hash is FieldDeclaration) {
+          var hashCodeFieldName = getFieldName(hash, 'hashCode');
+          if (hashCodeFieldName == null) return;
           rule.reportLintForToken(
-            getFieldName(hash, 'hashCode'),
+            hashCodeFieldName,
             arguments: ['==', 'hashCode'],
           );
         }

pkg/linter/lib/src/rules/prefer_final_locals.dart

@@ -136,8 +136,9 @@ class _Visitor extends SimpleAstVisitor<void> {
         return;
       }
     }
-    if (node.keyword != null) {
-      rule.reportLintForToken(node.keyword);
+    var keyword = node.keyword;
+    if (keyword != null) {
+      rule.reportLintForToken(keyword);
     } else if (node.type != null) {
       rule.reportLint(node.type);
     }

pkg/linter/lib/src/rules/strict_top_level_inference.dart

@@ -133,9 +133,8 @@ class _Visitor extends SimpleAstVisitor<void> {
     for (var i = 0; i < parameters.length; i++) {
       var parameter = parameters[i];
       var parameterName = parameter.name;
-      if (parameterName != null && isWildcardIdentifier(parameterName.lexeme)) {
-        continue;
-      }
+      if (parameterName == null) continue;
+      if (isWildcardIdentifier(parameterName.lexeme)) continue;
 
       if (parameter is DefaultFormalParameter) {
         parameter = parameter.parameter;
@@ -253,7 +252,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     return overriddenMember != null;
   }
 
-  void _report(Token? errorToken, {Token? keyword}) {
+  void _report(Token errorToken, {Token? keyword}) {
     if (keyword == null || keyword.type == Keyword.FINAL) {
       rule.reportLintForToken(
         errorToken,

pkg/linter/lib/src/rules/unnecessary_const.dart

@@ -39,10 +39,11 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitInstanceCreationExpression(InstanceCreationExpression node) {
-    if (node.keyword?.type != Keyword.CONST) return;
+    var keyword = node.keyword;
+    if (keyword == null || keyword.type != Keyword.CONST) return;
 
     if (node.inConstantContext) {
-      rule.reportLintForToken(node.keyword);
+      rule.reportLintForToken(keyword);
     }
   }
 
@@ -54,10 +55,11 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitRecordLiteral(RecordLiteral node) {
-    if (node.constKeyword == null) return;
+    var constKeyword = node.constKeyword;
+    if (constKeyword == null) return;
 
     if (node.inConstantContext) {
-      rule.reportLintForToken(node.constKeyword);
+      rule.reportLintForToken(constKeyword);
     }
   }
 
@@ -68,10 +70,11 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 
   void _visitTypedLiteral(TypedLiteral node) {
-    if (node.constKeyword?.type != Keyword.CONST) return;
+    var constKeyword = node.constKeyword;
+    if (constKeyword == null || constKeyword.type != Keyword.CONST) return;
 
     if (node.inConstantContext) {
-      rule.reportLintForToken(node.constKeyword);
+      rule.reportLintForToken(constKeyword);
     }
   }
 }

pkg/linter/lib/src/rules/unnecessary_constructor_name.dart

@@ -56,7 +56,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 
   void _check(Token? name) {
-    if (name?.lexeme == 'new') {
+    if (name != null && name.lexeme == 'new') {
       rule.reportLintForToken(name);
     }
   }

pkg/linter/lib/src/rules/unnecessary_final.dart

@@ -67,7 +67,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var keyword = node.keyword;
     keyword ??=
         node.thisOrAncestorOfType<PatternVariableDeclaration>()?.keyword;
-    if (keyword?.type != Keyword.FINAL) return;
+    if (keyword == null || keyword.type != Keyword.FINAL) return;
 
     var errorCode = getErrorCode(node.matchedValueType);
     rule.reportLintForToken(keyword, errorCode: errorCode);
@@ -95,9 +95,11 @@ class _Visitor extends SimpleAstVisitor<void> {
     // loop. `a` is a variable declared outside the loop.
     if (forLoopParts is ForEachPartsWithDeclaration) {
       var loopVariable = forLoopParts.loopVariable;
+      var keyword = loopVariable.keyword;
+      if (keyword == null) return;
       if (loopVariable.isFinal) {
         var errorCode = getErrorCode(loopVariable.type);
-        rule.reportLintForToken(loopVariable.keyword, errorCode: errorCode);
+        rule.reportLintForToken(keyword, errorCode: errorCode);
       }
     } else if (forLoopParts is ForEachPartsWithPattern) {
       var keyword = forLoopParts.keyword;
@@ -112,9 +114,11 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitVariableDeclarationStatement(VariableDeclarationStatement node) {
+    var keyword = node.variables.keyword;
+    if (keyword == null) return;
     if (node.variables.isFinal) {
       var errorCode = getErrorCode(node.variables.type);
-      rule.reportLintForToken(node.variables.keyword, errorCode: errorCode);
+      rule.reportLintForToken(keyword, errorCode: errorCode);
     }
   }
 }

pkg/linter/lib/src/rules/unnecessary_late.dart

@@ -45,11 +45,12 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 
   void _visitVariableDeclarations(VariableDeclarationList node) {
-    if (node.lateKeyword == null) return;
+    var lateKeyword = node.lateKeyword;
+    if (lateKeyword == null) return;
     if (node.variables.any((v) => v.initializer == null)) {
       return;
     }
 
-    rule.reportLintForToken(node.lateKeyword);
+    rule.reportLintForToken(lateKeyword);
   }
 }

pkg/linter/lib/src/rules/unnecessary_new.dart

@@ -35,8 +35,9 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitInstanceCreationExpression(InstanceCreationExpression node) {
-    if (node.keyword?.type == Keyword.NEW) {
-      rule.reportLintForToken(node.keyword);
+    var keyword = node.keyword;
+    if (keyword != null && keyword.type == Keyword.NEW) {
+      rule.reportLintForToken(keyword);
     }
   }
 }