@willbooster/tree-sitter-ruby 2.0.2 → 2.0.4

package/README.md

@@ -12,10 +12,11 @@ Ruby grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), fork
 [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 and spaced block arguments, 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, version 2.0.0 or later; upstream's tree-sitter runtime rejects it. The scanner preserves long heredoc identifiers
+runtime; upstream's tree-sitter runtime rejects it. Use runtime 2.0.18 or later so contiguous included ranges do not terminate comments.
+The scanner preserves long heredoc identifiers
 when their state fits the runtime's serialization buffer. If the open heredocs cannot fit, their bodies are parsed as
 code instead of aborting the process.
 
@@ -23,7 +24,7 @@ code instead of aborting the process.
 
 The npm package ships `tree-sitter-ruby.wasm` for
 [@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter), which runs in Node.js, Bun,
-browsers, and Cloudflare Workers. The parser requires runtime 2.0.0 or later.
+browsers, and Cloudflare Workers. The parser requires runtime 2.0.18 or later.
 
 In Node.js and Bun, load the grammar from its path:
 
@@ -66,11 +67,11 @@ The package also ships the queries in `queries/` and the node types in `src/node
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-ruby) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
-fuzzed with. The parser requires runtime 2.0.0 or later:
+fuzzed with. The parser requires runtime 2.0.18 or later:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.18" }
 tree-sitter-ruby = { package = "willbooster-tree-sitter-ruby", version = "2" }
 ```
 
@@ -109,6 +110,8 @@ Profiles in `.tmp/generation-profiles/` are temporary and must not be committed.
 - an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
   edits each corpus case at random, reparses it, undoes the edits, and reparses again. `TREE_SITTER_SEED`,
   `TREE_SITTER_ITERATIONS`, and `TREE_SITTER_EDITS` run other or more edits;
+- included-range comment and incremental-edit checks (`test/unit/includedRanges.test.ts`), which load the Wasm build
+  produced by `bun run build/ci`;
 - a check that the real-world Ruby files of [ruby/spec](https://github.com/ruby/spec) cloned into `examples/` fail to
   parse exactly as listed in `script/known-failures.txt`. The first run clones the repository, which is pinned to a
   commit in `script/parse-examples`. After a grammar change or a moved pin alters that list, `script/parse-examples`

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,
@@ -77,6 +78,8 @@ module.exports = grammar({
     $._binary_star_star,
     $._element_reference_bracket,
     $._short_interpolation,
+    $._line_comment,
+    $._uninterpreted,
   ],
 
   extras: ($) => [$.comment, $.heredoc_body, /\s/, /\\\r?\n/],
@@ -103,7 +106,8 @@ module.exports = grammar({
   rules: {
     program: ($) => seq(optional($._statements), optional(choice(seq(/__END__/, $.uninterpreted)))),
 
-    uninterpreted: () => /(.|\s)*/,
+    // External extras must yield to the internal lexer after __END__.
+    uninterpreted: ($) => choice(/(.|\s)*/, $._uninterpreted),
 
     block_body: ($) => $._statements,
 
@@ -789,7 +793,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, '*'))],
@@ -930,13 +934,16 @@ module.exports = grammar({
     undef: ($) => seq('undef', commaSep1($._method_name)),
     alias: ($) => seq('alias', field('name', $._method_name), field('alias', $._method_name)),
 
-    comment: () =>
-      token(
-        prec(
-          PREC.COMMENT,
-          choice(
-            seq('#', /.*/),
-            seq(/=begin.*\r?\n/, repeat(choice(/[^=]/, /=[^e]/, /=e[^n]/, /=en[^d]/)), /[\s*]*=end.*/)
+    comment: ($) =>
+      choice(
+        $._line_comment,
+        token(
+          prec(
+            PREC.COMMENT,
+            choice(
+              seq('#', /.*/),
+              seq(/=begin.*\r?\n/, repeat(choice(/[^=]/, /=[^e]/, /=e[^n]/, /=en[^d]/)), /[\s*]*=end.*/)
+            )
           )
         )
       ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-ruby",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Ruby grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -46,24 +46,24 @@
     "@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.1",
-    "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.24",
+    "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",
+    "tree-sitter-cli": "0.27.1",
     "typescript": "7.0.2",
-    "vite": "8.3.2",
+    "vite": "8.3.4",
     "vitest": "5.0.3",
-    "wrangler": "4.147.0"
+    "wrangler": "4.149.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^2.0.0"
+    "@willbooster/web-tree-sitter": "^2.0.18"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/src/node-types.json

@@ -1414,6 +1414,12 @@
       }
     }
   },
+  {
+    "type": "comment",
+    "named": true,
+    "extra": true,
+    "fields": {}
+  },
   {
     "type": "complex",
     "named": true,
@@ -3345,6 +3351,11 @@
       ]
     }
   },
+  {
+    "type": "uninterpreted",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "unless",
     "named": true,
@@ -3868,11 +3879,6 @@
     "type": "class_variable",
     "named": true
   },
-  {
-    "type": "comment",
-    "named": true,
-    "extra": true
-  },
   {
     "type": "def",
     "named": false
@@ -4037,10 +4043,6 @@
     "type": "undef",
     "named": false
   },
-  {
-    "type": "uninterpreted",
-    "named": true
-  },
   {
     "type": "unless",
     "named": false

package/tree-sitter.json

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