Issue 39025. ForEachPartsWithIdentifier does not define anything, don't pretend that it is a LocalVariableElement.

scheglov · commit-bot@chromium.org · commit fe3fadbdba66 · 2019-11-18T15:44:13.000Z
R=brianwilkerson@google.com Bug: #39025 Change-Id: Ieda56c73a1928434a29aa947c44fc29b66a79464 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125525 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
@@ -2537,6 +2537,51 @@ class B extends ^
     assertNoSuggestions();
   }
 
+  test_forEachPartsWithIdentifier_class() async {
+    addTestSource('''
+class C {}
+
+main() {
+ for(C in [0, 1, 2]) {
+   ^
+ }
+}
+''');
+    await computeSuggestions();
+    // Using `C` in for-each is invalid, but we should not crash.
+  }
+
+  test_forEachPartsWithIdentifier_localLevelVariable() async {
+    addTestSource('''
+main() {
+  int v;
+ for(v in [0, 1, 2]) {
+   ^
+ }
+}
+''');
+    await computeSuggestions();
+    // We don't actually use anything from the `for`, and `v` is suggested
+    // just because it is a visible top-level declaration.
+    assertSuggestLocalVariable('v', 'int');
+  }
+
+  test_forEachPartsWithIdentifier_topLevelVariable() async {
+    addTestSource('''
+int v;
+main() {
+ for(v in [0, 1, 2]) {
+   ^
+ }
+}
+''');
+    await computeSuggestions();
+    // We don't actually use anything from the `for`, and `v` is suggested
+    // just because it is a visible top-level declaration.
+    assertSuggestTopLevelVar('v', 'int',
+        relevance: DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE);
+  }
+
   test_ForEachStatement() async {
     // SimpleIdentifier  ForEachStatement
     addTestSource('main() {List<int> values; for (int index in ^)}');
@@ -2584,7 +2629,7 @@ class B extends ^
 
   test_ForEachStatement_body_untyped() async {
     // Block  ForEachStatement
-    addTestSource('main(args) {for (foo in bar) {^}}');
+    addTestSource('main(args) {for (var foo in bar) {^}}');
     await computeSuggestions();
 
     expect(replacementOffset, completionOffset);
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
@@ -163,12 +163,6 @@ abstract class LocalDeclarationVisitor extends GeneralizingAstVisitor {
           declaredLocalVar(id, loopVar.type);
         }
       }
-    } else if (forLoopParts is ForEachPartsWithIdentifier) {
-      SimpleIdentifier id = forLoopParts.identifier;
-      if (id != null) {
-        // If there is no loop variable, don't declare it.
-        declaredLocalVar(id, null);
-      }
     } else if (forLoopParts is ForPartsWithDeclarations) {
       VariableDeclarationList varList = forLoopParts.variables;
       if (varList != null) {

Original file line number	Diff line number	Diff line change
`@@ -163,12 +163,6 @@ abstract class LocalDeclarationVisitor extends GeneralizingAstVisitor {`
`163`	`163`	`declaredLocalVar(id, loopVar.type);`
`164`	`164`	`}`
`165`	`165`	`}`
`166`		`- } else if (forLoopParts is ForEachPartsWithIdentifier) {`
`167`		`- SimpleIdentifier id = forLoopParts.identifier;`
`168`		`- if (id != null) {`
`169`		`- // If there is no loop variable, don't declare it.`
`170`		`- declaredLocalVar(id, null);`
`171`		`- }`
`172`	`166`	`} else if (forLoopParts is ForPartsWithDeclarations) {`
`173`	`167`	`VariableDeclarationList varList = forLoopParts.variables;`
`174`	`168`	`if (varList != null) {`