Merge pull request #3798 from pq/package_map_cleanup

Analyze update to use in-memory package map.

packages/flutter_tools/lib/src/commands/analyze.dart

@@ -187,16 +187,6 @@ class AnalyzeCommand extends FlutterCommand {
       packages['sky_services'] = path.join(buildDir, 'gen/dart-pkg/sky_services/lib');
     }
 
-    StringBuffer packagesBody = new StringBuffer();
-    for (String package in packages.keys)
-      packagesBody.writeln('$package:${path.toUri(packages[package])}');
-
-    // save the .packages file to disk
-    //TODO (pq): consider passing package info via a data URI
-    Directory host = Directory.systemTemp.createTempSync('flutter-analyze-');
-    String packagesFilePath = path.join(host.path, '.packages');
-    new File(packagesFilePath).writeAsStringSync(packagesBody.toString());
-
     if (argResults['preamble']) {
       if (dartFiles.length == 1) {
         logger.printStatus('Analyzing ${path.relative(dartFiles.first.path)}...');
@@ -206,7 +196,7 @@ class AnalyzeCommand extends FlutterCommand {
     }
     DriverOptions options = new DriverOptions();
     options.dartSdkPath = argResults['dart-sdk'];
-    options.packageConfigPath = packagesFilePath;
+    options.packageMap = packages;
     options.analysisOptionsFile = path.join(ArtifactStore.flutterRoot, 'packages', 'flutter_tools', 'flutter_analysis_options');
     AnalysisDriver analyzer = new AnalysisDriver(options);
 
@@ -241,8 +231,6 @@ class AnalyzeCommand extends FlutterCommand {
     stopwatch.stop();
     String elapsed = (stopwatch.elapsedMilliseconds / 1000.0).toStringAsFixed(1);
 
-    host.deleteSync(recursive: true);
-
     if (_isBenchmarking)
       _writeBenchmark(stopwatch, errorCount);
 

packages/flutter_tools/lib/src/dart/analysis.dart

@@ -26,7 +26,6 @@ import 'package:analyzer/src/task/options.dart';
 import 'package:cli_util/cli_util.dart' as cli_util;
 import 'package:linter/src/plugin/linter_plugin.dart';
 import 'package:package_config/packages.dart' show Packages;
-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 path;
 import 'package:plugin/manager.dart';
@@ -65,9 +64,10 @@ class AnalysisDriver {
   List<AnalysisErrorInfo> _analyze(Iterable<File> files) {
     context = AnalysisEngine.instance.createAnalysisContext();
     _processAnalysisOptions(context, options);
-    Packages packages = _getPackageConfig();
+    PackageInfo packageInfo = new PackageInfo(options.packageMap);
+    List<UriResolver> resolvers = _getResolvers(context, packageInfo.asMap());
     context.sourceFactory =
-        new SourceFactory(_getResolvers(context, packages), packages);
+        new SourceFactory(resolvers, packageInfo.asPackages());
 
     List<Source> sources = <Source>[];
     ChangeSet changeSet = new ChangeSet();
@@ -93,40 +93,10 @@ class AnalysisDriver {
     return infos;
   }
 
-  Packages _getPackageConfig() {
+  List<UriResolver> _getResolvers(InternalAnalysisContext context,
-    if (options.packageConfigPath != null) {
+      Map<String, List<file_system.Folder>> packageMap) {
-      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);
-        return new MapPackages(map);
-      } catch (e) {
-        throw new AnalysisDriverException('Unable to create package map.');
-      }
-    }
-    return null;
-  }
-
-  Map<String, List<file_system.Folder>> _getPackageMap(Packages packages) {
-    if (packages == null) return null;
-
-    Map<String, List<file_system.Folder>> folderMap =
-        new Map<String, List<file_system.Folder>>();
-    packages.asMap().forEach((String packagePath, Uri uri) {
-      folderMap[packagePath] = <file_system.Folder>[
-        PhysicalResourceProvider.INSTANCE.getFolder(path.fromUri(uri))
-      ];
-    });
-    return folderMap;
-  }
-
-  List<UriResolver> _getResolvers(
-      InternalAnalysisContext context, Packages packages) {
     DartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir));
     List<UriResolver> resolvers = <UriResolver>[];
-    Map<String, List<file_system.Folder>> packageMap = _getPackageMap(packages);
 
     EmbedderYamlLocator yamlLocator = context.embedderYamlLocator;
     yamlLocator.refresh(packageMap);
@@ -243,8 +213,8 @@ class DriverOptions extends AnalysisOptionsImpl {
   /// The path to the dart SDK.
   String dartSdkPath;
 
-  /// The path to a `.packages` configuration file
+  /// Map of packages to folder paths.
-  String packageConfigPath;
+  Map<String, String> packageMap;
 
   /// The path to the package root.
   String packageRootPath;
@@ -268,6 +238,28 @@ class DriverOptions extends AnalysisOptionsImpl {
   IOSink errorSink = stderr;
 }
 
+class PackageInfo {
+  PackageInfo(Map<String, String> packageMap) {
+    Map<String, Uri> packages = new HashMap<String, Uri>();
+    for (String package in packageMap.keys) {
+      String path = packageMap[package];
+      packages[package] = new Uri.directory(path);
+      _map[package] = <file_system.Folder>[
+        PhysicalResourceProvider.INSTANCE.getFolder(path)
+      ];
+    }
+    _packages = new MapPackages(packages);
+  }
+
+  Packages _packages;
+  HashMap<String, List<file_system.Folder>> _map =
+      new HashMap<String, List<file_system.Folder>>();
+
+  Map<String, List<file_system.Folder>> asMap() => _map;
+
+  Packages asPackages() => _packages;
+}
+
 class _StdLogger extends Logger {
   final IOSink outSink;
   final IOSink errorSink;