include imported elements in interpolation suggestions

pkg/analysis_server/test/services/completion/completion_test_util.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.util;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart' as protocol show Element,
     ElementKind;
@@ skipping 971 matching lines @@
       assertNotSuggested('f');
       assertNotSuggested('x');
       assertNotSuggested('foo');
       assertNotSuggested('F1');
       assertNotSuggested('F2');
       assertNotSuggested('T1');
       assertNotSuggested('T2');
     });
   }
 
+  test_InterpolationExpression() {
+    // SimpleIdentifier  InterpolationExpression  StringInterpolation
+    addTestSource('main() {String name; print("hello \$^");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestLocalVariable('name', 'String');
+      assertSuggestImportedClass('Object');
+    });
+  }
+
+  test_InterpolationExpression_block() {
+    // SimpleIdentifier  InterpolationExpression  StringInterpolation
+    addTestSource('main() {String name; print("hello \${n^}");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestLocalVariable('name', 'String');
+      assertSuggestImportedClass('Object');
+    });
+  }
+
+  test_InterpolationExpression_prefix_selector() {
+    // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
+    addTestSource('main() {String name; print("hello \${name.^}");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestInvocationGetter('length', 'int');
+      assertNotSuggested('name');
+      assertNotSuggested('Object');
+    });
+  }
+
+  test_InterpolationExpression_prefix_target() {
+    // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
+    addTestSource('main() {String name; print("hello \${nam^e.length}");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestLocalVariable('name', 'String');
+      assertSuggestImportedClass('Object');
+      assertNotSuggested('length');
+    });
+  }
+
   test_IsExpression() {
     // SimpleIdentifier  TypeName  IsExpression  IfStatement
     addSource('/testB.dart', '''
       lib B;
       foo() { }
       class X {X.c(); X._d(); z() {}}''');
     addTestSource('''
       import "/testB.dart";
       class Y {Y.c(); Y._d(); z() {}}
       main() {var x; if (x is ^) { }}''');
@@ skipping 63 matching lines @@
       assertSuggestInvocationSetter('_s2');
       assertSuggestInvocationMethod('m', 'A', null);
       assertSuggestInvocationMethod('_n', 'A', 'I');
       assertNotSuggested('a');
       assertNotSuggested('A');
       assertNotSuggested('X');
       assertNotSuggested('Object');
     });
   }
 
-  test_PrefixedIdentifier_interpolation() {
-    // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
-    addTestSource('main() {String name; print("hello \${name.^}");}');
-    computeFast();
-    return computeFull(true).then((_) {
-      assertSuggestInvocationGetter('length', 'int');
-      assertNotSuggested('name');
-      assertNotSuggested('Object');
-    });
-  }
-
   test_PrefixedIdentifier_library() {
     // SimpleIdentifier  PrefixedIdentifier  ExpressionStatement
     addSource('/testB.dart', '''
       lib B;
       var T1;
       class X { }
       class Y { }''');
     addTestSource('''
       import "/testB.dart" as b;
       var T2;
@@ skipping 39 matching lines @@
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestImportedClass('A');
       assertSuggestLocalClass('X');
       assertSuggestLocalMethod('foo', 'X', null);
       assertNotSuggested('bar');
       assertNotSuggested('_B');
     });
   }
 
-  test_PrefixedIdentifier_prefix_interpolation() {
-    // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
-    addTestSource('main() {String name; print("hello \${nam^e.length}");}');
-    computeFast();
-    return computeFull(true).then((_) {
-      assertSuggestLocalVariable('name', 'String');
-      assertSuggestImportedClass('Object');
-      assertNotSuggested('length');
-    });
-  }
-
   test_TopLevelVariableDeclaration_typed_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // TopLevelVariableDeclaration
     addTestSource('class A {} B ^');
     computeFast();
     return computeFull(true).then((_) {
       assertNoSuggestions();
     });
   }
 
@@ skipping 66 matching lines @@
     addTestSource('''
       import "/testB.dart";
       class Y {Y.c(); Y._d(); z() {}}
       main() {var ^}''');
     computeFast();
     return computeFull(true).then((_) {
       assertNoSuggestions();
     });
   }
 }