fix(#52): Fix raw text sequences (#54)

Author: dlvandenberg

.github/workflows/publish.yml

@@ -12,7 +12,11 @@ jobs:
     uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
     secrets:
       NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+    with:
+      generate: true
   crates:
     uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
     secrets:
       CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_TOKEN}}
+    with:
+      generate: true

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-angular"
 description = "Angular grammar for tree-sitter"
-version = "0.5.2"
+version = "0.5.3"
 keywords = ["incremental", "parsing", "angular"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-angular"

grammar.js

@@ -36,7 +36,7 @@ module.exports = grammar(HTML, {
 
     // ---------- Overrides ----------
     attribute_name: (_) => /[^<>\*.\[\]\(\)"'=\s]+/,
-    text: (_) => /[^<>{}&\s]([^<>{}&]*[^<>{}&\s])?/,
+    text: (_) => /[^<>@{}&\s]([^<>@{}&]*[^<>@{}&\s])?/,
 
     // ----------- Statement block --------
     statement_block: ($) => prec.right(seq('{', repeat($._node), '}')),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-angular",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Tree-sitter grammar for the Angular framework",
   "main": "bindings/node",
   "types": "bindings/node",

src/grammar.json

@@ -0,0 +1,111 @@
+============
+Regular HTML
+============
+
+<div>
+  <h1>Title</h1>
+  <span>Some subtext</span>
+</div>
+
+---
+
+(document
+  (element
+    (start_tag
+      (tag_name))
+    (element
+      (start_tag
+        (tag_name))
+      (text)
+      (end_tag
+        (tag_name)))
+    (element
+      (start_tag
+        (tag_name))
+      (text)
+      (end_tag
+        (tag_name)))
+    (end_tag
+      (tag_name))))
+
+
+=======================
+Text without tag - HTML
+=======================
+
+<div>
+  Random Text
+  <span>Some subtext</span>
+</div>
+
+---
+
+(document
+  (element
+    (start_tag
+      (tag_name))
+    (text)
+    (element
+      (start_tag
+        (tag_name))
+      (text)
+      (end_tag
+        (tag_name)))
+    (end_tag
+      (tag_name))))
+
+===============================
+Text without tag - Control Flow
+===============================
+
+<div>
+  Random Text
+  @if (condition) {
+    <span>Conditional text</span>
+  }
+</div>
+
+---
+
+(document
+  (element
+    (start_tag
+      (tag_name))
+    (text)
+    (if_statement
+        (control_keyword)
+        condition: (if_condition
+          (expression
+              (identifier)))
+        consequence: (statement_block
+          (element
+            (start_tag
+              (tag_name))
+            (text)
+            (end_tag
+              (tag_name)))))
+    (end_tag
+      (tag_name))))
+
+================================
+Text without tag - Interpolation
+================================
+
+<div>
+  Random Text
+  {{ property }}
+</div>
+
+---
+
+(document
+  (element
+    (start_tag
+      (tag_name))
+    (text)
+    (interpolation
+      (expression
+        (identifier)))
+    (end_tag
+      (tag_name))))
+

src/parser.c

@@ -9,7 +9,7 @@
     }
   ],
   "metadata": {
-    "version": "0.5.2",
+    "version": "0.5.3",
     "license": "MIT",
     "description": "Tree-sitter grammar for the Angular framework",
     "authors": [