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

Unified Diff: sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart

Issue 312523007: Fix URL/native path conversions in pub. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 7 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: sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
diff --git a/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart b/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
index 5d36ab478f4de5538500b1a5c9b876d640b4cce9..e9d50aa2ee85705ac41abd4d7551d2868b038669 100644
--- a/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
+++ b/sdk/lib/_internal/pub/lib/src/barback/asset_environment.dart
@@ -370,8 +370,8 @@ class AssetEnvironment {
// the initial transformer loading process.
var dartPath = assetPath('dart');
var pubSources = listDir(dartPath, recursive: true).map((library) {
- return new AssetId('\$pub',
- path.join('lib', path.relative(library, from: dartPath)));
+ var idPath = path.join('lib', path.relative(library, from: dartPath));
+ return new AssetId('\$pub', path.toUri(idPath).toString());
});
// "$sdk" is a pseudo-package that allows the dart2js transformer to find
@@ -380,8 +380,11 @@ class AssetEnvironment {
var libPath = path.join(sdk.rootDirectory, "lib");
var sdkSources = listDir(libPath, recursive: true)
.where((file) => path.extension(file) == ".dart")
- .map((file) => new AssetId('\$sdk',
- path.join("lib", path.relative(file, from: sdk.rootDirectory))));
+ .map((file) {
+ var idPath = path.join("lib",
+ path.relative(file, from: sdk.rootDirectory));
+ return new AssetId('\$sdk', path.toUri(idPath).toString());
+ });
// Bind a server that we can use to load the transformers.
var transformerServer;
@@ -539,7 +542,7 @@ class AssetEnvironment {
if (relative.endsWith(".dart.js.map")) return [];
if (relative.endsWith(".dart.precompiled.js")) return [];
- return [new AssetId(package.name, relative)];
+ return [new AssetId(package.name, path.toUri(relative).toString())];
}).toList();
}
@@ -580,8 +583,8 @@ class AssetEnvironment {
if (event.path.endsWith(".dart.js.map")) return;
if (event.path.endsWith(".dart.precompiled.js")) return;
- var id = new AssetId(package.name,
- path.relative(event.path, from: package.dir));
+ var idPath = path.relative(event.path, from: package.dir);
+ var id = new AssetId(package.name, path.toUri(idPath).toString());
if (event.type == ChangeType.REMOVE) {
if (_modifiedSources != null) {
_modifiedSources.remove(id);

Powered by Google App Engine
This is Rietveld 408576698