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

Unified Diff: compiler/java/com/google/dart/compiler/UrlLibrarySource.java

Issue 11348078: resolve sourced files with package: correctly dartbug.com/6363 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/UrlLibrarySource.java
===================================================================
--- compiler/java/com/google/dart/compiler/UrlLibrarySource.java (revision 14975)
+++ compiler/java/com/google/dart/compiler/UrlLibrarySource.java (working copy)
@@ -70,6 +70,12 @@
try {
// Force the creation of an escaped relative URI to deal with spaces, etc.
URI uri = getUri().resolve(new URI(null, null, relPath, null, null)).normalize();
+ if (PackageLibraryManager.isPackageUri(uri)) {
+ URI fileUri = packageLibraryManager.resolveDartUri(uri);
+ if (fileUri != null) {
+ uri = fileUri;
+ }
+ }
return createDartSource(uri, relPath, this, packageLibraryManager);
} catch (Throwable e) {
return null;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698