Merge pull request #15 from elianiva/fix/whitespace

fix: don't capture whitespace as text node
Himujjal · Jul 14, 2021 · d8c7ef9 · d8c7ef9
2 parents 10c1130 + a23065e
commit d8c7ef9
Show file tree

Hide file tree

Showing 4 changed files with 1,721 additions and 1,706 deletions.
diff --git a/grammar.js b/grammar.js
@@ -114,7 +114,7 @@ module.exports = grammar({
         seq('"', optional(alias(/[^"]+/, $.attribute_value)), '"')
       ),
 
-    _text: ($) => choice(alias(/[^<>{}]+/, $.text), $._expression),
+    _text: ($) => choice(alias(/[^<>\s]([^<>]*[^<>\s])?/, $.text), $._expression),
 
     _expression: ($) =>
       choice($.expression, $.html_expr, alias("{}", $.expression)),

diff --git a/src/grammar.json b/src/grammar.json
@@ -452,7 +452,7 @@
           "type": "ALIAS",
           "content": {
             "type": "PATTERN",
-            "value": "[^<>{}]+"
+            "value": "[^<>\\s]([^<>]*[^<>\\s])?"
           },
           "named": true,
           "value": "text"