@willbooster/tree-sitter-ruby 6.0.0 → 6.0.2

package/README.md

@@ -117,10 +117,7 @@ Profiles in `.tmp/generation-profiles/` are temporary and must not be committed.
   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`
   rewrites it; review its diff before committing;
-- a performance check (`test/unit/performance.test.ts`) that recovering from an error on each line takes linear time
-  (ten times the lines take about ten times the CPU time, under a ceiling), since consumers parse files while they are
-  being edited. It loads the Wasm build through @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after
-  regenerating the parser;
+- bounded CPU-growth checks for error recovery and comment chains (`test/unit/performance.test.ts`);
 - a check that `package.json` and `Cargo.lock` test the same runtime version (`test/unit/runtimeVersion.test.ts`);
 - checks that the Wasm build parses in Chromium (`test/unit/browser/`) and in Cloudflare Workers with and without
   Node.js compatibility (`test/unit/workerd.test.ts`). Run `bun run test/ci-setup` once to install Chromium.

package/grammar.js

@@ -45,7 +45,7 @@ const ALPHA_CHAR = /[^\x00-\x1F\s0-9:;`"'@$#.,|^&<=>+\-*/\\%?!~()\[\]{}]/;
 // oxlint-disable-next-line unicorn/prefer-module -- This package is CommonJS, so tree-sitter loads grammar.js as CommonJS.
 module.exports = grammar({
   name: 'ruby',
-  inline: ($) => [$._arg_rhs, $._call_operator],
+  inline: ($) => [$._arg_rhs, $._call_operator, $._body_statement],
   externals: ($) => [
     $._line_break,
     $._no_line_break,
@@ -91,6 +91,8 @@ module.exports = grammar({
     $._not_parenthesized,
     $._lambda_brace,
     $._heredoc_resume,
+    $._body_comment,
+    $._body_line_break,
   ],
 
   extras: ($) => [$.comment, $.heredoc_body, $._heredoc_resume, /\s/, /\\\r?\n/],
@@ -349,7 +351,7 @@ module.exports = grammar({
       seq(
         'class',
         field('name', choice($.constant, $.scope_resolution)),
-        choice(seq(field('superclass', $.superclass), $._terminator), optional($._terminator)),
+        choice(seq(field('superclass', $.superclass), $._body_separator), optional($._terminator)),
         optional(field('body', $.body_statement)),
         'end'
       ),
@@ -361,7 +363,7 @@ module.exports = grammar({
         'class',
         alias($._singleton_class_left_angle_left_langle, '<<'),
         field('value', $._arg),
-        $._terminator,
+        $._body_separator,
         optional(field('body', $.body_statement)),
         'end'
       ),
@@ -650,7 +652,9 @@ module.exports = grammar({
 
     exception_variable: ($) => seq('=>', $._lhs),
 
-    body_statement: ($) => $._body_statement,
+    body_statement: ($) => choice(seq($._body_comments, optional($._body_statement)), $._body_statement),
+
+    _body_comments: ($) => repeat1(alias($._body_comment, $.comment)),
 
     _body_statement: ($) =>
       choice(
@@ -1206,7 +1210,7 @@ module.exports = grammar({
       seq(
         'do',
         optional($._terminator),
-        optional(seq(field('parameters', $.block_parameters), optional($._terminator))),
+        optional(seq(optional($._body_comments), field('parameters', $.block_parameters), optional($._terminator))),
         optional(field('body', $.body_statement)),
         'end'
       ),
@@ -1706,6 +1710,8 @@ module.exports = grammar({
 
     empty_statement: () => prec(-1, ';'),
 
+    _body_separator: ($) => choice(prec.dynamic(1, $._body_line_break), ';'),
+
     _terminator: ($) => choice(prec.dynamic(1, $._line_break), ';'),
   },
 });
@@ -2115,7 +2121,7 @@ function methodRest($, bodyExpression) {
       ),
       seq(
         optional(field('parameters', alias($.bare_parameters, $.method_parameters))),
-        $._terminator,
+        $._body_separator,
         optional(field('body', $.body_statement)),
         'end'
       )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-ruby",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Ruby grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -1215,6 +1215,10 @@
           "type": "_statement",
           "named": true
         },
+        {
+          "type": "comment",
+          "named": true
+        },
         {
           "type": "else",
           "named": true
@@ -1668,6 +1672,16 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "comment",
+          "named": true
+        }
+      ]
     }
   },
   {

package/tree-sitter.json

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