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

Unified Diff: pkg/polymer/lib/src/transform/import_inliner.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
Index: pkg/polymer/lib/src/transform/import_inliner.dart
diff --git a/pkg/polymer/lib/src/transform/import_inliner.dart b/pkg/polymer/lib/src/transform/import_inliner.dart
index 081c2ce3ab61f0590bedd607d568a032ed2712b6..66bd029f1468bfe3e819f53070af78ce5c2a3a50 100644
--- a/pkg/polymer/lib/src/transform/import_inliner.dart
+++ b/pkg/polymer/lib/src/transform/import_inliner.dart
@@ -18,20 +18,19 @@ import 'common.dart';
// than polymer-element (see dartbug.com/12613).
class ImportedElementInliner extends Transformer {
/** Only run on entrypoint .html files under web or test. */
- Future<bool> isPrimary(Asset input) => isHtmlInWebOrTest(input.id);
+ Future<bool> isPrimary(Asset input) =>
+ new Future.value(isHtmlInWebOrTest(input.id));
Future apply(Transform transform) {
var seen = new Set<AssetId>();
var elements = [];
var id = transform.primaryInput.id;
seen.add(id);
- return transform.primaryInput.readAsString().then((content) {
- var document = parseHtml(content, id.path, transform.logger,
- checkDocType: true);
+ return readPrimaryAsHtml(transform).then((document) {
var future = _visitImports(document, id, transform, seen, elements);
return future.then((importsFound) {
if (!importsFound) {
- transform.addOutput(new Asset.fromString(id, content));
+ transform.addOutput(transform.primaryInput);
return;
}
@@ -83,8 +82,7 @@ class ImportedElementInliner extends Transformer {
*/
Future _collectPolymerElements(AssetId id, Transform transform,
Set<AssetId> seen, List elements) {
- return transform.readInputAsString(id).then((content) {
- var document = parseHtml(content, id.path, transform.logger);
+ return readAsHtml(id, transform).then((document) {
return _visitImports(document, id, transform, seen, elements).then((_) {
var normalizer = new _UrlNormalizer(transform, id);
for (var element in document.queryAll('polymer-element')) {

Powered by Google App Engine
This is Rietveld 408576698