dartfmt
diff --git a/pkgs/package_config/lib/discovery.dart b/pkgs/package_config/lib/discovery.dart index 2abf443..020d99a 100644 --- a/pkgs/package_config/lib/discovery.dart +++ b/pkgs/package_config/lib/discovery.dart
@@ -33,6 +33,7 @@ Map<String, Uri> packageMap = pkgfile.parse(bytes, packagesFile); return new MapPackages(packageMap); } + if (packagesFile.scheme == "file") { File file = new File.fromUri(packagesFile); return parseBytes(await file.readAsBytes()); @@ -125,6 +126,7 @@ if (file.existsSync()) return file; return null; } + // Check for $cwd/.packages var packagesCfgFile = checkForConfigFile(dir); if (packagesCfgFile != null) return packagesCfgFile;
diff --git a/pkgs/package_config/lib/discovery_analysis.dart b/pkgs/package_config/lib/discovery_analysis.dart index ce7e98a..67798e1 100644 --- a/pkgs/package_config/lib/discovery_analysis.dart +++ b/pkgs/package_config/lib/discovery_analysis.dart
@@ -91,6 +91,7 @@ contexts = oldContexts; } } + findRoots(directory); // If the root is not itself context root, add a the wrapper context. if (contexts.length == 1 && contexts[0].directory == directory) { @@ -115,6 +116,7 @@ recurse(child); } } + recurse(this); return result; }
diff --git a/pkgs/package_config/test/discovery_test.dart b/pkgs/package_config/test/discovery_test.dart index cbbca9a..6a5bcde 100644 --- a/pkgs/package_config/test/discovery_test.dart +++ b/pkgs/package_config/test/discovery_test.dart
@@ -169,6 +169,7 @@ } throw "not found"; } + // A non-file: location with no .packages or packages/: // Assumes a packages dir exists, and resolves relative to that. Packages resolver; @@ -189,6 +190,7 @@ Future<List<int>> loader(Uri file) async { throw "not found"; } + // A non-file: location with no .packages or packages/: // Assumes a packages dir exists, and resolves relative to that. Packages resolver;
diff --git a/pkgs/package_config/test/parse_write_test.dart b/pkgs/package_config/test/parse_write_test.dart index 4302187..b963eb5 100644 --- a/pkgs/package_config/test/parse_write_test.dart +++ b/pkgs/package_config/test/parse_write_test.dart
@@ -34,6 +34,7 @@ }); }); } + var lowerDir = baseDir.resolve("path3/path4/"); var higherDir = baseDir.resolve("../"); var parallelDir = baseDir.resolve("../path3/");