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

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

Issue 23452010: Add a polymer validator: a linter/analysis that will replace the old (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 3 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 | « pkg/polymer/lib/src/linter.dart ('k') | pkg/polymer/lib/src/transform/common.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/polymer/lib/src/transform/code_extractor.dart
diff --git a/pkg/polymer/lib/src/transform/code_extractor.dart b/pkg/polymer/lib/src/transform/code_extractor.dart
index 4cc49b1c1420e9f0726881037a56a74d9d81586d..a46300ef2f3b4def2f68599eb832e990154d22d7 100644
--- a/pkg/polymer/lib/src/transform/code_extractor.dart
+++ b/pkg/polymer/lib/src/transform/code_extractor.dart
@@ -25,10 +25,9 @@ class InlineCodeExtractor extends Transformer {
final String allowedExtensions = ".html";
Future apply(Transform transform) {
- var inputId = transform.primaryInput.id;
- return transform.primaryInput.readAsString().then((content) {
- var document = parseHtml(content, inputId.path, transform.logger,
- checkDocType: false);
+ var input = transform.primaryInput;
+ var id = transform.primaryInput.id;
+ return readPrimaryAsHtml(transform).then((document) {
int count = 0;
bool htmlChanged = false;
for (var tag in document.queryAll('script')) {
@@ -45,23 +44,23 @@ class InlineCodeExtractor extends Transformer {
continue;
}
- var filename = path.url.basename(inputId.path);
+ var filename = path.url.basename(id.path);
// TODO(sigmund): ensure this filename is unique (dartbug.com/12618).
tag.attributes['src'] = '$filename.$count.dart';
var textContent = tag.nodes.first;
var code = textContent.value;
- var id = inputId.addExtension('.$count.dart');
+ var newId = id.addExtension('.$count.dart');
if (!_hasLibraryDirective(code)) {
- var libname = path.withoutExtension(id.path)
+ var libname = path.withoutExtension(newId.path)
.replaceAll(new RegExp('[-./]'), '_');
code = "library $libname;\n$code";
}
- transform.addOutput(new Asset.fromString(id, code));
+ transform.addOutput(new Asset.fromString(newId, code));
textContent.remove();
count++;
}
- transform.addOutput(new Asset.fromString(inputId,
- htmlChanged ? document.outerHtml : content));
+ transform.addOutput(
+ htmlChanged ? new Asset.fromString(id, document.outerHtml) : input);
});
}
}
« no previous file with comments | « pkg/polymer/lib/src/linter.dart ('k') | pkg/polymer/lib/src/transform/common.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698