Some clean-ups for Index / SearchEngine.

pkg/analysis_server/lib/src/services/search/search_engine_internal.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 services.src.search.search_engine;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analysis_server/src/services/correction/source_range.dart';
 
 /**
  * A [SearchEngine] implementation.
  */
 class SearchEngineImpl implements SearchEngine {
   final Index _index;
 
   SearchEngineImpl(this._index);
 
   @override
@@ skipping 72 matching lines @@
     requestor.add(type, IndexConstants.IS_IMPLEMENTED_BY, MatchKind.REFERENCE);
     return requestor.merge();
   }
 
   @override
   Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) {
     RegExp regExp = new RegExp(pattern);
     List<Element> elements =
         _index.getTopLevelDeclarations((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));
+    for (Element element in elements) {
+      matches.add(new SearchMatch(MatchKind.DECLARATION, element,
+          rangeElementName(element), true, false));
     }
-    // TODO(scheglov) it does not have to be a Future
     return new Future.value(matches);
   }
 
   Future<List<SearchMatch>> _searchReferences(Element element) {
     _Requestor requestor = new _Requestor(_index);
     requestor.add(
         element, IndexConstants.IS_REFERENCED_BY, MatchKind.REFERENCE);
     return requestor.merge();
   }
 
@@ skipping 90 matching lines @@
     });
     futures.add(matchesFuture);
   }
 
   Future<List<SearchMatch>> merge() {
     return Future.wait(futures).then((List<List<SearchMatch>> matchesList) {
       return matchesList.expand((matches) => matches).toList();
     });
   }
 }