Stop optimizing uses of "pub list".

pkg/analysis_server/lib/src/context_manager.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 context.directory.manager;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:core' hide Resource;
 
 import 'package:analysis_server/src/analysis_server.dart';
-import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.dart';
 import 'package:analysis_server/uri/resolver_provider.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/source/analysis_options_provider.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/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart' as pkgfile show parse;
 import 'package:package_config/src/packages_impl.dart' show MapPackages;
 import 'package:path/path.dart' as pathos;
 import 'package:watcher/watcher.dart';
 import 'package:yaml/yaml.dart';
@@ skipping 54 matching lines @@
    * Map from full path to the [Source] object, for each source that has been
    * added to the context.
    */
   Map<String, Source> sources = new HashMap<String, Source>();
 
   /**
    * Info returned by the last call to
    * [OptimizingPubPackageMapProvider.computePackageMap], or `null` if the
    * package map hasn't been computed for this context yet.
    */
-  OptimizingPubPackageMapInfo packageMapInfo;
+  PackageMapInfo packageMapInfo;
 
   ContextInfo(
       this.parent, Folder folder, File packagespecFile, this.packageRoot)
       : folder = folder,
         pathFilter = new PathFilter(folder.path, null) {
     packageDescriptionPath = packagespecFile.path;
     parent.children.add(this);
   }
 
   /**
@@ skipping 252 matching lines @@
    * A function that will return a [UriResolver] that can be used to resolve
    * `package:` URI's within a given folder, or `null` if we should fall back
    * to the standard URI resolver.
    */
   final ResolverProvider packageResolverProvider;
 
   /**
    * Provider which is used to determine the mapping from package name to
    * package folder.
    */
-  final OptimizingPubPackageMapProvider _packageMapProvider;
+  final PubPackageMapProvider _packageMapProvider;
 
   /// Provider of analysis options.
   AnalysisOptionsProvider analysisOptionsProvider =
       new AnalysisOptionsProvider();
 
   /**
    * The instrumentation service used to report instrumentation data.
    */
   final InstrumentationService _instrumentationService;
 
@@ skipping 367 matching lines @@
       // resolve packages.
       return new NoPackageFolderDisposition();
     } else {
       callbacks.beginComputePackageMap();
       if (packageResolverProvider != null) {
         UriResolver resolver = packageResolverProvider(folder);
         if (resolver != null) {
           return new CustomPackageResolverDisposition(resolver);
         }
       }
-      OptimizingPubPackageMapInfo packageMapInfo;
+      PackageMapInfo packageMapInfo;
       ServerPerformanceStatistics.pub.makeCurrentWhile(() {
-        packageMapInfo =
-            _packageMapProvider.computePackageMap(folder, info.packageMapInfo);
+        packageMapInfo = _packageMapProvider.computePackageMap(folder);
       });
       callbacks.endComputePackageMap();
       for (String dependencyPath in packageMapInfo.dependencies) {
         Resource resource = resourceProvider.getResource(dependencyPath);
         if (resource is File) {
           StreamSubscription<WatchEvent> subscription;
           subscription = resource.changes.listen((WatchEvent event) {
             if (info.packageMapInfo != null &&
-                info.packageMapInfo.isChangedDependency(
-                    dependencyPath, resourceProvider)) {
+                info.packageMapInfo.dependencies.contains(dependencyPath)) {
               _recomputeFolderDisposition(info);
             }
           }, onError: (error, StackTrace stackTrace) {
             // Gracefully degrade if file is or becomes unwatchable
             _instrumentationService.logException(error, stackTrace);
             subscription.cancel();
             info.dependencySubscriptions.remove(subscription);
           });
           info.dependencySubscriptions.add(subscription);
         }
@@ skipping 303 matching lines @@
           });
           callbacks.applyChangesToContext(folder, changeSet);
         }
         break;
     }
 
     //TODO(pquitslund): find the right place for this
     _checkForPackagespecUpdate(path, info, folder);
 
     if (info.packageMapInfo != null &&
-        info.packageMapInfo.isChangedDependency(path, resourceProvider)) {
+        info.packageMapInfo.dependencies.contains(path)) {
       _recomputeFolderDisposition(info);
     }
   }
 
   /**
    * Returns `true` if the given [path] is excluded by [excludedPaths].
    */
   bool _isExcluded(String path) => _isExcludedBy(excludedPaths, path);
 
   /**
@@ skipping 211 matching lines @@
 class PackagesFileDisposition extends FolderDisposition {
   @override
   final Packages packages;
 
   PackagesFileDisposition(this.packages) {}
 
   @override
   Iterable<UriResolver> createPackageUriResolvers(
       ResourceProvider resourceProvider) => const <UriResolver>[];
 }