fix: properly handle do in alternative bolcks

tree-sitter-grammars · May 19, 2024 · a195747 · a195747
1 parent f25b8c5
commit a195747
Show file tree

Hide file tree

Showing 6 changed files with 283,482 additions and 282,915 deletions.
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
diff --git a/grammar.js b/grammar.js
@@ -371,7 +371,10 @@ module.exports = grammar({
       )),
       optional($.tag),
       field('condition', $.expression),
-      field('consequence', choice($.block, seq('do', $.statement))),
+      choice(
+        field('consequence', $.block),
+        seq('do', field('consequence', $.statement)),
+      ),
       repeat($.else_if_clause),
       optional($.else_clause),
     )),
@@ -384,12 +387,18 @@ module.exports = grammar({
         ';',
       )),
       field('condition', $.expression),
-      field('consequence', choice($.block)),
+      choice(
+        field('consequence', $.block),
+        seq('do', field('consequence', $.statement)),
+      ),
     ),
 
     else_clause: $ => seq(
       'else',
-      field('consequence', $.block),
+      choice(
+        field('consequence', $.block),
+        seq('do', field('consequence', $.statement)),
+      ),
     ),
 
     when_statement: $ => prec.right(seq(

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