Simplify ForEachPartsWithDeclaration case in LocalDeclarationVisitor.

scheglov · commit-bot@chromium.org · commit 1e7d4fd81e44 · 2019-11-18T18:10:33.000Z
These nodes are never null. R=brianwilkerson@google.com Change-Id: Ia0b073f0816c7ba6243f0a8b47bb8b18b48ef802 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125560 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart b/pkg/analyzer_plugin/lib/src/utilities/visitors/local_declaration_visitor.dart
@@ -155,14 +155,8 @@ abstract class LocalDeclarationVisitor extends GeneralizingAstVisitor {
   visitForStatement(ForStatement node) {
     var forLoopParts = node.forLoopParts;
     if (forLoopParts is ForEachPartsWithDeclaration) {
-      DeclaredIdentifier loopVar = forLoopParts.loopVariable;
-      if (loopVar != null) {
-        SimpleIdentifier id = loopVar.identifier;
-        if (id != null) {
-          // If there is no loop variable, don't declare it.
-          declaredLocalVar(id, loopVar.type);
-        }
-      }
+      DeclaredIdentifier loopVariable = forLoopParts.loopVariable;
+      declaredLocalVar(loopVariable.identifier, loopVariable.type);
     } else if (forLoopParts is ForPartsWithDeclarations) {
       VariableDeclarationList varList = forLoopParts.variables;
       if (varList != null) {
