@@ -1,2 +1,2 @@
-Thu Mar 24 20:48:44 UTC 2016
-aa966f5de2efbaa9b1dc55836b0006315f010576
+Thu Mar 24 20:52:26 UTC 2016
+d272f96e23f379e1b565435b3af010138e710ab9
@@ -32,7 +32,10 @@ class HtmlElementAst implements HtmlAst {
   List<HtmlAttrAst> attrs;
   List<HtmlAst> children;
   ParseSourceSpan sourceSpan;
-  HtmlElementAst(this.name, this.attrs, this.children, this.sourceSpan) {}
+  ParseSourceSpan startSourceSpan;
+  ParseSourceSpan endSourceSpan;
+  HtmlElementAst(this.name, this.attrs, this.children, this.sourceSpan,
+      this.startSourceSpan, this.endSourceSpan) {}
   dynamic visit(HtmlAstVisitor visitor, dynamic context) {
     return visitor.visitElement(this, context);
   }
 
@@ -162,11 +162,12 @@ class TreeBuilder {
       selfClosing = false;
     }
     var end = this.peek.sourceSpan.start;
-    var el = new HtmlElementAst(fullName, attrs, [],
-        new ParseSourceSpan(startTagToken.sourceSpan.start, end));
+    var span = new ParseSourceSpan(startTagToken.sourceSpan.start, end);
+    var el = new HtmlElementAst(fullName, attrs, [], span, span, null);
     this._pushElement(el);
     if (selfClosing) {
       this._popElement(fullName);
+      el.endSourceSpan = span;
     }
   }
 
@@ -180,8 +181,8 @@ class TreeBuilder {
     var tagDef = getHtmlTagDefinition(el.name);
     var parentEl = this._getParentElement();
     if (tagDef.requireExtraParent(isPresent(parentEl) ? parentEl.name : null)) {
-      var newParent =
-          new HtmlElementAst(tagDef.parentToAdd, [], [el], el.sourceSpan);
+      var newParent = new HtmlElementAst(tagDef.parentToAdd, [], [el],
+          el.sourceSpan, el.startSourceSpan, el.endSourceSpan);
       this._addToParent(newParent);
       this.elementStack.add(newParent);
       this.elementStack.add(el);
@@ -194,6 +195,7 @@ class TreeBuilder {
   _consumeEndTag(HtmlToken endTagToken) {
     var fullName = getElementFullName(
         endTagToken.parts[0], endTagToken.parts[1], this._getParentElement());
+    this._getParentElement().endSourceSpan = endTagToken.sourceSpan;
     if (getHtmlTagDefinition(fullName).isVoid) {
       this.errors.add(HtmlTreeError.create(fullName, endTagToken.sourceSpan,
           '''Void elements do not have end tags "${ endTagToken . parts [ 1 ]}"'''));
 
@@ -51,7 +51,8 @@ class LegacyHtmlAstTransformer implements HtmlAstVisitor {
     var attrs = ast.attrs.map((attr) => attr.visit(this, null)).toList();
     var children =
         ast.children.map((child) => child.visit(this, null)).toList();
-    return new HtmlElementAst(ast.name, attrs, children, ast.sourceSpan);
+    return new HtmlElementAst(ast.name, attrs, children, ast.sourceSpan,
+        ast.startSourceSpan, ast.endSourceSpan);
   }
 
   HtmlAttrAst visitAttr(HtmlAttrAst originalAst, dynamic context) {
 
@@ -64,6 +64,12 @@ class ParseException extends BaseException {
   }
 }
 
+class SplitInterpolation {
+  List<String> strings;
+  List<String> expressions;
+  SplitInterpolation(this.strings, this.expressions) {}
+}
+
 @Injectable()
 class Parser {
   Lexer _lexer;
@@ -128,6 +134,20 @@ class Parser {
   }
 
   ASTWithSource parseInterpolation(String input, dynamic location) {
+    var split = this.splitInterpolation(input, location);
+    if (split == null) return null;
+    var expressions = [];
+    for (var i = 0; i < split.expressions.length; ++i) {
+      var tokens = this._lexer.tokenize(split.expressions[i]);
+      var ast = new _ParseAST(input, location, tokens, this._reflector, false)
+          .parseChain();
+      expressions.add(ast);
+    }
+    return new ASTWithSource(
+        new Interpolation(split.strings, expressions), input, location);
+  }
+
+  SplitInterpolation splitInterpolation(String input, String location) {
     var parts = StringWrapper.split(input, INTERPOLATION_REGEXP);
     if (parts.length <= 1) {
       return null;
@@ -140,10 +160,7 @@ class Parser {
         // fixed string
         strings.add(part);
       } else if (part.trim().length > 0) {
-        var tokens = this._lexer.tokenize(part);
-        var ast = new _ParseAST(input, location, tokens, this._reflector, false)
-            .parseChain();
-        expressions.add(ast);
+        expressions.add(part);
       } else {
         throw new ParseException(
             "Blank expressions are not allowed in interpolated strings",
@@ -152,8 +169,7 @@ class Parser {
             location);
       }
     }
-    return new ASTWithSource(
-        new Interpolation(strings, expressions), input, location);
+    return new SplitInterpolation(strings, expressions);
   }
 
   ASTWithSource wrapLiteralPrimitive(String input, dynamic location) {
 
@@ -242,6 +242,14 @@ class ListWrapper {
   static bool isImmutable(List l) {
     return l is UnmodifiableListView;
   }
+
+  static List flatten(List l) {
+    final res = [];
+    l.forEach((item) {
+      res.addAll(item);
+    });
+    return res;
+  }
 }
 
 bool isListLikeIterable(obj) => obj is Iterable;
 
@@ -215,6 +215,20 @@ class RegExpWrapper {
   static Iterator<Match> matcher(RegExp regExp, String input) {
     return regExp.allMatches(input).iterator;
   }
+
+  static String replaceAll(RegExp regExp, String input, Function replace) {
+    final m = RegExpWrapper.matcher(regExp, input);
+    var res = "";
+    var prev = 0;
+    while (m.moveNext()) {
+      var c = m.current;
+      res += input.substring(prev, c.start);
+      res += replace(c);
+      prev = c.start + c[0].length;
+    }
+    res += input.substring(prev);
+    return res;
+  }
 }
 
 class RegExpMatcherWrapper {
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ class LegacyHtmlAstTransformer implements HtmlAstVisitor {`
`51`	`51`	`var attrs = ast.attrs.map((attr) => attr.visit(this, null)).toList();`
`52`	`52`	`var children =`
`53`	`53`	`ast.children.map((child) => child.visit(this, null)).toList();`
`54`		`- return new HtmlElementAst(ast.name, attrs, children, ast.sourceSpan);`
	`54`	`+ return new HtmlElementAst(ast.name, attrs, children, ast.sourceSpan,`
	`55`	`+ ast.startSourceSpan, ast.endSourceSpan);`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`HtmlAttrAst visitAttr(HtmlAttrAst originalAst, dynamic context) {`
Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,14 @@ class ListWrapper {`
`242`	`242`	`static bool isImmutable(List l) {`
`243`	`243`	`return l is UnmodifiableListView;`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+ static List flatten(List l) {`
	`247`	`+ final res = [];`
	`248`	`+ l.forEach((item) {`
	`249`	`+ res.addAll(item);`
	`250`	`+ });`
	`251`	`+ return res;`
	`252`	`+ }`
`245`	`253`	`}`
`246`	`254`
`247`	`255`	`bool isListLikeIterable(obj) => obj is Iterable;`