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

Unified Diff: lib/src/barback/dependency_computer.dart

Issue 1220223008: Fix an edge case in the dependency computer. (Closed) Base URL: git@github.com:dart-lang/pub.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | test/dependency_computer/dev_transformers_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/barback/dependency_computer.dart
diff --git a/lib/src/barback/dependency_computer.dart b/lib/src/barback/dependency_computer.dart
index facf14084a28056e6d900ebaee570abb05a1bbc2..494b3a9d6abb1ec9371afca6300331230f516573 100644
--- a/lib/src/barback/dependency_computer.dart
+++ b/lib/src/barback/dependency_computer.dart
@@ -172,9 +172,15 @@ class DependencyComputer {
for (var config in phase) {
var id = config.id;
if (id.isBuiltInTransformer) continue;
+ if (packageName != _graph.entrypoint.root.name &&
+ !config.canTransformPublicFiles) {
+ continue;
+ }
+
if (_loadingPackageComputers.contains(id.package)) {
throw new CycleException("$packageName is transformed by $id");
}
+
results.add(id);
}
}
@@ -264,9 +270,9 @@ class _PackageDependencyComputer {
// [_transformersNeededByLibraries] while [_applicableTransformers] is
// smaller.
for (var phase in _package.pubspec.transformers) {
- for (var config in phase) {
+ _applicableTransformers.addAll(phase.where((config) {
// Ignore non-root transformers on non-public files.
- if (!isRootPackage && !config.canTransformPublicFiles) continue;
+ if (!isRootPackage && !config.canTransformPublicFiles) return false;
var id = config.id;
try {
@@ -287,13 +293,14 @@ class _PackageDependencyComputer {
} on CycleException catch (error) {
throw error.prependStep("$packageName is transformed by $id");
}
- }
+
+ return true;
+ }));
// Clear the cached imports and exports because the new transformers may
// start transforming a library whose directives were previously
// statically analyzable.
_transitiveExternalDirectives.clear();
- _applicableTransformers.addAll(phase);
}
}
« no previous file with comments | « no previous file | test/dependency_computer/dev_transformers_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698