Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: pkg/analyzer/lib/source/package_map_provider.dart

Issue 599133002: Move PubPackageMapProvider to its own file. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analyzer/lib/source/package_map_provider.dart
diff --git a/pkg/analyzer/lib/source/package_map_provider.dart b/pkg/analyzer/lib/source/package_map_provider.dart
index 9d738152365995977ac913a511fab73d591ad301..85b493df653086311a13d6944e7617a6f68593bc 100644
--- a/pkg/analyzer/lib/source/package_map_provider.dart
+++ b/pkg/analyzer/lib/source/package_map_provider.dart
@@ -4,14 +4,7 @@
library source.package_map_provider;
-import 'dart:collection';
-import 'dart:convert';
-import 'dart:io' as io;
-
import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/sdk_io.dart';
-import 'package:path/path.dart';
/**
* Data structure output by PackageMapProvider. This contains both the package
@@ -49,122 +42,3 @@ abstract class PackageMapProvider {
*/
PackageMapInfo computePackageMap(Folder folder);
}
-
-/**
- * Implementation of PackageMapProvider that operates by executing pub.
- */
-class PubPackageMapProvider implements PackageMapProvider {
- static const String PUB_LIST_COMMAND = 'list-package-dirs';
-
- /**
- * The name of the 'pubspec.lock' file, which we assume is the dependency
- * in the event that [PUB_LIST_COMMAND] fails.
- */
- static const String PUBSPEC_LOCK_NAME = 'pubspec.lock';
-
- /**
- * [ResourceProvider] that is used to create the [Folder]s that populate the
- * package map.
- */
- final ResourceProvider resourceProvider;
-
- /**
- * Sdk that we use to find the pub executable.
- */
- final DirectoryBasedDartSdk sdk;
-
- PubPackageMapProvider(this.resourceProvider, this.sdk);
-
- @override
- PackageMapInfo computePackageMap(Folder folder) {
- // TODO(paulberry) make this asynchronous so that we can (a) do other
- // analysis while it's in progress, and (b) time out if it takes too long
- // to respond.
- String executable = sdk.pubExecutable.getAbsolutePath();
- io.ProcessResult result;
- try {
- result = io.Process.runSync(
- executable, [PUB_LIST_COMMAND], workingDirectory: folder.path);
- } on io.ProcessException catch (exception, stackTrace) {
- AnalysisEngine.instance.logger.logInformation(
- "Error running pub $PUB_LIST_COMMAND\n${exception}\n${stackTrace}");
- }
- if (result.exitCode != 0) {
- AnalysisEngine.instance.logger.logInformation(
- "pub $PUB_LIST_COMMAND failed: exit code ${result.exitCode}");
- return _error(folder);
- }
- try {
- return parsePackageMap(result.stdout, folder);
- } catch (exception, stackTrace) {
- AnalysisEngine.instance.logger.logError(
- "Malformed output from pub $PUB_LIST_COMMAND\n${exception}\n${stackTrace}");
- }
-
- return _error(folder);
- }
-
- /**
- * Decode the JSON output from pub into a package map. Paths in the
- * output are considered relative to [folder].
- */
- PackageMapInfo parsePackageMap(String jsonText, Folder folder) {
- // The output of pub looks like this:
- // {
- // "packages": {
- // "foo": "path/to/foo",
- // "bar": ["path/to/bar1", "path/to/bar2"],
- // "myapp": "path/to/myapp", // self link is included
- // },
- // "input_files": [
- // "path/to/myapp/pubspec.lock"
- // ]
- // }
- Map<String, List<Folder>> packageMap = new HashMap<String, List<Folder>>();
- Map obj = JSON.decode(jsonText);
- Map packages = obj['packages'];
- processPaths(String packageName, List paths) {
- List<Folder> folders = <Folder>[];
- for (var path in paths) {
- if (path is String) {
- Resource resource = folder.getChild(path);
- if (resource is Folder) {
- folders.add(resource);
- }
- }
- }
- if (folders.isNotEmpty) {
- packageMap[packageName] = folders;
- }
- }
- packages.forEach((key, value) {
- if (value is String) {
- processPaths(key, [value]);
- } else if (value is List) {
- processPaths(key, value);
- }
- });
- Set<String> dependencies = new Set<String>();
- List inputFiles = obj['input_files'];
- if (inputFiles != null) {
- for (var path in inputFiles) {
- if (path is String) {
- dependencies.add(folder.canonicalizePath(path));
- }
- }
- }
- return new PackageMapInfo(packageMap, dependencies);
- }
-
- /**
- * Create a PackageMapInfo object representing an error condition.
- */
- PackageMapInfo _error(Folder folder) {
- // Even if an error occurs, we still need to know the dependencies, so that
- // we'll know when to try running "pub list-package-dirs" again.
- // Unfortunately, "pub list-package-dirs" doesn't tell us dependencies when
- // an error occurs, so just assume there is one dependency, "pubspec.lock".
- List<String> dependencies = <String>[join(folder.path, PUBSPEC_LOCK_NAME)];
- return new PackageMapInfo(null, dependencies.toSet());
- }
-}
« no previous file with comments | « pkg/analysis_server/lib/src/socket_server.dart ('k') | pkg/analyzer/lib/source/pub_package_map_provider.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698