Index Dart/HTML units after analysis.

pkg/analysis_server/lib/src/analysis_server.dart

Index: pkg/analysis_server/lib/src/analysis_server.dart
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index c29aa8a91f64a38f0b619a4abd10117242411ce8..3ddb9f7e7c7234fee6320706e610ce16b437592d 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -27,6 +27,7 @@ import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/java_engine.dart';
+import 'package:analyzer/src/generated/index.dart';
 
 
 /**
@@ -83,6 +84,11 @@ class AnalysisServer {
   final ServerCommunicationChannel channel;
 
   /**
+   * The [Index] for this server.
+   */
+  final Index index;
+
+  /**
    * [ContextDirectoryManager] which handles the mapping from analysis roots
    * to context directories.
    */
@@ -155,7 +161,7 @@ class AnalysisServer {
    * running a full analysis server.
    */
   AnalysisServer(this.channel, ResourceProvider resourceProvider,
-      this.packageMapProvider, {this.rethrowExceptions: true}) {
+      this.packageMapProvider, this.index, {this.rethrowExceptions: true}) {
     operationQueue = new ServerOperationQueue(this);
     contextDirectoryManager = new AnalysisServerContextDirectoryManager(this, resourceProvider);
     AnalysisEngine.instance.logger = new AnalysisLogger();
@@ -263,6 +269,7 @@ class AnalysisServer {
    * The socket from which requests are being read has been closed.
    */
   void done() {
+    index.stop();
     running = false;
   }
 
@@ -594,7 +601,7 @@ class ContextDirectory {
     _context = AnalysisEngine.instance.createAnalysisContext();
     // TODO(scheglov) replace FileUriResolver with an Resource based resolver
     List<UriResolver> resolvers = <UriResolver>[new DartUriResolver(sdk),
-        new FileUriResolver(),
+        new ResourceUriResolver(_resourceProvider),
     ];
     if (packageMap != null) {
       resolvers.add(new PackageMapUriResolver(_resourceProvider, packageMap));