@willbooster/tree-sitter-ruby 3.0.4 → 3.0.6

package/grammar.js

@@ -86,6 +86,7 @@ module.exports = grammar({
     $._block_comment,
     $._uninterpreted,
     $._not_parenthesized,
+    $._lambda_brace,
   ],
 
   extras: ($) => [$.comment, $.heredoc_body, /\s/, /\\\r?\n/],
@@ -1206,10 +1207,20 @@ module.exports = grammar({
         PREC.CURLY_BLOCK,
         prec.dynamic(
           2,
-          seq('{', field('parameters', optional($.block_parameters)), optional(field('body', $.block_body)), '}')
+          seq(
+            $._block_open,
+            field('parameters', optional($.block_parameters)),
+            optional(field('body', $.block_body)),
+            '}'
+          )
         )
       ),
 
+    // Where both a block and a hash argument can start (`foo {`, `x.y {`), the `{` would otherwise be shared until a
+    // later conflict picks the hash. Reducing the brace on its own forces the choice right after it, and the precedence
+    // makes it a block, as in Ruby.
+    _block_open: () => prec(PREC.CURLY_BLOCK, '{'),
+
     _arg_rhs: ($) => choice($._arg, alias($.rescue_modifier_arg, $.rescue_modifier)),
 
     _ordinary_rhs_expression: ($) => prec(PREC.ASSIGN, $._arg_rhs),
@@ -1666,7 +1677,18 @@ module.exports = grammar({
             )
           )
         ),
-        field('body', choice($.block, $.do_block))
+        field('body', choice(alias($._lambda_block, $.block), $.do_block))
+      ),
+
+    // As with parse.y's tLAMBEG, the scanner emits this `{` where a lambda body can start, so that it opens the body
+    // after bare parameters even where a parameter default could take a block or start a hash (`-> a=b() { }`,
+    // `-> x: { }`).
+    _lambda_block: ($) =>
+      seq(
+        alias($._lambda_brace, '{'),
+        field('parameters', optional($.block_parameters)),
+        optional(field('body', $.block_body)),
+        '}'
       ),
 
     _parenthesized_lambda_parameters: ($) =>

package/package.json

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

package/tree-sitter.json

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