Revert "Remove unused option in server API"

Review URL: https://codereview.chromium.org/2382033003 .

Author: bwilkerson

pkg/analysis_server/doc/api.html

@@ -814,7 +814,6 @@ <h4>parameters:</h4><dl><dt class="field"><b>included (List&lt;<a href="#type_Fi
             </p>
           </dd><dt class="field"><b>packageRoots (<span style="color:#999999">optional</span> Map&lt;<a href="#type_FilePath">FilePath</a>, <a href="#type_FilePath">FilePath</a>&gt;)</b></dt><dd>
 
-            <p><b><i>Deprecated</i></b>: This field is now ignored by server.</p>
             <p>
               A mapping from source directories to package roots
               that should override the normal package: URI resolution

pkg/analysis_server/lib/plugin/protocol/generated_protocol.dart

@@ -1714,8 +1714,6 @@ class AnalysisSetAnalysisRootsParams implements HasToJson {
   }
 
   /**
-   * Deprecated: This field is now ignored by server.
-   *
    * A mapping from source directories to package roots that should override
    * the normal package: URI resolution mechanism.
    *
@@ -1739,8 +1737,6 @@ class AnalysisSetAnalysisRootsParams implements HasToJson {
   Map<String, String> get packageRoots => _packageRoots;
 
   /**
-   * Deprecated: This field is now ignored by server.
-   *
    * A mapping from source directories to package roots that should override
    * the normal package: URI resolution mechanism.
    *

pkg/analysis_server/lib/src/analysis_server.dart

@@ -30,13 +30,15 @@ import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/plugin/resolver_provider.dart';
+import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/utilities_general.dart';
+import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary/pub_summary.dart';
 import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/src/util/glob.dart';
@@ -318,6 +320,7 @@ class AnalysisServer {
   AnalysisServer(
       this.channel,
       this.resourceProvider,
+      PubPackageMapProvider packageMapProvider,
       Index _index,
       this.serverPlugin,
       this.options,
@@ -347,6 +350,7 @@ class AnalysisServer {
           resourceProvider,
           sdkManager,
           packageResolverProvider,
+          packageMapProvider,
           analyzedFilesGlobs,
           instrumentationService,
           defaultContextOptions);
@@ -1424,6 +1428,14 @@ class AnalysisServer {
     });
   }
 
+  void _computingPackageMap(bool computing) {
+    if (serverServices.contains(ServerService.STATUS)) {
+      PubStatus pubStatus = new PubStatus(computing);
+      ServerStatusParams params = new ServerStatusParams(pub: pubStatus);
+      sendNotification(params.toNotification());
+    }
+  }
+
   /**
    * Return a set of all contexts whose associated folder is contained within,
    * or equal to, one of the resources in the given list of [resources].
@@ -1613,6 +1625,10 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
     }
   }
 
+  @override
+  void computingPackageMap(bool computing) =>
+      analysisServer._computingPackageMap(computing);
+
   @override
   ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options) {
     String defaultPackageFilePath = null;

pkg/analysis_server/lib/src/context_manager.dart

@@ -9,15 +9,18 @@ import 'dart:collection';
 import 'dart:convert';
 import 'dart:core';
 
+import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/plugin/options.dart';
 import 'package:analyzer/plugin/resolver_provider.dart';
 import 'package:analyzer/source/analysis_options_provider.dart';
 import 'package:analyzer/source/config.dart';
+import 'package:analyzer/source/package_map_provider.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/source/path_filter.dart';
+import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/source/sdk_ext.dart';
 import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/context/context.dart' as context;
@@ -330,6 +333,12 @@ abstract class ContextManagerCallbacks {
    */
   void applyChangesToContext(Folder contextFolder, ChangeSet changeSet);
 
+  /**
+   * Signals that the context manager has started to compute a package map (if
+   * [computing] is `true`) or has finished (if [computing] is `false`).
+   */
+  void computingPackageMap(bool computing);
+
   /**
    * Create and return a context builder that can be used to create a context
    * for the files in the given [folder] when analyzed using the given [options].
@@ -446,8 +455,12 @@ class ContextManagerImpl implements ContextManager {
   final ResolverProvider packageResolverProvider;
 
   /**
-   * Provider of analysis options.
+   * Provider which is used to determine the mapping from package name to
+   * package folder.
    */
+  final PubPackageMapProvider _packageMapProvider;
+
+  /// Provider of analysis options.
   AnalysisOptionsProvider analysisOptionsProvider =
       new AnalysisOptionsProvider();
 
@@ -493,6 +506,7 @@ class ContextManagerImpl implements ContextManager {
       this.resourceProvider,
       this.sdkManager,
       this.packageResolverProvider,
+      this._packageMapProvider,
       this.analyzedFilesGlobs,
       this._instrumentationService,
       this.defaultContextOptions) {
@@ -969,19 +983,35 @@ class ContextManagerImpl implements ContextManager {
       // resolve packages.
       return new NoPackageFolderDisposition(packageRoot: packageRoot);
     } else {
-      // Try .packages first.
-      if (absolutePathContext.basename(packagespecFile.path) ==
-          PACKAGE_SPEC_NAME) {
-        Packages packages = _readPackagespec(packagespecFile);
-        return new PackagesFileDisposition(packages);
-      }
-      if (packageResolverProvider != null) {
-        UriResolver resolver = packageResolverProvider(folder);
-        if (resolver != null) {
-          return new CustomPackageResolverDisposition(resolver);
+      PackageMapInfo packageMapInfo;
+      callbacks.computingPackageMap(true);
+      try {
+        // Try .packages first.
+        if (absolutePathContext.basename(packagespecFile.path) ==
+            PACKAGE_SPEC_NAME) {
+          Packages packages = _readPackagespec(packagespecFile);
+          return new PackagesFileDisposition(packages);
         }
+        if (packageResolverProvider != null) {
+          UriResolver resolver = packageResolverProvider(folder);
+          if (resolver != null) {
+            return new CustomPackageResolverDisposition(resolver);
+          }
+        }
+
+        ServerPerformanceStatistics.pub.makeCurrentWhile(() {
+          packageMapInfo = _packageMapProvider.computePackageMap(folder);
+        });
+      } finally {
+        callbacks.computingPackageMap(false);
+      }
+      for (String dependencyPath in packageMapInfo.dependencies) {
+        addDependency(dependencyPath);
+      }
+      if (packageMapInfo.packageMap == null) {
+        return new NoPackageFolderDisposition();
       }
-      return new NoPackageFolderDisposition();
+      return new PackageMapDisposition(packageMapInfo.packageMap);
     }
   }
 

pkg/analysis_server/lib/src/socket_server.dart

@@ -12,6 +12,7 @@ import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/plugin/resolver_provider.dart';
+import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:plugin/plugin.dart';
 
@@ -88,8 +89,15 @@ class SocketServer {
       index = createMemoryIndex();
     }
 
-    analysisServer = new AnalysisServer(serverChannel, resourceProvider, index,
-        serverPlugin, analysisServerOptions, sdkManager, instrumentationService,
+    analysisServer = new AnalysisServer(
+        serverChannel,
+        resourceProvider,
+        new PubPackageMapProvider(resourceProvider, defaultSdk),
+        index,
+        serverPlugin,
+        analysisServerOptions,
+        sdkManager,
+        instrumentationService,
         fileResolverProvider: fileResolverProvider,
         packageResolverProvider: packageResolverProvider,
         useSingleContextManager: useSingleContextManager,