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

Unified Diff: pkg/analysis_server/lib/src/package_map_provider.dart

Issue 367453003: Handle relative paths in the output of "pub list-package-dirs". (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 6 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/analysis_server/lib/src/package_map_provider.dart
diff --git a/pkg/analysis_server/lib/src/package_map_provider.dart b/pkg/analysis_server/lib/src/package_map_provider.dart
index 29ec5ce6fb3765ea7d950b9aa60076fc615bb526..76e9476704dcfdcc07956f15171eb437e538c354 100644
--- a/pkg/analysis_server/lib/src/package_map_provider.dart
+++ b/pkg/analysis_server/lib/src/package_map_provider.dart
@@ -90,7 +90,7 @@ class PubPackageMapProvider implements PackageMapProvider {
return _error(folder);
}
try {
- return parsePackageMap(result.stdout);
+ return parsePackageMap(result.stdout, folder);
} catch (exception, stackTrace) {
AnalysisEngine.instance.logger.logError(
"Malformed output from pub $PUB_LIST_COMMAND\n${exception}\n${stackTrace}");
@@ -112,9 +112,10 @@ class PubPackageMapProvider implements PackageMapProvider {
}
/**
- * Decode the JSON output from pub into a package map.
+ * Decode the JSON output from pub into a package map. Paths in the
+ * output are considered relative to [folder].
*/
- PackageMapInfo parsePackageMap(String jsonText) {
+ PackageMapInfo parsePackageMap(String jsonText, Folder folder) {
// The output of pub looks like this:
// {
// "packages": {
@@ -133,7 +134,7 @@ class PubPackageMapProvider implements PackageMapProvider {
List<Folder> folders = <Folder>[];
for (var path in paths) {
if (path is String) {
- Resource resource = resourceProvider.getResource(path);
+ Resource resource = folder.getChild(path);
if (resource is Folder) {
folders.add(resource);
}
@@ -155,7 +156,7 @@ class PubPackageMapProvider implements PackageMapProvider {
if (inputFiles != null) {
for (var path in inputFiles) {
if (path is String) {
- dependencies.add(path);
+ dependencies.add(folder.canonicalizePath(path));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698