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

pkg/analyzer/lib/src/dart/analysis/search.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/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 
 /**
  * Search support for an [AnalysisDriver].
  */
 class Search {
   final AnalysisDriver _driver;
 
   Search(this._driver);
 
   /**
-   * Returns references to the element at the given [offset] in the file with
-   * the given [path].
+   * Returns references to the [element].
    */
-  Future<List<SearchResult>> references(String path, int offset) async {
-    // Search only in added files.
-    if (!_driver.addedFiles.contains(path)) {
-      return const <SearchResult>[];
-    }
-
-    AnalysisResult analysisResult = await _driver.getResult(path);
-    CompilationUnit unit = analysisResult.unit;
-
-    // Prepare the node.
-    AstNode node = new NodeLocator(offset).searchWithin(unit);
-    if (node == null) {
-      return const <SearchResult>[];
-    }
-
-    // Prepare the element.
-    Element element = ElementLocator.locate(node);
+  Future<List<SearchResult>> references(Element element) async {
     if (element == null) {
       return const <SearchResult>[];
     }
 
     ElementKind kind = element.kind;
     if (kind == ElementKind.LABEL || kind == ElementKind.LOCAL_VARIABLE) {
-      Block block = node.getAncestor((n) => n is Block);
-      return _searchReferences_Local(element, unit.element, block);
+      return _searchReferences_Local(element, (n) => n is Block);
     }
     // TODO(scheglov) support other kinds
-    return [];
+    return const <SearchResult>[];
   }
 
   Future<List<SearchResult>> _searchReferences_Local(
-      Element element,
-      CompilationUnitElement enclosingUnitElement,
-      AstNode enclosingNode) async {
+      Element element, bool isRootNode(AstNode n)) async {
+    String path = element.source.fullName;
+
+    // Prepare the unit.
+    AnalysisResult analysisResult = await _driver.getResult(path);
+    CompilationUnit unit = analysisResult.unit;
+    if (unit == null) {
+      return const <SearchResult>[];
+    }
+
+    // Prepare the node.
+    AstNode node = new NodeLocator(element.nameOffset).searchWithin(unit);
+    if (node == null) {
+      return const <SearchResult>[];
+    }
+
+    // Prepare the enclosing node.
+    AstNode enclosingNode = node.getAncestor(isRootNode);
+
+    // Find the matches.
     _LocalReferencesVisitor visitor =
-        new _LocalReferencesVisitor(element, enclosingUnitElement);
-    enclosingNode?.accept(visitor);
-    return visitor.matches;
+        new _LocalReferencesVisitor(element, unit.element);
+    enclosingNode.accept(visitor);
+    return visitor.results;
   }
 }
 
 /**
  * A single search result.
  */
 class SearchResult {
   /**
    * The element that is used at this result.
    */
@@ skipping 77 matching lines @@
     }
   }
 }
 
 /**
  * Visitor that adds [SearchResult]s for local elements of a block, method,
  * class or a library - labels, local functions, local variables and parameters,
  * type parameters, import prefixes.
  */
 class _LocalReferencesVisitor extends RecursiveAstVisitor {
-  final List<SearchResult> matches = <SearchResult>[];
+  final List<SearchResult> results = <SearchResult>[];
 
   final Element element;
   final CompilationUnitElement enclosingUnitElement;
 
   _LocalReferencesVisitor(this.element, this.enclosingUnitElement);
 
   @override
   visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.inDeclarationContext()) {
       return;
@@ skipping 13 matching lines @@
         } else if (isGet) {
           if (parent is MethodInvocation && parent.methodName == node) {
             kind = SearchResultKind.INVOCATION;
           } else {
             kind = SearchResultKind.READ;
           }
         } else if (isSet) {
           kind = SearchResultKind.WRITE;
         }
       }
-      _addMatch(node, kind);
+      _addResult(node, kind);
     }
   }
 
-  void _addMatch(AstNode node, SearchResultKind kind) {
+  void _addResult(AstNode node, SearchResultKind kind) {
     bool isQualified = node.parent is Label;
     var finder = new _ContainingElementFinder(node.offset);
     enclosingUnitElement.accept(finder);
-    matches.add(new SearchResult._(element, finder.containingElement, kind,
+    results.add(new SearchResult._(element, finder.containingElement, kind,
         node.offset, node.length, true, isQualified));
   }
 }