@willbooster/tree-sitter-ruby 2.0.3 → 2.0.5

package/README.md

@@ -5,14 +5,14 @@
 [![Test](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.36.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.41.8-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-ruby.svg)](https://crates.io/crates/willbooster-tree-sitter-ruby)
 
 Ruby grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
 [tree-sitter/tree-sitter-ruby](https://github.com/tree-sitter/tree-sitter-ruby). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork ships upstream's grammar with a parser generated by
+This fork extends the upstream grammar to parse anonymous block forwarding, spaced block arguments, and command calls in endless methods, with a parser generated by
 [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter), whose compact parse tables make the
 parser smaller. The parser carries that fork's own ABI number (`0x57420001`), so it loads only with the WillBooster
 runtime; upstream's tree-sitter runtime rejects it. Use runtime 2.0.18 or later so contiguous included ranges do not terminate comments.

package/grammar.js

@@ -69,6 +69,7 @@ module.exports = grammar({
     $._unary_minus_num,
     $._binary_minus,
     $._binary_star,
+    $._bitwise_and,
     $._singleton_class_left_angle_left_langle,
     $.hash_key_symbol,
     $._identifier_suffix,
@@ -167,6 +168,44 @@ module.exports = grammar({
 
     _body_expr: ($) => seq('=', field('body', choice($._arg, alias($.rescue_modifier_arg, $.rescue_modifier)))),
 
+    _command_method: ($) => seq('def', $._command_method_rest),
+
+    _command_singleton_method: ($) =>
+      seq(
+        'def',
+        seq(choice(field('object', $._variable), seq('(', field('object', $._arg), ')')), choice('.', '::')),
+        $._command_method_rest
+      ),
+
+    _command_method_rest: ($) =>
+      seq(
+        field('name', $._method_name),
+        optional(field('parameters', alias($.parameters, $.method_parameters))),
+        '=',
+        field('body', $._endless_command)
+      ),
+
+    // Ruby 4.0's default parser (Prism) lets an endless body hold at most one `rescue`, applied outside any `not`; a
+    // further `rescue` applies to the whole definition.
+    _endless_command: ($) => choice($._endless_command_operand, alias($._endless_command_rescue, $.rescue_modifier)),
+
+    _endless_command_operand: ($) =>
+      choice(
+        alias($.command_call, $.call),
+        alias($.command_call_with_block, $.call),
+        prec.left(alias($._chained_command_call, $.call)),
+        alias($.return_command, $.return),
+        alias($.yield_command, $.yield),
+        alias($._endless_command_not, $.unary),
+        alias($._command_method, $.method),
+        alias($._command_singleton_method, $.singleton_method)
+      ),
+
+    _endless_command_not: ($) => prec.right(PREC.NOT, seq(field('operator', 'not'), field('operand', $._expression))),
+
+    _endless_command_rescue: ($) =>
+      prec(PREC.RESCUE, seq(field('body', $._endless_command_operand), 'rescue', field('handler', $._arg))),
+
     parameters: ($) => seq('(', commaSep($._formal_parameter), ')'),
 
     bare_parameters: ($) => seq($._simple_formal_parameter, repeat(seq(',', $._formal_parameter))),
@@ -536,6 +575,8 @@ module.exports = grammar({
     // This naming convention is based on Ruby's standard grammar.
     _expression: ($) =>
       choice(
+        alias($._command_method, $.method),
+        alias($._command_singleton_method, $.singleton_method),
         alias($.command_binary, $.binary),
         alias($.command_unary, $.unary),
         alias($.command_assignment, $.assignment),
@@ -792,7 +833,7 @@ module.exports = grammar({
         [prec.left, PREC.BOOLEAN_AND, '&&'],
         [prec.left, PREC.SHIFT, choice('<<', '>>')],
         [prec.left, PREC.COMPARISON, choice('<', '<=', '>', '>=')],
-        [prec.left, PREC.BITWISE_AND, '&'],
+        [prec.left, PREC.BITWISE_AND, alias($._bitwise_and, '&')],
         [prec.left, PREC.BITWISE_OR, choice('^', '|')],
         [prec.left, PREC.ADDITIVE, choice('+', alias($._binary_minus, '-'))],
         [prec.left, PREC.MULTIPLICATIVE, choice('/', '%', alias($._binary_star, '*'))],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-ruby",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Ruby grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -46,21 +46,20 @@
     "@vitest/browser-playwright": "5.0.3",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.24.0",
-    "@willbooster/web-tree-sitter": "2.0.18",
-    "conventional-changelog-conventionalcommits": "10.4.0",
-    "lefthook": "2.1.16",
-    "oxfmt": "0.71.0",
-    "oxlint": "1.86.0",
-    "oxlint-tsgolint": "7.0.2003",
-    "playwright": "1.63.0",
+    "@willbooster/wb": "22.26.1",
+    "@willbooster/web-tree-sitter": "2.0.27",
+    "conventional-changelog-conventionalcommits": "10.4.1",
+    "lefthook": "2.2.1",
+    "oxfmt": "0.72.0",
+    "oxlint": "1.87.0",
+    "oxlint-tsgolint": "7.0.2004",
+    "playwright": "1.64.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "tree-sitter-cli": "0.27.0",
-    "typescript": "7.0.2",
-    "vite": "8.3.2",
+    "tree-sitter-cli": "0.27.1",
+    "vite": "8.3.4",
     "vitest": "5.0.3",
-    "wrangler": "4.147.0"
+    "wrangler": "4.149.0"
   },
   "peerDependencies": {
     "@willbooster/web-tree-sitter": "^2.0.18"

package/src/node-types.json

@@ -61,6 +61,10 @@
         "type": "match_pattern",
         "named": true
       },
+      {
+        "type": "method",
+        "named": true
+      },
       {
         "type": "next",
         "named": true
@@ -73,6 +77,10 @@
         "type": "return",
         "named": true
       },
+      {
+        "type": "singleton_method",
+        "named": true
+      },
       {
         "type": "test_pattern",
         "named": true
@@ -2399,9 +2407,29 @@
             "type": "body_statement",
             "named": true
           },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "method",
+            "named": true
+          },
           {
             "type": "rescue_modifier",
             "named": true
+          },
+          {
+            "type": "return",
+            "named": true
+          },
+          {
+            "type": "singleton_method",
+            "named": true
+          },
+          {
+            "type": "yield",
+            "named": true
           }
         ]
       },
@@ -3073,9 +3101,29 @@
             "type": "body_statement",
             "named": true
           },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "method",
+            "named": true
+          },
           {
             "type": "rescue_modifier",
             "named": true
+          },
+          {
+            "type": "return",
+            "named": true
+          },
+          {
+            "type": "singleton_method",
+            "named": true
+          },
+          {
+            "type": "yield",
+            "named": true
           }
         ]
       },

package/tree-sitter.json

@@ -19,7 +19,7 @@
     }
   ],
   "metadata": {
-    "version": "2.0.3",
+    "version": "2.0.5",
     "license": "MIT",
     "description": "Ruby grammar for tree-sitter",
     "authors": [