skip comments in free text

jael/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.4
+* Skip HTML comments in free text.
+
 # 1.0.3
 * Fix a scanner bug that prevented proper parsing of HTML nodes
 followed by free text.

jael/lib/src/text/scanner.dart

@@ -20,13 +20,15 @@ abstract class Scanner {
   List<Token> get tokens;
 }
 
+final RegExp _htmlComment = new RegExp(r'<!--[^$]*-->');
+
 final Map<Pattern, TokenType> _expressionPatterns = {
 //final Map<Pattern, TokenType> _htmlPatterns = {
   '{{': TokenType.doubleCurlyL,
   '{{-': TokenType.doubleCurlyL,
 
   //
-  new RegExp(r'<!--[^$]*-->'): TokenType.htmlComment,
+  _htmlComment: TokenType.htmlComment,
   '!DOCTYPE': TokenType.doctype,
   '!doctype': TokenType.doctype,
   '<': TokenType.lt,
@@ -99,6 +101,9 @@ class _Scanner implements Scanner {
         var start = _scanner.state, end = start;
 
         while (!_scanner.isDone) {
+          // Skip through comments
+          if (_scanner.scan(_htmlComment)) continue;
+
           // Break on {{
           if (_scanner.matches('{{')) {
             state = _ScannerState.html;

jael/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael
-version: 1.0.3
+version: 1.0.4
 description:  A simple server-side HTML templating engine for Dart.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/jael/tree/master/jael