Don't use SDK summaries with embedders (#26448).

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';
 
@@ skipping 312 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, EmbedderYamlLocator yamlLocator) {
-    Packages packages;
-    Map<String, List<fileSystem.Folder>> packageMap;
-    UriResolver packageUriResolver;
-
+  SourceFactory _chooseUriResolutionPolicy(CommandLineOptions options,
+      Map<fileSystem.Folder, YamlMap> embedderMap, _PackageInfo packageInfo) {
     // Create a custom package resolver if one has been specified.
     if (packageResolverProvider != null) {
       fileSystem.Folder folder =
           PhysicalResourceProvider.INSTANCE.getResource('.');
       UriResolver resolver = packageResolverProvider(folder);
       if (resolver != null) {
         UriResolver sdkResolver;
 
         // Check for a resolver provider.
         if (embeddedUriResolverProvider != null) {
           EmbedderUriResolver embedderUriResolver =
               embeddedUriResolverProvider(folder);
           if (embedderUriResolver != null && embedderUriResolver.length != 0) {
             sdkResolver = embedderUriResolver;
           }
         }
 
         // Default to a Dart URI resolver if no embedder is found.
         sdkResolver ??= new DartUriResolver(sdk);
 
         // TODO(brianwilkerson) This doesn't sdk extensions.
         List<UriResolver> resolvers = <UriResolver>[
           sdkResolver,
           resolver,
           new FileUriResolver()
         ];
         return new SourceFactory(resolvers);
       }
     }
-    // Process options, caching package resolution details.
-    if (options.packageConfigPath != null) {
-      String packageConfigPath = options.packageConfigPath;
-      Uri fileUri = new Uri.file(packageConfigPath);
-      try {
-        File configFile = new File.fromUri(fileUri).absolute;
-        List<int> bytes = configFile.readAsBytesSync();
-        Map<String, Uri> map = pkgfile.parse(bytes, configFile.uri);
-        packages = new MapPackages(map);
-        packageMap = _getPackageMap(packages);
-      } catch (e) {
-        printAndFail(
-            'Unable to read package config data from $packageConfigPath: $e');
-      }
-    } else if (options.packageRootPath != null) {
-      packageMap = _PackageRootPackageMapBuilder
-          .buildPackageMap(options.packageRootPath);
 
+    UriResolver packageUriResolver;
+
+    if (options.packageRootPath != null) {
       JavaFile packageDirectory = new JavaFile(options.packageRootPath);
       packageUriResolver = new PackageUriResolver([packageDirectory]);
-    } else {
-      fileSystem.Resource cwd =
-          PhysicalResourceProvider.INSTANCE.getResource('.');
-
-      // Look for .packages.
-      packages = _discoverPackagespec(new Uri.directory(cwd.path));
-
-      if (packages != null) {
-        packageMap = _getPackageMap(packages);
-      } else {
+    } else if (options.packageConfigPath == null) {
+      // TODO(pq): remove?
+      if (packageInfo.packageMap == null) {
         // Fall back to pub list-package-dirs.
-
         PubPackageMapProvider pubPackageMapProvider =
             new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
+        fileSystem.Resource cwd =
+            PhysicalResourceProvider.INSTANCE.getResource('.');
         PackageMapInfo packageMapInfo =
             pubPackageMapProvider.computePackageMap(cwd);
-        packageMap = packageMapInfo.packageMap;
+        Map<String, List<fileSystem.Folder>> packageMap =
+            packageMapInfo.packageMap;
 
         // Only create a packageUriResolver if pub list-package-dirs succeeded.
         // If it failed, that's not a problem; it simply means we have no way
         // to resolve packages.
         if (packageMapInfo.packageMap != null) {
           packageUriResolver = new PackageMapUriResolver(
               PhysicalResourceProvider.INSTANCE, packageMap);
         }
       }
     }
 
     // Now, build our resolver list.
     List<UriResolver> resolvers = [];
 
     // 'dart:' URIs come first.
 
     // Setup embedding.
-    yamlLocator.refresh(packageMap);
-
     EmbedderUriResolver embedderUriResolver =
-        new EmbedderUriResolver(yamlLocator.embedderYamls);
+        new EmbedderUriResolver(embedderMap);
     if (embedderUriResolver.length == 0) {
       // The embedder uri resolver has no mappings. Use the default Dart SDK
       // uri resolver.
       resolvers.add(new DartUriResolver(sdk));
     } else {
       // The embedder uri resolver has mappings, use it instead of the default
       // Dart SDK uri resolver.
       resolvers.add(embedderUriResolver);
     }
 
     // Next SdkExts.
-    if (packageMap != null) {
-      resolvers.add(new SdkExtUriResolver(packageMap));
+    if (packageInfo.packageMap != null) {
+      resolvers.add(new SdkExtUriResolver(packageInfo.packageMap));
     }
 
     // Then package URIs.
     if (packageUriResolver != null) {
       resolvers.add(packageUriResolver);
     }
 
     // Finally files.
     resolvers.add(new FileUriResolver());
 
-    return new SourceFactory(resolvers, packages);
+    return new SourceFactory(resolvers, packageInfo.packages);
   }
 
   /// Collect all analyzable files at [filePath], recursively if it's a
   /// directory, ignoring links.
   Iterable<File> _collectFiles(String filePath) {
     List<File> files = <File>[];
     File file = new File(filePath);
     if (file.existsSync()) {
       files.add(file);
     } else {
@@ skipping 46 matching lines @@
     // Create a context.
     _context = AnalysisEngine.instance.createAnalysisContext();
 
     AnalyzeFunctionBodiesPredicate dietParsingPolicy =
         _chooseDietParsingPolicy(options);
     setAnalysisContextOptions(_context, options,
         (AnalysisOptionsImpl contextOptions) {
       contextOptions.analyzeFunctionBodiesPredicate = dietParsingPolicy;
     });
 
-    // Once options are processed, setup the SDK.
-    _setupSdk(options);
+    // Find package info.
+    _PackageInfo packageInfo = _findPackages(options);
+
+    // Process embedders.
+    Map<fileSystem.Folder, YamlMap> embedderMap =
+        _findEmbedders(packageInfo.packageMap);
+
+    // Once options and embedders are processed, setup the SDK.
+    _setupSdk(options, embedderMap.isNotEmpty);
 
     // Choose a package resolution policy and a diet parsing policy based on
     // the command-line options.
-    SourceFactory sourceFactory = _chooseUriResolutionPolicy(
-        options, (_context as InternalAnalysisContext).embedderYamlLocator);
+    SourceFactory sourceFactory =
+        _chooseUriResolutionPolicy(options, embedderMap, packageInfo);
 
     _context.sourceFactory = sourceFactory;
   }
 
   /// Return discovered packagespec, or `null` if none is found.
   Packages _discoverPackagespec(Uri root) {
     try {
       Packages packages = pkgDiscovery.findPackagesFromFile(root);
       if (packages != Packages.noPackages) {
         return packages;
       }
     } catch (_) {
       // Ignore and fall through to null.
     }
 
     return null;
   }
 
+  Map<fileSystem.Folder, YamlMap> _findEmbedders(
+      Map<String, List<fileSystem.Folder>> packageMap) {
+    EmbedderYamlLocator locator =
+        (_context as InternalAnalysisContext).embedderYamlLocator;
+    locator.refresh(packageMap);
+    return locator.embedderYamls;
+  }
+
+  _PackageInfo _findPackages(CommandLineOptions options) {
+    if (packageResolverProvider != null) {
+      // The resolver provider will do all the work later.
+      return null;
+    }
+
+    Packages packages;
+    Map<String, List<fileSystem.Folder>> packageMap;
+
+    if (options.packageConfigPath != null) {
+      String packageConfigPath = options.packageConfigPath;
+      Uri fileUri = new Uri.file(packageConfigPath);
+      try {
+        File configFile = new File.fromUri(fileUri).absolute;
+        List<int> bytes = configFile.readAsBytesSync();
+        Map<String, Uri> map = pkgfile.parse(bytes, configFile.uri);
+        packages = new MapPackages(map);
+        packageMap = _getPackageMap(packages);
+      } catch (e) {
+        printAndFail(
+            'Unable to read package config data from $packageConfigPath: $e');
+      }
+    } else if (options.packageRootPath != null) {
+      packageMap = _PackageRootPackageMapBuilder
+          .buildPackageMap(options.packageRootPath);
+    } else {
+      fileSystem.Resource cwd =
+          PhysicalResourceProvider.INSTANCE.getResource('.');
+      // Look for .packages.
+      packages = _discoverPackagespec(new Uri.directory(cwd.path));
+      packageMap = _getPackageMap(packages);
+    }
+
+    return new _PackageInfo(packages, packageMap);
+  }
+
   Map<String, List<fileSystem.Folder>> _getPackageMap(Packages packages) {
     if (packages == null) {
       return null;
     }
 
     Map<String, List<fileSystem.Folder>> folderMap =
         new Map<String, List<fileSystem.Folder>>();
     packages.asMap().forEach((String packagePath, Uri uri) {
       folderMap[packagePath] = [
         PhysicalResourceProvider.INSTANCE.getFolder(path.fromUri(uri))
@@ skipping 26 matching lines @@
     var errorSeverity = analyzer.analyzeSync();
     if (errorSeverity == ErrorSeverity.ERROR) {
       exitCode = errorSeverity.ordinal;
     }
     if (options.warningsAreFatal && errorSeverity == ErrorSeverity.WARNING) {
       exitCode = errorSeverity.ordinal;
     }
     return errorSeverity;
   }
 
-  void _setupSdk(CommandLineOptions options) {
+  void _setupSdk(CommandLineOptions options, bool hasEmbedder) {
     if (sdk == null) {
       if (options.dartSdkSummaryPath != null) {
         sdk = new SummaryBasedDartSdk(options.dartSdkSummaryPath);
       } else {
         String dartSdkPath = options.dartSdkPath;
         DirectoryBasedDartSdk directorySdk =
             new DirectoryBasedDartSdk(new JavaFile(dartSdkPath));
-        directorySdk.useSummary =
-            options.sourceFiles.every((String sourcePath) {
-          sourcePath = path.absolute(sourcePath);
-          sourcePath = path.normalize(sourcePath);
-          return !path.isWithin(dartSdkPath, sourcePath);
-        });
+        // Summaries are disabled in the presence of embedders.
+        if (hasEmbedder) {
+          directorySdk.useSummary = false;
+        } else {
+          directorySdk.useSummary =
+              options.sourceFiles.every((String sourcePath) {
+            sourcePath = path.absolute(sourcePath);
+            sourcePath = path.normalize(sourcePath);
+            return !path.isWithin(dartSdkPath, sourcePath);
+          });
+        }
         directorySdk.analysisOptions = context.analysisOptions;
         sdk = directorySdk;
       }
     }
   }
 
   static AnalysisOptionsImpl createAnalysisOptionsForCommandLineOptions(
       CommandLineOptions options) {
     AnalysisOptionsImpl contextOptions = new AnalysisOptionsImpl();
     contextOptions.hint = !options.disableHints;
@@ skipping 156 matching lines @@
       }
     });
   }
 }
 
 class _DriverError implements Exception {
   String msg;
   _DriverError(this.msg);
 }
 
+class _PackageInfo {
+  Packages packages;
+  Map<String, List<fileSystem.Folder>> packageMap;
+  _PackageInfo(this.packages, this.packageMap);
+}
+
 /// [SdkExtUriResolver] needs a Map from package name to folder. In the case
 /// that the analyzer is invoked with a --package-root option, we need to
 /// manually create this mapping. Given [packageRootPath],
 /// [_PackageRootPackageMapBuilder] creates a simple mapping from package name
 /// to full path on disk (resolving any symbolic links).
 class _PackageRootPackageMapBuilder {
   static Map<String, List<fileSystem.Folder>> buildPackageMap(
       String packageRootPath) {
     var packageRoot = new Directory(packageRootPath);
     if (!packageRoot.existsSync()) {
       throw new _DriverError(
           'Package root directory ($packageRootPath) does not exist.');
     }
     var packages = packageRoot.listSync(followLinks: false);
     var result = new Map<String, List<fileSystem.Folder>>();
     for (var package in packages) {
       var packageName = path.basename(package.path);
       var realPath = package.resolveSymbolicLinksSync();
       result[packageName] = [
         PhysicalResourceProvider.INSTANCE.getFolder(realPath)
       ];
     }
     return result;
   }
 }