@willbooster/tree-sitter-ruby 2.0.4 → 2.0.6

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 extends the upstream grammar to parse anonymous block forwarding and spaced block arguments, 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

@@ -65,6 +65,8 @@ module.exports = grammar({
     '/',
     $._block_ampersand,
     $._splat_star,
+    $._unary_plus,
+    $._binary_plus,
     $._unary_minus,
     $._unary_minus_num,
     $._binary_minus,
@@ -86,6 +88,11 @@ module.exports = grammar({
 
   word: ($) => $.identifier,
 
+  conflicts: ($) => [
+    [$._chained_primary, $._chained_lhs],
+    [$._array_pattern_n, $.as_pattern, $._find_pattern_body],
+  ],
+
   supertypes: ($) => [
     $._statement,
     $._arg,
@@ -139,7 +146,13 @@ module.exports = grammar({
     singleton_method: ($) =>
       seq(
         'def',
-        seq(choice(field('object', $._variable), seq('(', field('object', $._arg), ')')), choice('.', '::')),
+        seq(
+          choice(
+            field('object', choice($._variable, $.self, $._nonlocal_variable)),
+            seq('(', field('object', $._arg), ')')
+          ),
+          choice('.', '::')
+        ),
         $._method_rest
       ),
 
@@ -168,6 +181,52 @@ 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', choice($._variable, $.self, $._nonlocal_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),
+        $._chained_arg,
+        alias($._chained_assignment, $.assignment),
+        alias($._chained_operator_assignment, $.operator_assignment),
+        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))),
@@ -537,22 +596,62 @@ 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),
         alias($.command_operator_assignment, $.operator_assignment),
         alias($.command_call, $.call),
         alias($.command_call_with_block, $.call),
-        prec.left(alias($._chained_command_call, $.call)),
+        $._chained_arg,
+        alias($._chained_assignment, $.assignment),
+        alias($._chained_operator_assignment, $.operator_assignment),
         alias($.return_command, $.return),
         alias($.yield_command, $.yield),
         alias($.break_command, $.break),
         alias($.next_command, $.next),
+        alias($._chained_match_pattern, $.match_pattern),
+        alias($._chained_test_pattern, $.test_pattern),
         $.match_pattern,
         $.test_pattern,
         $._arg
       ),
 
+    _chained_match_pattern: ($) =>
+      prec(
+        100,
+        seq(
+          field(
+            'value',
+            choice(
+              $._chained_arg,
+              alias($._command_method, $.method),
+              alias($._command_singleton_method, $.singleton_method)
+            )
+          ),
+          '=>',
+          field('pattern', $._pattern_top_expr_body)
+        )
+      ),
+    _chained_test_pattern: ($) =>
+      prec(
+        100,
+        seq(
+          field(
+            'value',
+            choice(
+              $._chained_arg,
+              alias($._chained_command, $.call),
+              alias($._command_method, $.method),
+              alias($._command_singleton_method, $.singleton_method)
+            )
+          ),
+          'in',
+          field('pattern', $._pattern_top_expr_body)
+        )
+      ),
+
     match_pattern: ($) => prec(100, seq(field('value', $._arg), '=>', field('pattern', $._pattern_top_expr_body))),
 
     test_pattern: ($) => prec(100, seq(field('value', $._arg), 'in', field('pattern', $._pattern_top_expr_body))),
@@ -623,17 +722,7 @@ module.exports = grammar({
 
     parenthesized_statements: ($) => seq('(', optional($._statements), ')'),
 
-    element_reference: ($) =>
-      prec.left(
-        1,
-        seq(
-          field('object', $._primary),
-          alias($._element_reference_bracket, '['),
-          optional($._argument_list_with_trailing_comma),
-          ']',
-          optional(field('block', choice($.block, $.do_block)))
-        )
-      ),
+    element_reference: ($) => elementReference($, $._primary),
 
     scope_resolution: ($) =>
       prec.left(
@@ -653,29 +742,75 @@ module.exports = grammar({
       ),
 
     command_call: ($) =>
-      seq(
-        choice($._call, $._chained_command_call, field('method', choice($._variable, $._function_identifier))),
-        field('arguments', alias($.command_argument_list, $.argument_list))
+      choice(
+        seq(
+          choice($._call, field('method', choice($._variable, $._function_identifier))),
+          field('arguments', alias($.command_argument_list, $.argument_list))
+        ),
+        $._chained_command
       ),
 
+    _chained_command: ($) =>
+      seq($._chained_command_call, field('arguments', alias($._chained_command_argument_list, $.argument_list))),
+
     command_call_with_block: ($) => {
       const receiver = choice($._call, field('method', choice($._variable, $._function_identifier)));
       const args = field('arguments', alias($.command_argument_list, $.argument_list));
+      const chainedArgs = field('arguments', alias($._chained_command_argument_list, $.argument_list));
       const block = field('block', $.block);
       const doBlock = field('block', $.do_block);
       return choice(
         seq(receiver, prec(PREC.CURLY_BLOCK, seq(args, block))),
-        seq(receiver, prec(PREC.DO_BLOCK, seq(args, doBlock)))
+        seq(receiver, prec(PREC.DO_BLOCK, seq(args, doBlock))),
+        seq($._chained_command_call, prec(PREC.CURLY_BLOCK, seq(chainedArgs, block))),
+        seq($._chained_command_call, prec(PREC.DO_BLOCK, seq(chainedArgs, doBlock)))
       );
     },
 
+    _chained_arg: ($) =>
+      choice(
+        $._chained_primary,
+        alias($._chained_binary, $.binary),
+        alias($._chained_conditional, $.conditional),
+        alias($._chained_range, $.range)
+      ),
+
+    _chained_primary: ($) =>
+      choice(
+        prec.left(alias($._chained_command_call, $.call)),
+        alias($._chained_call, $.call),
+        alias($._chained_element_reference, $.element_reference),
+        alias($._chained_scope_resolution, $.scope_resolution)
+      ),
+
     _chained_command_call: ($) =>
       seq(
-        field('receiver', alias($.command_call_with_block, $.call)),
+        field('receiver', choice(alias($.command_call_with_block, $.call), $._chained_primary)),
         field('operator', $._call_operator),
         field('method', choice($.identifier, $._function_identifier, $.operator, $.constant))
       ),
 
+    _chained_scope_resolution: ($) =>
+      prec.left(
+        PREC.CALL + 1,
+        seq(field('scope', $._chained_primary), token.immediate('::'), field('name', $.constant))
+      ),
+
+    _chained_element_reference: ($) => elementReference($, $._chained_primary),
+
+    _chained_call: ($) => {
+      const receiver = $._chained_command_call;
+      const receiverArguments = seq(
+        choice(receiver, seq(field('receiver', $._chained_primary), field('operator', $._call_operator))),
+        field('arguments', $.argument_list)
+      );
+      return choice(
+        receiverArguments,
+        prec(PREC.CURLY_BLOCK, seq(choice(receiver, receiverArguments), field('block', $.block))),
+        prec(PREC.DO_BLOCK, seq(choice(receiver, receiverArguments), field('block', $.do_block)))
+      );
+    },
+
     call: ($) => {
       const receiver = choice($._call, field('method', choice($._variable, $._function_identifier)));
 
@@ -696,6 +831,28 @@ module.exports = grammar({
       );
     },
 
+    _chained_command_argument_list: ($) =>
+      prec.right(
+        choice(
+          commaSep1($._argument),
+          seq(choice($._chained_plus_arg, alias($._chained_plus_pair, $.pair)), repeat(seq(',', $._argument)))
+        )
+      ),
+
+    _chained_plus_arg: ($) =>
+      choice(
+        alias($._chained_plus_argument, $.unary),
+        alias($._chained_plus_binary, $.binary),
+        alias($._chained_plus_conditional, $.conditional),
+        alias($._chained_plus_range, $.range)
+      ),
+    _chained_plus_binary: ($) => binaryExpression($, $._chained_plus_arg),
+    _chained_plus_conditional: ($) => conditionalExpression($, $._chained_plus_arg),
+    _chained_plus_range: ($) => rangeExpression($, $._chained_plus_arg, false),
+    _chained_plus_pair: ($) => prec.right(seq(field('key', $._chained_plus_arg), '=>', field('value', $._arg))),
+    _chained_plus_argument: ($) =>
+      prec.right(PREC.COMPLEMENT, seq(field('operator', alias($._unary_plus, '+')), field('operand', $._arg))),
+
     command_argument_list: ($) => prec.right(commaSep1($._argument)),
 
     argument_list: ($) => prec.right(seq(token.immediate('('), optional($._argument_list_with_trailing_comma), ')')),
@@ -728,6 +885,51 @@ module.exports = grammar({
       ),
 
     _arg_rhs: ($) => choice($._arg, alias($.rescue_modifier_arg, $.rescue_modifier)),
+    _chained_lhs: ($) =>
+      choice(
+        alias($._chained_command_call, $.call),
+        alias($._chained_element_reference, $.element_reference),
+        alias($._chained_scope_resolution, $.scope_resolution)
+      ),
+
+    _chained_left_assignment_list: ($) =>
+      prec.left(
+        -1,
+        seq(
+          $._chained_lhs,
+          ',',
+          optional(seq(commaSep1(choice($._lhs, $.rest_assignment, $.destructured_left_assignment)), optional(',')))
+        )
+      ),
+
+    _chained_assignment: ($) =>
+      prec.right(
+        PREC.ASSIGN,
+        seq(
+          field('left', choice($._chained_lhs, alias($._chained_left_assignment_list, $.left_assignment_list))),
+          '=',
+          field(
+            'right',
+            choice(
+              $._expression,
+              $.splat_argument,
+              $.right_assignment_list,
+              alias($.rescue_modifier_expression, $.rescue_modifier)
+            )
+          )
+        )
+      ),
+
+    _chained_operator_assignment: ($) =>
+      prec.right(
+        PREC.ASSIGN,
+        seq(
+          field('left', $._chained_lhs),
+          field('operator', choice('+=', '-=', '*=', '**=', '/=', '||=', '|=', '&&=', '&=', '%=', '>>=', '<<=', '^=')),
+          field('right', choice($._expression, alias($.rescue_modifier_expression, $.rescue_modifier)))
+        )
+      ),
+
     assignment: ($) =>
       prec.right(
         PREC.ASSIGN,
@@ -770,83 +972,29 @@ module.exports = grammar({
         )
       ),
 
-    conditional: ($) =>
-      prec.right(
-        PREC.CONDITIONAL,
-        seq(field('condition', $._arg), '?', field('consequence', $._arg), ':', field('alternative', $._arg))
-      ),
+    conditional: ($) => conditionalExpression($, $._arg),
 
-    range: ($) => {
-      const begin = field('begin', $._arg);
-      const end = field('end', $._arg);
-      const operator = field('operator', choice('..', '...'));
-      return prec.right(PREC.RANGE, choice(seq(begin, operator, end), seq(operator, end), seq(begin, operator)));
-    },
+    _chained_conditional: ($) => conditionalExpression($, $._chained_arg),
 
-    binary: ($) => {
-      // oxlint-disable typescript/unbound-method -- The DSL's `prec` functions do not use `this`.
-      /** @type {[(precedence: number, rule: RuleOrLiteral) => Rule, number, RuleOrLiteral][]} */
-      const operators = [
-        [prec.left, PREC.AND, 'and'],
-        [prec.left, PREC.OR, 'or'],
-        [prec.left, PREC.BOOLEAN_OR, '||'],
-        [prec.left, PREC.BOOLEAN_AND, '&&'],
-        [prec.left, PREC.SHIFT, choice('<<', '>>')],
-        [prec.left, PREC.COMPARISON, choice('<', '<=', '>', '>=')],
-        [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, '*'))],
-        [prec.right, PREC.RELATIONAL, choice('==', '!=', '===', '<=>', '=~', '!~')],
-        [prec.right, PREC.EXPONENTIAL, alias($._binary_star_star, '**')],
-      ];
-      // oxlint-enable typescript/unbound-method
+    range: ($) => rangeExpression($, $._arg, true),
 
-      return choice(
-        ...operators.map(([fn, precedence, operator]) =>
-          fn(precedence, seq(field('left', $._arg), field('operator', operator), field('right', $._arg)))
-        )
-      );
-    },
+    _chained_range: ($) => rangeExpression($, $._chained_arg, false),
+
+    _range_sign: ($) =>
+      prec.right(PREC.UNARY_MINUS, seq(field('operator', alias($._binary_minus, '-')), field('operand', $._arg))),
+
+    _chained_binary: ($) => binaryExpression($, $._chained_arg, alias($._binary_plus, '+')),
+
+    binary: ($) => binaryExpression($, $._arg),
 
     command_binary: ($) =>
       prec.left(
         seq(field('left', $._expression), field('operator', choice('or', 'and')), field('right', $._expression))
       ),
 
-    unary: ($) => {
-      // oxlint-disable typescript/unbound-method -- The DSL's `prec` functions do not use `this`.
-      /** @type {[(precedence: number, rule: RuleOrLiteral) => Rule, number, RuleOrLiteral][]} */
-      const operators = [
-        [prec, PREC.DEFINED, 'defined?'],
-        [prec.right, PREC.NOT, 'not'],
-        [prec.right, PREC.UNARY_MINUS, choice(alias($._unary_minus, '-'), alias($._binary_minus, '-'), '+')],
-        [prec.right, PREC.COMPLEMENT, choice('!', '~')],
-      ];
-      // oxlint-enable typescript/unbound-method
-      return choice(
-        ...operators.map(([fn, precedence, operator]) =>
-          fn(precedence, seq(field('operator', operator), field('operand', $._arg)))
-        )
-      );
-    },
+    unary: ($) => unaryExpression($._arg, choice(alias($._unary_minus, '-'), '+')),
 
-    command_unary: ($) => {
-      // oxlint-disable typescript/unbound-method -- The DSL's `prec` functions do not use `this`.
-      /** @type {[(precedence: number, rule: RuleOrLiteral) => Rule, number, RuleOrLiteral][]} */
-      const operators = [
-        [prec, PREC.DEFINED, 'defined?'],
-        [prec.right, PREC.NOT, 'not'],
-        [prec.right, PREC.UNARY_MINUS, choice(alias($._unary_minus, '-'), '+')],
-        [prec.right, PREC.COMPLEMENT, choice('!', '~')],
-      ];
-      // oxlint-enable typescript/unbound-method
-      return choice(
-        ...operators.map(([fn, precedence, operator]) =>
-          fn(precedence, seq(field('operator', operator), field('operand', $._expression)))
-        )
-      );
-    },
+    command_unary: ($) => unaryExpression($._expression, choice(alias($._unary_minus, '-'), '+')),
 
     parenthesized_unary: ($) =>
       prec(PREC.CALL, seq(field('operator', choice('defined?', 'not')), field('operand', $.parenthesized_statements))),
@@ -876,10 +1024,20 @@ module.exports = grammar({
     _function_identifier_call: ($) => prec.left(field('method', $._function_identifier)),
     _lhs: ($) =>
       prec.left(
-        choice($._variable, $.true, $.false, $.nil, $.scope_resolution, $.element_reference, alias($._call, $.call))
+        choice(
+          $._variable,
+          $.self,
+          $._nonlocal_variable,
+          $.true,
+          $.false,
+          $.nil,
+          $.scope_resolution,
+          $.element_reference,
+          alias($._call, $.call)
+        )
       ),
 
-    _variable: ($) => prec.right(choice($.self, $.super, $._nonlocal_variable, $.identifier, $.constant)),
+    _variable: ($) => prec.right(choice($.super, $.identifier, $.constant)),
 
     operator: () =>
       choice(
@@ -1122,3 +1280,87 @@ function commaSep1(rule) {
 function commaSep(rule) {
   return optional(commaSep1(rule));
 }
+
+/**
+ * @param {RuleOrLiteral} operand
+ * @param {RuleOrLiteral} sign
+ */
+function unaryExpression(operand, sign) {
+  return choice(
+    prec(PREC.DEFINED, seq(field('operator', 'defined?'), field('operand', operand))),
+    prec.right(PREC.NOT, seq(field('operator', 'not'), field('operand', operand))),
+    prec.right(PREC.UNARY_MINUS, seq(field('operator', sign), field('operand', operand))),
+    prec.right(PREC.COMPLEMENT, seq(field('operator', choice('!', '~')), field('operand', operand)))
+  );
+}
+
+/**
+ * @param {GrammarSymbols<string>} $
+ * @param {RuleOrLiteral} left
+ * @param {RuleOrLiteral} plus
+ */
+function binaryExpression($, left, plus = '+') {
+  // oxlint-disable typescript/unbound-method -- The DSL's `prec` functions do not use `this`.
+  /** @type {[(precedence: number, rule: RuleOrLiteral) => Rule, number, RuleOrLiteral][]} */
+  const operators = [
+    [prec.left, PREC.AND, 'and'],
+    [prec.left, PREC.OR, 'or'],
+    [prec.left, PREC.BOOLEAN_OR, '||'],
+    [prec.left, PREC.BOOLEAN_AND, '&&'],
+    [prec.left, PREC.SHIFT, choice('<<', '>>')],
+    [prec.left, PREC.COMPARISON, choice('<', '<=', '>', '>=')],
+    [prec.left, PREC.BITWISE_AND, alias($._bitwise_and, '&')],
+    [prec.left, PREC.BITWISE_OR, choice('^', '|')],
+    [prec.left, PREC.ADDITIVE, choice(plus, alias($._binary_minus, '-'))],
+    [prec.left, PREC.MULTIPLICATIVE, choice('/', '%', alias($._binary_star, '*'))],
+    [prec.right, PREC.RELATIONAL, choice('==', '!=', '===', '<=>', '=~', '!~')],
+    [prec.right, PREC.EXPONENTIAL, alias($._binary_star_star, '**')],
+  ];
+  // oxlint-enable typescript/unbound-method
+
+  return choice(
+    ...operators.map(([fn, precedence, operator]) =>
+      fn(precedence, seq(field('left', left), field('operator', operator), field('right', $._arg)))
+    )
+  );
+}
+
+/**
+ * @param {GrammarSymbols<string>} $
+ * @param {RuleOrLiteral} object
+ */
+function elementReference($, object) {
+  return prec.left(
+    1,
+    seq(
+      field('object', object),
+      alias($._element_reference_bracket, '['),
+      optional($._argument_list_with_trailing_comma),
+      ']',
+      optional(field('block', choice($.block, $.do_block)))
+    )
+  );
+}
+
+/**
+ * @param {GrammarSymbols<string>} $
+ * @param {RuleOrLiteral} condition
+ */
+function conditionalExpression($, condition) {
+  return prec.right(
+    PREC.CONDITIONAL,
+    seq(field('condition', condition), '?', field('consequence', $._arg), ':', field('alternative', $._arg))
+  );
+}
+
+/**
+ * @param {GrammarSymbols<string>} $
+ * @param {RuleOrLiteral} begin
+ * @param {boolean} allowBeginless
+ */
+function rangeExpression($, begin, allowBeginless) {
+  const end = field('end', choice($._arg, alias($._range_sign, $.unary)));
+  const operator = field('operator', choice('..', '...'));
+  const bounded = seq(field('begin', begin), operator, optional(end));
+  return prec.right(PREC.RANGE, allowBeginless ? choice(bounded, seq(operator, end)) : bounded);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-ruby",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Ruby grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -47,7 +47,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "2.0.24",
+    "@willbooster/web-tree-sitter": "2.0.27",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
@@ -57,7 +57,6 @@
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
     "tree-sitter-cli": "0.27.1",
-    "typescript": "7.0.2",
     "vite": "8.3.4",
     "vitest": "5.0.3",
     "wrangler": "4.149.0"

package/src/node-types.json

@@ -57,10 +57,22 @@
         "type": "call",
         "named": true
       },
+      {
+        "type": "conditional",
+        "named": true
+      },
+      {
+        "type": "element_reference",
+        "named": true
+      },
       {
         "type": "match_pattern",
         "named": true
       },
+      {
+        "type": "method",
+        "named": true
+      },
       {
         "type": "next",
         "named": true
@@ -69,10 +81,22 @@
         "type": "operator_assignment",
         "named": true
       },
+      {
+        "type": "range",
+        "named": true
+      },
       {
         "type": "return",
         "named": true
       },
+      {
+        "type": "scope_resolution",
+        "named": true
+      },
+      {
+        "type": "singleton_method",
+        "named": true
+      },
       {
         "type": "test_pattern",
         "named": true
@@ -91,6 +115,10 @@
     "type": "_lhs",
     "named": true,
     "subtypes": [
+      {
+        "type": "_nonlocal_variable",
+        "named": true
+      },
       {
         "type": "_variable",
         "named": true
@@ -115,6 +143,10 @@
         "type": "scope_resolution",
         "named": true
       },
+      {
+        "type": "self",
+        "named": true
+      },
       {
         "type": "true",
         "named": true
@@ -577,10 +609,6 @@
     "type": "_variable",
     "named": true,
     "subtypes": [
-      {
-        "type": "_nonlocal_variable",
-        "named": true
-      },
       {
         "type": "constant",
         "named": true
@@ -589,10 +617,6 @@
         "type": "identifier",
         "named": true
       },
-      {
-        "type": "self",
-        "named": true
-      },
       {
         "type": "super",
         "named": true
@@ -1288,6 +1312,14 @@
           {
             "type": "_primary",
             "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
           }
         ]
       }
@@ -1464,6 +1496,18 @@
           {
             "type": "_arg",
             "named": true
+          },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
           }
         ]
       },
@@ -1647,6 +1691,14 @@
           {
             "type": "_primary",
             "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
           }
         ]
       }
@@ -2378,6 +2430,26 @@
           {
             "type": "_arg",
             "named": true
+          },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "method",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
+          },
+          {
+            "type": "singleton_method",
+            "named": true
           }
         ]
       }
@@ -2399,9 +2471,37 @@
             "type": "body_statement",
             "named": true
           },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "method",
+            "named": true
+          },
           {
             "type": "rescue_modifier",
             "named": true
+          },
+          {
+            "type": "return",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
+          },
+          {
+            "type": "singleton_method",
+            "named": true
+          },
+          {
+            "type": "yield",
+            "named": true
           }
         ]
       },
@@ -2769,6 +2869,18 @@
           {
             "type": "_pattern_primitive",
             "named": true
+          },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
           }
         ]
       },
@@ -3010,6 +3122,10 @@
           {
             "type": "_primary",
             "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
           }
         ]
       }
@@ -3073,9 +3189,37 @@
             "type": "body_statement",
             "named": true
           },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "method",
+            "named": true
+          },
           {
             "type": "rescue_modifier",
             "named": true
+          },
+          {
+            "type": "return",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
+          },
+          {
+            "type": "singleton_method",
+            "named": true
+          },
+          {
+            "type": "yield",
+            "named": true
           }
         ]
       },
@@ -3097,9 +3241,17 @@
             "type": "_arg",
             "named": true
           },
+          {
+            "type": "_nonlocal_variable",
+            "named": true
+          },
           {
             "type": "_variable",
             "named": true
+          },
+          {
+            "type": "self",
+            "named": true
           }
         ]
       },
@@ -3258,6 +3410,26 @@
           {
             "type": "_arg",
             "named": true
+          },
+          {
+            "type": "call",
+            "named": true
+          },
+          {
+            "type": "element_reference",
+            "named": true
+          },
+          {
+            "type": "method",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
+            "named": true
+          },
+          {
+            "type": "singleton_method",
+            "named": true
           }
         ]
       }

package/tree-sitter.json

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