Allow input summaries to be specified when running analyzer_cli in non-build mode.

pkg/analyzer_cli/lib/src/driver.dart

 // Copyright (c) 2015, 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 analyzer_cli.src.driver;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io' as io;
 
@@ skipping 14 matching lines @@
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/interner.dart';
 import 'package:analyzer/src/generated/java_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'
     show PerformanceTag;
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/source/source_resource.dart';
+import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary/summary_sdk.dart' show SummaryBasedDartSdk;
 import 'package:analyzer/src/task/options.dart';
 import 'package:analyzer_cli/src/analyzer_impl.dart';
 import 'package:analyzer_cli/src/build_mode.dart';
 import 'package:analyzer_cli/src/error_formatter.dart';
 import 'package:analyzer_cli/src/incremental_analyzer.dart';
 import 'package:analyzer_cli/src/options.dart';
 import 'package:analyzer_cli/src/perf_report.dart';
 import 'package:analyzer_cli/starter.dart';
 import 'package:linter/src/plugin/linter_plugin.dart';
@@ skipping 26 matching lines @@
 
 class Driver implements CommandLineStarter {
   static final PerformanceTag _analyzeAllTag =
       new PerformanceTag("Driver._analyzeAll");
 
   /// The plugins that are defined outside the `analyzer_cli` package.
   List<Plugin> _userDefinedPlugins = <Plugin>[];
 
   /// The context that was most recently created by a call to [_analyzeAll], or
   /// `null` if [_analyzeAll] hasn't been called yet.
-  AnalysisContext _context;
+  InternalAnalysisContext _context;
 
   /// The total number of source files loaded by an AnalysisContext.
   int _analyzedFileCount = 0;
 
   /// If [_context] is not `null`, the [CommandLineOptions] that guided its
   /// creation.
   CommandLineOptions _previousOptions;
 
   IncrementalAnalysisSession incrementalSession;
 
@@ skipping 215 matching lines @@
     }
     if (options.strongMode != _previousOptions.strongMode) {
       return false;
     }
     if (options.enableSuperMixins != _previousOptions.enableSuperMixins) {
       return false;
     }
     if (options.incrementalCachePath != _previousOptions.incrementalCachePath) {
       return false;
     }
+    if (!_equalLists(
+        options.buildSummaryInputs, _previousOptions.buildSummaryInputs)) {
+      return false;
+    }
     return true;
   }
 
   /// Decide on the appropriate policy for which files need to be fully parsed
   /// and which files need to be diet parsed, based on [options], and return an
   /// [AnalyzeFunctionBodiesPredicate] that implements this policy.
   AnalyzeFunctionBodiesPredicate _chooseDietParsingPolicy(
       CommandLineOptions options) {
     if (options.shouldBatch) {
       // As analyzer is currently implemented, once a file has been diet
@@ skipping 13 matching lines @@
         // TODO(paulberry): diet parse 'package:' imports when we don't want
         // diagnostics. (Full parse is still needed for "self" packages.)
         return true;
       }
     };
   }
 
   /// Decide on the appropriate method for resolving URIs based on the given
   /// [options] and [customUrlMappings] settings, and return a
   /// [SourceFactory] that has been configured accordingly.
