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

Unified Diff: pkg/analyzer/lib/src/summary/link.dart

Issue 2540823002: Properly resolve dependency part paths in summary linker. (Closed)
Patch Set: Created 4 years, 1 month 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 | pkg/analyzer/test/src/summary/resynthesize_common.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/link.dart
diff --git a/pkg/analyzer/lib/src/summary/link.dart b/pkg/analyzer/lib/src/summary/link.dart
index cfee0e2d7d1d24e5948e6c110b05f8e6ed84fb6e..5d7ccdd26f874965c57c3860a7e17c993804cdb1 100644
--- a/pkg/analyzer/lib/src/summary/link.dart
+++ b/pkg/analyzer/lib/src/summary/link.dart
@@ -3551,9 +3551,15 @@ class LibraryElementInBuildUnit
}
}
int result = _linkedLibrary.dependencies.length;
+ Uri libraryUri = library._absoluteUri;
+ List<String> partsRelativeToDependency =
+ library.definingUnlinkedUnit.publicNamespace.parts;
+ List<String> partsRelativeToLibraryBeingLinked = partsRelativeToDependency
+ .map((partUri) =>
+ resolveRelativeUri(libraryUri, Uri.parse(partUri)).toString())
+ .toList();
_linkedLibrary.dependencies.add(new LinkedDependencyBuilder(
- parts: library.definingUnlinkedUnit.publicNamespace.parts,
- uri: library._absoluteUri.toString()));
+ parts: partsRelativeToLibraryBeingLinked, uri: libraryUri.toString()));
_dependencies.add(library);
return result;
}
« no previous file with comments | « no previous file | pkg/analyzer/test/src/summary/resynthesize_common.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698