Optimize top-level element declarations search.

pkg/analysis_server/lib/src/services/search/search_engine_internal.dart

Index: pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
index dec4aa3393a7005ea8720a6e5af2b3b881ed79fc..3dbfae48622e380738cbfe8d2fa1453290e2ae5c 100644
--- a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
+++ b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
@@ -103,16 +103,23 @@ class SearchEngineImpl implements SearchEngine {
 
   @override
   Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) {
-    UniverseElement universe = UniverseElement.INSTANCE;
-    _Requestor requestor = new _Requestor(_index);
-    requestor.add(universe, IndexConstants.DEFINES, MatchKind.DECLARATION);
     RegExp regExp = new RegExp(pattern);
-    return requestor.merge().then((List<SearchMatch> matches) {
-      return matches.where((SearchMatch match) {
-        String name = match.element.displayName;
-        return regExp.hasMatch(name);
-      }).toList();
-    });
+    List<Element> elements = _index.getTopDeclarations((String name) => regExp.hasMatch(name));
+    List<SearchMatch> matches = <SearchMatch>[];
+    for (var element in elements) {
+      SourceRange range = new SourceRange(element.nameOffset, element.name.length);
+      matches.add(new SearchMatch(MatchKind.DECLARATION, element, range, true, false));
+    }
+    // TODO(scheglov) it does not have to be a Future
+    return new Future.value(matches);
+//    _Requestor requestor = new _Requestor(_index);

[Brian Wilkerson, 2015/03/02 19:20:07]

Remove the old code or document why it's still here?

[scheglov, 2015/03/02 19:55:46]

Done.

+//    requestor.add(universe, IndexConstants.DEFINES, MatchKind.DECLARATION);
+//    return requestor.merge().then((List<SearchMatch> matches) {
+//      return matches.where((SearchMatch match) {
+//        String name = match.element.displayName;
+//        return regExp.hasMatch(name);
+//      }).toList();
+//    });
   }
 
   Future<List<SearchMatch>> _searchReferences(Element element) {