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

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
« no previous file with comments | « pkg/polymer/lib/src/transform/common.dart ('k') | pkg/polymer/lib/src/transform/polyfill_injector.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bc2671e2f48d13c62b4a1095b3d48243efde30ac..889ce209706548fa0657291ffc1f93c79ce3cfa3 100644
--- a/pkg/polymer/lib/src/transform/import_inliner.dart
+++ b/pkg/polymer/lib/src/transform/import_inliner.dart
@@ -18,19 +18,19 @@ import 'common.dart';
// than polymer-element (see dartbug.com/12613).
class ImportedElementInliner extends Transformer {
/** Only run on entry point .html files. */
- Future<bool> isPrimary(Asset input) => isPrimaryHtml(input.id);
+ Future<bool> isPrimary(Asset input) =>
+ new Future.value(isPrimaryHtml(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);
+ 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;
}
@@ -82,9 +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,
- checkDocType: false);
+ 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')) {
« no previous file with comments | « pkg/polymer/lib/src/transform/common.dart ('k') | pkg/polymer/lib/src/transform/polyfill_injector.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698