More tweaks for 'for' completion.

pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.services.completion.contributor.dart.imported_ref;
 
 import 'package:analysis_server/plugin/protocol/protocol.dart'
     hide Element, ElementKind;
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
@@ skipping 672 matching lines @@
     assertNotSuggested('T8');
     assertNotSuggested('clog');
     assertNotSuggested('blog');
     // TODO (danrubel) suggest HtmlElement as low relevance
     assertNotSuggested('HtmlElement');
     assertSuggestClass('Uri');
     assertNotSuggested('parseIPv6Address');
     assertNotSuggested('parseHex');
   }
 
-  test_Block_final() async {
+  Block_final() async {

[Brian Wilkerson, 2016/05/10 22:29:08]

Should we mark this as "fail_" rather than not running it at all?

[scheglov, 2016/05/11 03:22:18]

Thank you.
I must have removed "test_" accidentally.

     // Block  BlockFunctionBody  MethodDeclaration
     addSource(
         '/testAB.dart',
         '''
         export "dart:math" hide max;
         class A {int x;}
         @deprecated D1() {int x;}
         class _B {boo() { partBoo() {}} }''');
     addSource(
         '/testCD.dart',
@@ skipping 68 matching lines @@
     assertNotSuggested('g');
     assertSuggestClass('g.G', elemName: 'G');
     //assertSuggestClass('H', COMPLETION_RELEVANCE_LOW);
     assertSuggestClass('Object');
     assertNotSuggested('min');
     //assertSuggestFunction(
     //    'max',
     //    'num',
     //    false,
     //    COMPLETION_RELEVANCE_LOW);
-    assertSuggestTopLevelVar('T1', null);
+    assertNotSuggested('T1');
     assertNotSuggested('_T2');
     //assertSuggestImportedTopLevelVar('T3', 'int', COMPLETION_RELEVANCE_LOW);
     assertNotSuggested('_T4');
     assertNotSuggested('T5');
     assertNotSuggested('_T6');
     assertNotSuggested('==');
     assertNotSuggested('T7');
     assertNotSuggested('T8');
     assertNotSuggested('clog');
     assertNotSuggested('blog');
@@ skipping 102 matching lines @@
     // Hidden elements not suggested
     assertNotSuggested('g.G');
     //assertSuggestClass('H', COMPLETION_RELEVANCE_LOW);
     assertSuggestClass('Object');
     assertNotSuggested('min');
     //assertSuggestFunction(
     //    'max',
     //    'num',
     //    false,
     //    COMPLETION_RELEVANCE_LOW);
-    assertSuggestTopLevelVar('T1', null);
+    assertNotSuggested('T1');
     assertNotSuggested('_T2');
     //assertSuggestImportedTopLevelVar('T3', 'int', COMPLETION_RELEVANCE_LOW);
     assertNotSuggested('_T4');
     assertNotSuggested('T5');
     assertNotSuggested('_T6');
     assertNotSuggested('==');
     assertNotSuggested('T7');
     assertNotSuggested('T8');
     assertNotSuggested('clog');
     assertNotSuggested('blog');
@@ skipping 86 matching lines @@
     assertNotSuggested('g');
     assertSuggestClass('g.G', elemName: 'G');
     //assertSuggestClass('H', COMPLETION_RELEVANCE_LOW);
     assertSuggestClass('Object');
     assertNotSuggested('min');
     //assertSuggestFunction(
     //    'max',
     //    'num',
     //    false,
     //    COMPLETION_RELEVANCE_LOW);
-    assertSuggestTopLevelVar('T1', null);
+    assertNotSuggested('T1');
     assertNotSuggested('_T2');
     //assertSuggestImportedTopLevelVar('T3', 'int', COMPLETION_RELEVANCE_LOW);
     assertNotSuggested('_T4');
     assertNotSuggested('T5');
     assertNotSuggested('_T6');
     assertNotSuggested('==');
     assertNotSuggested('T7');
     assertNotSuggested('T8');
     assertNotSuggested('clog');
     assertNotSuggested('blog');
@@ skipping 1125 matching lines @@
     // SimpleIdentifier  ForStatement
     addTestSource('main() {for (int index = 0; i^)}');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset - 1);
     expect(replacementLength, 1);
     assertNotSuggested('index');
   }
 
   test_ForStatement_initializer() async {
-    // SimpleIdentifier  ForStatement
-    addTestSource('main() {List a; for (^)}');
+    addTestSource('''
+import 'dart:math';
+main() {
+  List localVar;
+  for (^) {}
+}
+''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
-    assertNotSuggested('a');
+    assertNotSuggested('localVar');
+    assertNotSuggested('PI');
     assertSuggestClass('Object');
     assertSuggestClass('int');
   }
 
   test_ForStatement_initializer_variableName_afterType() async {
     addTestSource('main() { for (String ^) }');
     await computeSuggestions();
     assertNotSuggested('int');
   }
 
@@ skipping 177 matching lines @@
         int T2;
         F2() { }
         typedef D2();
         class C2 { }
         /* */ ^ zoo(z) { } String name;''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 11 matching lines @@
         int T2;
         F2() { }
         typedef D2();
         class C2 { }
         /** */ ^ zoo(z) { } String name;''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 12 matching lines @@
         F2() { }
         typedef D2();
         /// some dartdoc
         class C2 { }
         ^ zoo(z) { } String name;''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 217 matching lines @@
     assertNotSuggested('f');
     assertNotSuggested('x');
     assertNotSuggested('foo');
     assertNotSuggested('F1');
     assertNotSuggested('F2');
     // An unresolved imported library will produce suggestions
     // with a null returnType
     // The current DartCompletionRequest#resolveExpression resolves
     // the world (which it should not) and causes the imported library
     // to be resolved.
-    assertSuggestTopLevelVar('T1', /* null */ 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('T2');
   }
 
   test_InstanceCreationExpression_unimported() async {
     // SimpleIdentifier  TypeName  ConstructorName  InstanceCreationExpression
     addSource('/testAB.dart', 'class Foo { }');
     addTestSource('class C {foo(){new F^}}');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset - 1);
@@ skipping 639 matching lines @@
         import "/testA.dart";
         int T2;
         F2() { }
         typedef D2();
         class C2 {^ zoo(z) { } String name; }''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 10 matching lines @@
         import "/testA.dart";
         int T2;
         F2() { }
         typedef D2();
         class C2 {/* */ ^ zoo(z) { } String name; }''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 10 matching lines @@
         import "/testA.dart";
         int T2;
         F2() { }
         typedef D2();
         class C2 {/** */ ^ zoo(z) { } String name; }''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 12 matching lines @@
         F2() { }
         typedef D2();
         class C2 {
           /// some dartdoc
           ^ zoo(z) { } String name; }''');
 
     await computeSuggestions();
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     assertSuggestClass('Object');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('F1');
     assertSuggestFunctionTypeAlias('D1', 'dynamic');
     assertSuggestClass('C1');
     assertNotSuggested('T2');
     assertNotSuggested('F2');
     assertNotSuggested('D2');
     assertNotSuggested('C2');
     assertNotSuggested('name');
   }
 
@@ skipping 198 matching lines @@
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     // Suggested by ConstructorContributor
     assertNotSuggested('B.bar');
     assertSuggestConstructor('Object');
     assertSuggestConstructor('X.c');
     assertNotSuggested('X._d');
     // Suggested by LocalLibraryContributor
     assertNotSuggested('A');
     assertNotSuggested('F1');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('_d');
     assertNotSuggested('z');
     assertNotSuggested('m');
   }
 
   test_partFile_TypeName2() async {
     // SimpleIdentifier  TypeName  ConstructorName
     addSource(
         '/testB.dart',
         '''
@@ skipping 19 matching lines @@
     expect(replacementOffset, completionOffset);
     expect(replacementLength, 0);
     // Suggested by ConstructorContributor
     assertNotSuggested('A');
     assertSuggestConstructor('Object');
     assertSuggestConstructor('X.c');
     assertNotSuggested('X._d');
     // Suggested by LocalLibraryContributor
     assertNotSuggested('B');
     assertNotSuggested('F1');
-    assertSuggestTopLevelVar('T1', 'int');
+    assertNotSuggested('T1');
     assertNotSuggested('_d');
     assertNotSuggested('z');
     assertNotSuggested('m');
   }
 
   test_PrefixedIdentifier_class_const() async {
     // SimpleIdentifier PrefixedIdentifier ExpressionStatement Block
     addSource(
         '/testB.dart',
         '''
@@ skipping 806 matching lines @@
     assertNotSuggested('foo2');
     assertNotSuggested('bar2');
     assertNotSuggested('_B');
     assertNotSuggested('Y');
     assertNotSuggested('C');
     assertNotSuggested('f');
     assertNotSuggested('x');
     assertNotSuggested('e');
   }
 }