Deoptimize Search - request a new resolved unit for local search.

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';
+import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'base.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(SearchTest);
   });
 }
@@ skipping 64 matching lines @@
 main() {
 label:
   while (true) {
     if (true) {
       break label; // 1
     }
     break label; // 2
   }
 }
 ''');
-    int offset = findOffset('label:');
+    Element element = await _findElementAtString('label:');
     List<String> main = [testUri, 'main'];
     var expected = [
       _expectId(main, SearchResultKind.REFERENCE, 'label; // 1'),
       _expectId(main, SearchResultKind.REFERENCE, 'label; // 2')
     ];
-    await _verifyReferences(offset, expected);
+    await _verifyReferences(element, expected);
   }
 
   test_searchReferences_localVariable() async {
     addTestFile(r'''
 main() {
   var v;
   v = 1;
   v += 2;
   print(v);
   v();
 }
 ''');
-    int offset = findOffset('v;');
+    Element element = await _findElementAtString('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(offset, expected);
+    await _verifyReferences(element, expected);
   }
 
   test_searchReferences_localVariable_inForEachLoop() async {
     addTestFile('''
 main() {
   for (var v in []) {
     v = 1;
     v += 2;
     print(v);
     v();
   }
 }
 ''');
-    int offset = findOffset('v in []');
+    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(offset, expected);
+    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> _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(
-      int offset, List<ExpectedResult> expectedMatches) async {
-    List<SearchResult> results =
-        await driver.search.references(testFile, offset);
+      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));
   }
 }