Update to --abi=14

* Add HEEx language injection for `~H` sigils

* Update queries/injections.scm

Co-authored-by: Jonatan Kłosko <jonatanklosko@gmail.com>

Cargo.toml

@@ -20,7 +20,7 @@ include = [
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "0.20"
+tree-sitter = ">= 0.19, < 0.21"
 
 [build-dependencies]
 cc = "1.0"

grammar.js

@@ -159,16 +159,6 @@ module.exports = grammar({
     //   * stab arguments item in `arg1, left when right ->`
     [$.binary_operator, $._stab_clause_arguments_without_parentheses],
 
-    // Given `( -> • \n`, the newline could be either:
-    //   * stab clause without a body
-    //   * stab clause with a body
-    [$._stab_clause_without_body, $._stab_clause_with_body],
-
-    // Given `( -> • /`, `/` token could be either:
-    //   * stab clause with a body
-    //   * -> as an operator followed by `/`
-    [$._stab_clause_with_body, $.operator_identifier],
-
     // Given `((arg1, arg2 • ,`, `arg3` expression can be either:
     //   * stab parenthesised arguments item in `((arg1, arg2, arg3) ->)`
     //   * stab non-parenthesised arguments item in `((arg1, arg2, arg3 ->))`
@@ -739,20 +729,13 @@ module.exports = grammar({
       ),
 
     stab_clause: ($) =>
-      choice($._stab_clause_with_body, $._stab_clause_without_body),
+      // Right precedence, because we want to consume body if any
-
+      prec.right(
-    _stab_clause_with_body: ($) =>
         seq(
           optional(field("left", $._stab_clause_left)),
           field("operator", "->"),
-        field("right", $.body)
+          optional(field("right", $.body))
-      ),
+        )
-
-    _stab_clause_without_body: ($) =>
-      seq(
-        optional(field("left", $._stab_clause_left)),
-        field("operator", "->"),
-        optional($._terminator)
       ),
 
     _stab_clause_left: ($) =>
@@ -834,10 +817,13 @@ module.exports = grammar({
       ),
 
     body: ($) =>
+      choice(
+        $._terminator,
         seq(
           optional($._terminator),
           sep1($._expression, $._terminator),
           optional($._terminator)
+        )
       ),
 
     anonymous_function: ($) =>

queries/injections.scm

@@ -0,0 +1,7 @@
+; Phoenix HTML template
+((sigil
+  (sigil_name) @_sigil_name
+  (quoted_content) @injection.content)
+ (#eq @_sigil_name "H")
+ (#set! injection.language "heex")
+ (#set! injection.combined))

src/grammar.json

@@ -6452,6 +6452,13 @@
       }
     },
     "body": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_terminator"
+        },
+        {
           "type": "SEQ",
           "members": [
             {
@@ -6504,6 +6511,8 @@
               ]
             }
           ]
+        }
+      ]
     },
     "anonymous_function": {
       "type": "SEQ",

src/node-types.json

@@ -1082,7 +1082,7 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "access_call",

test/corpus/do_end.txt

@@ -684,12 +684,11 @@ end
           (integer))))))
 
 =====================================
-stab clause / edge cases / empty right-hand-sides
+stab clause / edge cases / empty right-hand-side
 =====================================
 
 fun do
   x ->
-  y ->
 end
 
 ---
@@ -700,10 +699,8 @@ end
     (do_block
       (stab_clause
         (arguments
-          (identifier)))
+          (identifier))
-      (stab_clause
+        (body)))))
-        (arguments
-          (identifier))))))
 
 =====================================
 pattern matching