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

Unified Diff: pkg/polymer/lib/src/transform/common.dart

Issue 22852013: Fix polymer transformers in windows. AssetId's always use posix style paths (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 4 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: pkg/polymer/lib/src/transform/common.dart
diff --git a/pkg/polymer/lib/src/transform/common.dart b/pkg/polymer/lib/src/transform/common.dart
index 99055033654c8cf2cf47ac63ad76e40b6fc5ff2c..c72e8b1cd92f84552a81a9a625f5535fbdd8c604 100644
--- a/pkg/polymer/lib/src/transform/common.dart
+++ b/pkg/polymer/lib/src/transform/common.dart
@@ -48,14 +48,15 @@ Document parseHtml(String contents, String sourcePath, TransformLogger logger,
AssetId resolve(AssetId source, String url, TransformLogger logger, Span span) {
if (url == null || url == '') return null;
var uri = Uri.parse(url);
- if (uri.host != '' || uri.scheme != '' || path.isAbsolute(url)) {
+ var urlBuilder = path.url;
+ if (uri.host != '' || uri.scheme != '' || urlBuilder.isAbsolute(url)) {
logger.error('absolute paths not allowed: "$url"', span);
return null;
}
var package;
var targetPath;
- var segments = path.split(url);
+ var segments = urlBuilder.split(url);
if (segments[0] == 'packages') {
if (segments.length < 3) {
logger.error("incomplete packages/ path. It should have at least 3 "
@@ -63,17 +64,20 @@ AssetId resolve(AssetId source, String url, TransformLogger logger, Span span) {
return null;
}
package = segments[1];
- targetPath = path.join('lib', path.joinAll(segments.sublist(2)));
+ targetPath = urlBuilder.join('lib',
+ urlBuilder.joinAll(segments.sublist(2)));
} else if (segments[0] == 'assets') {
if (segments.length < 3) {
logger.error("incomplete assets/ path. It should have at least 3 "
"segments assets/name/path-from-name's-asset-dir", span);
}
package = segments[1];
- targetPath = path.join('asset', path.joinAll(segments.sublist(2)));
+ targetPath = urlBuilder.join('asset',
+ urlBuilder.joinAll(segments.sublist(2)));
} else {
package = source.package;
- targetPath = path.normalize(path.join(path.dirname(source.path), url));
+ targetPath = urlBuilder.normalize(
+ urlBuilder.join(urlBuilder.dirname(source.path), url));
}
return new AssetId(package, targetPath);
}
« no previous file with comments | « pkg/polymer/lib/src/transform/code_extractor.dart ('k') | pkg/polymer/lib/src/transform/script_compactor.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698