-  SourceFactory _chooseUriResolutionPolicy(CommandLineOptions options,
-      Map<file_system.Folder, YamlMap> embedderMap, _PackageInfo packageInfo) {
+  SourceFactory _chooseUriResolutionPolicy(
+      CommandLineOptions options,
+      Map<file_system.Folder, YamlMap> embedderMap,
+      _PackageInfo packageInfo,
+      SummaryDataStore summaryDataStore) {
     // Create a custom package resolver if one has been specified.
     if (packageResolverProvider != null) {
       file_system.Folder folder = resourceProvider.getResource('.');
       UriResolver resolver = packageResolverProvider(folder);
       if (resolver != null) {
         UriResolver sdkResolver = new DartUriResolver(sdk);
 
         // TODO(brianwilkerson) This doesn't handle sdk extensions.
         List<UriResolver> resolvers = <UriResolver>[
           sdkResolver,
+          new InSummaryUriResolver(resourceProvider, summaryDataStore),
           resolver,
           new file_system.ResourceUriResolver(resourceProvider)
         ];
         return new SourceFactory(resolvers);
       }
     }
 
     UriResolver packageUriResolver;
 
     if (options.packageRootPath != null) {
@@ skipping 38 matching lines @@
       // The embedder uri resolver has mappings, use it instead of the default
       // Dart SDK uri resolver.
       resolvers.add(new DartUriResolver(embedderSdk));
     }
 
     // Next SdkExts.
     if (packageInfo.packageMap != null) {
       resolvers.add(new SdkExtUriResolver(packageInfo.packageMap));
     }
 
+    // Then package URIs from summaries.
+    resolvers.add(new InSummaryUriResolver(resourceProvider, summaryDataStore));
+
     // Then package URIs.
     if (packageUriResolver != null) {
       resolvers.add(packageUriResolver);
     }
 
     // Finally files.
     resolvers.add(new file_system.ResourceUriResolver(resourceProvider));
 
     return new SourceFactory(resolvers, packageInfo.packages);
   }
@@ skipping 68 matching lines @@
     // Process embedders.
     Map<file_system.Folder, YamlMap> embedderMap =
         new EmbedderYamlLocator(packageInfo.packageMap).embedderYamls;
 
     // Scan for SDK extenders.
     bool hasSdkExt = _hasSdkExt(packageInfo.packageMap?.values);
 
     // No summaries in the presence of embedders or extenders.
     bool useSummaries = embedderMap.isEmpty && !hasSdkExt;
 
+    if (!useSummaries && options.buildSummaryInputs.isNotEmpty) {
+      throw new _DriverError(
+          'Summaries are not supported in this configuration');

[Brian Wilkerson, 2016/09/16 19:27:30]

Could we be more specific? Maybe something like

Summaries are not yet supported when using Flutter.

which, AFAIK, is the only time we'll have either an embedder file or an SDK
extension.

[Paul Berry, 2016/09/16 21:50:14]

Done.

+    }
+
+    // Read any input summaries.
+    SummaryDataStore summaryDataStore = new SummaryDataStore(
+        useSummaries ? options.buildSummaryInputs : <String>[]);
+
     // Once options and embedders are processed, setup the SDK.
     _setupSdk(options, useSummaries);
 
     // Choose a package resolution policy and a diet parsing policy based on
     // the command-line options.
-    SourceFactory sourceFactory =
-        _chooseUriResolutionPolicy(options, embedderMap, packageInfo);
+    SourceFactory sourceFactory = _chooseUriResolutionPolicy(
+        options, embedderMap, packageInfo, summaryDataStore);
 
     _context.sourceFactory = sourceFactory;
+    _context.resultProvider =
+        new InputPackagesResultProvider(_context, summaryDataStore);
 
     incrementalSession = configureIncrementalAnalysis(options, context);
   }
 
   /// Return discovered packagespec, or `null` if none is found.
   Packages _discoverPackagespec(Uri root) {
     try {
       Packages packages = pkg_discovery.findPackagesFromFile(root);
       if (packages != Packages.noPackages) {
         return packages;
@@ skipping 159 matching lines @@
         createAnalysisOptionsForCommandLineOptions(options);
     configureContextOptions(contextOptions);
 
     // Set context options.
     context.analysisOptions = contextOptions;
 
     // Process analysis options file (and notify all interested parties).
     _processAnalysisOptions(resourceProvider, context, options);
   }
 
+  /// Perform a deep comparison of two string lists.
+  static bool _equalLists(List<String> l1, List<String> l2) {
+    if (l1.length != l2.length) {
+      return false;
+    }
+    for (int i = 0; i < l1.length; i++) {
+      if (l1[i] != l2[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   /// Perform a deep comparison of two string maps.
   static bool _equalMaps(Map<String, String> m1, Map<String, String> m2) {
     if (m1.length != m2.length) {
       return false;
     }
     for (String key in m1.keys) {
       if (!m2.containsKey(key) || m1[key] != m2[key]) {
         return false;
       }
     }
@@ skipping 141 matching lines @@
     for (var package in packages) {
       var packageName = path.basename(package.path);
       var realPath = package.resolveSymbolicLinksSync();
       result[packageName] = [
         PhysicalResourceProvider.INSTANCE.getFolder(realPath)
       ];
     }
     return result;
   }
 }