fix: binary expressions to allow nesting

Fixes #41
dlvandenberg · Aug 28, 2024 · dd7874a · dd7874a
1 parent c2d1f6d
commit dd7874a
Show file tree

Hide file tree

Showing 12 changed files with 10,056 additions and 7,695 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-angular"
 description = "Angular grammar for tree-sitter"
-version = "0.4.2"
+version = "0.4.3"
 keywords = ["incremental", "parsing", "angular"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-angular"

diff --git a/grammar.js b/grammar.js
@@ -395,10 +395,13 @@ module.exports = grammar(HTML, {
 
     // Binary expression
     binary_expression: ($) =>
-      seq(
-        field('left', $._primitive),
-        field('operator', $._binary_op),
-        field('right', $._primitive),
+      prec.left(
+        PREC.CALL,
+        seq(
+          field('left', $.expression),
+          field('operator', $._binary_op),
+          field('right', choice($.binary_expression, $.expression)),
+        ),
       ),
 
     // Ternary expression
@@ -470,7 +473,7 @@ module.exports = grammar(HTML, {
       seq(
         field('key', choice($.identifier, $.string)),
         ':',
-        field('value', choice($.expression, $.unary_expression)),
+        field('value', $._any_expression),
         optional(','),
       ),
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-angular",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Tree-sitter grammar for the Angular framework",
   "main": "bindings/node",
   "types": "bindings/node",

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json