Implement search for other local elements.

pkg/analyzer/test/src/dart/analysis/search_test.dart

 // Copyright (c) 2016, 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.
 
 import 'dart:async';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/analysis/search.dart';
@@ skipping 63 matching lines @@
     buffer.write(isQualified);
     buffer.write(")");
     return buffer.toString();
   }
 }
 
 @reflectiveTest
 class SearchTest extends BaseAnalysisDriverTest {
   static const testUri = 'package:test/test.dart';
 
-  test_searchReferences_Label() async {
+  test_searchReferences_FunctionElement_local() async {
+    addTestFile('''
+main() {
+  test() {}
+  test();
+  print(test);
+}
+''');
+    FunctionElement element = await _findElement('test');
+    List<String> main = [testUri, 'main'];
+    var expected = [
+      _expectId(main, SearchResultKind.INVOCATION, 'test();'),
+      _expectId(main, SearchResultKind.REFERENCE, 'test);')
+    ];
+    await _verifyReferences(element, expected);
+  }
+
+  test_searchReferences_LabelElement() async {
     addTestFile('''
 main() {
 label:
   while (true) {
     if (true) {
       break label; // 1
     }
     break label; // 2
   }
 }
 ''');
-    Element element = await _findElementAtString('label:');
+    Element element = await _findElement('label');
     List<String> main = [testUri, 'main'];
     var expected = [
       _expectId(main, SearchResultKind.REFERENCE, 'label; // 1'),
       _expectId(main, SearchResultKind.REFERENCE, 'label; // 2')
     ];
     await _verifyReferences(element, expected);
   }
 
-  test_searchReferences_localVariable() async {
+  test_searchReferences_LocalVariableElement() async {
     addTestFile(r'''
 main() {
   var v;
   v = 1;
   v += 2;
   print(v);
   v();
 }
 ''');
-    Element element = await _findElementAtString('v;');
+    Element element = await _findElement('v');
     List<String> main = [testUri, 'main'];
     var expected = [
       _expectId(main, SearchResultKind.WRITE, 'v = 1;'),
       _expectId(main, SearchResultKind.READ_WRITE, 'v += 2;'),
       _expectId(main, SearchResultKind.READ, 'v);'),
       _expectId(main, SearchResultKind.INVOCATION, 'v();')
     ];
     await _verifyReferences(element, expected);
   }
 
-  test_searchReferences_localVariable_inForEachLoop() async {
+  test_searchReferences_localVariableElement_inForEachLoop() async {
     addTestFile('''
 main() {
   for (var v in []) {
     v = 1;
     v += 2;
     print(v);
     v();
   }
 }
 ''');
     Element element = await _findElementAtString('v in []');
     List<String> main = [testUri, 'main'];
     var expected = [
       _expectId(main, SearchResultKind.WRITE, 'v = 1;'),
       _expectId(main, SearchResultKind.READ_WRITE, 'v += 2;'),
       _expectId(main, SearchResultKind.READ, 'v);'),
       _expectId(main, SearchResultKind.INVOCATION, 'v();')
     ];
     await _verifyReferences(element, expected);
   }
 
+  test_searchReferences_TypeParameterElement() async {

[Brian Wilkerson, 2016/11/22 20:25:40]

Might also be good to have a test for a type parameter from a generic method /
function.

[scheglov, 2016/11/22 20:47:55]

Good idea.
Done.

+    addTestFile('''
+class A<T> {
+  foo(T a) {}
+  bar(T b) {}
+}
+''');
+    TypeParameterElement element = await _findElement('T');
+    var expected = [
+      _expectId([testUri, 'A', 'foo', 'a'], SearchResultKind.REFERENCE, 'T a'),
+      _expectId([testUri, 'A', 'bar', 'b'], SearchResultKind.REFERENCE, 'T b'),
+    ];
+    await _verifyReferences(element, expected);
+  }
+
   ExpectedResult _expectId(
       List<String> enclosingComponents, SearchResultKind kind, String search,
       {int length, bool isResolved: true, bool isQualified: false}) {
     int offset = findOffset(search);
     if (length == null) {
       length = getLeadingIdentifierLength(search);
     }
     return new ExpectedResult(enclosingComponents, kind, offset, length,
         isResolved: isResolved, isQualified: isQualified);
   }
 
+  Future<Element> _findElement(String name) async {
+    AnalysisResult result = await driver.getResult(testFile);
+    return findChildElement(result.unit.element, name);
+  }
+
   Future<Element> _findElementAtString(String search) async {
     AnalysisResult result = await driver.getResult(testFile);
     int offset = findOffset(search);
     AstNode node = new NodeLocator(offset).searchWithin(result.unit);
     return ElementLocator.locate(node);
   }
 
   Future _verifyReferences(
       Element element, List<ExpectedResult> expectedMatches) async {
     List<SearchResult> results = await driver.search.references(element);
     _assertResults(results, expectedMatches);
     expect(results, hasLength(expectedMatches.length));
   }
 
   static void _assertResults(
       List<SearchResult> matches, List<ExpectedResult> expectedMatches) {
     expect(matches, unorderedEquals(expectedMatches));
   }
 }