@willbooster/tree-sitter-ruby 8.0.0 → 10.0.0

package/README.md

@@ -23,8 +23,8 @@ code instead of aborting the process.
 ## Support Scope
 
 This fork maintains only full parsing: valid input yields a correct tree, and invalid input yields `ERROR` or `MISSING`
-nodes without crashing, hanging, or taking more than linear time. Incremental parsing works as in upstream tree-sitter
-but is not tested here, and no queries (highlights, locals, injections, tags) are shipped. Node types, field names, and
+nodes without crashing, hanging, or taking more than linear time. Parse each input without a previous tree; reusing
+an old tree is unsupported. No queries (highlights, locals, injections, tags) are shipped. Node types, field names, and
 the trees that error recovery produces may change; such changes are released as new major versions.
 
 ## Usage

package/grammar.js

@@ -168,6 +168,7 @@ module.exports = grammar({
     [$._yield_pattern_not, $._test_pattern_not],
     [$._yield_argument_list, $._yield_pair_key_arguments],
     [$._body_expr, $._yield_value],
+    [$._spaced_body_expr, $._yield_value],
     [$._endless_command_operand, $._yield_value],
     [$._yield_argument, $._command_argument],
     [$._command_value, $._yield_value, $.pair],
@@ -263,7 +264,7 @@ module.exports = grammar({
 
     singleton_method: ($) => singletonMethod($, $._method_rest),
 
-    _method_rest: ($) => methodRest($, $._body_expr),
+    _method_rest: ($) => methodRest($, $._body_expr, $._spaced_body_expr),
 
     rescue_modifier_arg: ($) => prec(PREC.RESCUE, seq(field('body', $._arg), 'rescue', field('handler', $._arg))),
 
@@ -276,7 +277,15 @@ module.exports = grammar({
     rescue_modifier_expression: ($) =>
       prec(PREC.RESCUE, seq(field('body', $._non_pattern_expression), 'rescue', field('handler', $._arg))),
 
-    _body_expr: ($) => seq('=', field('body', endlessBody($, $._arg, $._endless_body_rescue))),
+    _body_expr: ($) =>
+      seq(alias($._endless_equals, '='), field('body', endlessBody($, $._arg, $._endless_body_rescue))),
+
+    _spaced_body_expr: ($) =>
+      seq(alias($._spaced_endless_equals, '='), field('body', endlessBody($, $._arg, $._endless_body_rescue))),
+
+    _endless_equals: () => token.immediate(/(?:[ \t\f\v\r]|\\\r?\n)*=/),
+
+    _spaced_endless_equals: () => token.immediate(/(?:[ \t\f\v\r]|\\\r?\n)+=/),
 
     _endless_body_rescue: ($) => endlessBodyRescue($, $._arg),
 
@@ -1504,58 +1513,43 @@ module.exports = grammar({
 
     _variable: ($) => prec.right(choice($.super, reserved('variables', $.identifier), $.constant)),
 
-    operator: () =>
-      choice(
-        '..',
-        '|',
-        '^',
-        '&',
-        '<=>',
-        '==',
-        '===',
-        '=~',
-        '>',
-        '>=',
-        '<',
-        '<=',
-        '+',
-        '!=',
-        '-',
-        '*',
-        '/',
-        '%',
-        '!',
-        '!~',
-        '**',
-        '<<',
-        '>>',
-        '~',
-        '+@',
-        '-@',
-        '~@',
-        '[]',
-        '[]=',
-        '`'
-      ),
+    operator: ($) => choice($._nonsetter_operator, '[]='),
+
+    _nonsetter_operator: ($) => choice($._spaced_method_operator, $._gapless_method_operator),
+
+    _spaced_method_operator: () => choice('|', '^', '&', '==', '>', '<', '*', '/', '%', '!', '**', '<<', '>>', '[]'),
+
+    _gapless_method_operator: () =>
+      choice('<=>', '===', '=~', '>=', '<=', '+', '!=', '-', '!@', '!~', '~', '+@', '-@', '~@', '`'),
 
     _method_name: ($) =>
-      choice(
-        reserved('methodNames', $.identifier),
-        $._function_identifier,
-        $.constant,
-        $.setter,
-        $.simple_symbol,
-        $.delimited_symbol,
-        $.operator,
-        $._nonlocal_variable
-      ),
+      choice($._nonsetter_method_name, $.setter, alias('[]=', $.operator), $.simple_symbol, $.delimited_symbol),
+
+    _nonsetter_method_name: ($) => choice($._spaced_definition_name, $._gapless_definition_name),
+
+    _spaced_definition_name: ($) =>
+      choice($._method_identifier, $._function_identifier, $.constant, alias($._spaced_method_operator, $.operator)),
+
+    _gapless_definition_name: ($) => alias($._gapless_method_operator, $.operator),
+
+    _method_identifier: ($) =>
+      choice(reserved('methodNames', $.identifier), alias($.self, $.identifier), alias($.super, $.identifier)),
 
     _nonlocal_variable: ($) => choice($.instance_variable, $.class_variable, $.global_variable),
 
-    setter: ($) => seq(field('name', $.identifier), token.immediate('=')),
+    setter: ($) =>
+      seq(field('name', choice($._method_identifier, alias($.constant, $.identifier))), token.immediate('=')),
 
     undef: ($) => seq('undef', commaSep1($._method_name)),
-    alias: ($) => seq('alias', field('name', $._method_name), field('alias', $._method_name)),
+    alias: ($) =>
+      choice(
+        seq('alias', field('name', $._method_name), field('alias', $._method_name)),
+        seq(
+          'alias',
+          field('name', $.global_variable),
+          field('alias', alias($._alias_global_variable, $.global_variable))
+        )
+      ),
 
     comment: ($) => choice($._line_comment, $._block_comment, token(prec(PREC.COMMENT, seq('#', /.*/)))),
 
@@ -1582,10 +1576,14 @@ module.exports = grammar({
     instance_variable: () => token(seq('@', ALPHA_CHAR, IDENTIFIER_CHARS)),
     class_variable: () => token(seq('@@', ALPHA_CHAR, IDENTIFIER_CHARS)),
 
-    global_variable: () =>
+    global_variable: ($) => choice($._named_global_variable, /\$[0-9]+/),
+
+    _alias_global_variable: ($) => choice($._named_global_variable, '$0'),
+
+    _named_global_variable: () =>
       token(
         choice(
-          /\$(-[a-zA-Z0-9_]|[!@&`'+~=/\\,;.<>*$?:"]|[0-9]+)/,
+          /\$(-[a-zA-Z0-9_]|[!@&`'+~=/\\,;.<>*$?:"])/,
           seq('$-', /[^\u0000-\u007F]/),
           seq('$', ALPHA_CHAR, IDENTIFIER_CHARS)
         )
@@ -1975,10 +1973,12 @@ function singletonMethod($, rest) {
  * @param {RuleOrLiteral} body
  */
 function endlessMethodRest($, body) {
+  const parameters = seq(field('parameters', alias($.parameters, $.method_parameters)), alias($._endless_equals, '='));
   return seq(
-    field('name', $._method_name),
-    optional(field('parameters', alias($.parameters, $.method_parameters))),
-    '=',
+    choice(
+      seq(field('name', $._spaced_definition_name), choice(alias($._spaced_endless_equals, '='), parameters)),
+      seq(field('name', $._gapless_definition_name), choice(alias($._endless_equals, '='), parameters))
+    ),
     field('body', body)
   );
 }
@@ -2111,23 +2111,19 @@ function callExpression($, primary, member, allowDoBlock = true) {
 /**
  * @param {GrammarSymbols<string>} $
  * @param {RuleOrLiteral} bodyExpression
+ * @param {RuleOrLiteral} spacedBodyExpression
  */
-function methodRest($, bodyExpression) {
-  return seq(
-    field('name', $._method_name),
-    choice(
-      bodyExpression,
-      seq(
-        field('parameters', alias($.parameters, $.method_parameters)),
-        choice(seq(optional($._terminator), optional(field('body', $.body_statement)), 'end'), bodyExpression)
-      ),
-      seq(
-        optional(field('parameters', alias($.bare_parameters, $.method_parameters))),
-        $._body_separator,
-        optional(field('body', $.body_statement)),
-        'end'
-      )
-    )
+function methodRest($, bodyExpression, spacedBodyExpression) {
+  const parameters = field('parameters', alias($.parameters, $.method_parameters));
+  const body = optional(field('body', $.body_statement));
+  const block = choice(
+    seq(parameters, optional($._terminator), body, 'end'),
+    seq(optional(field('parameters', alias($.bare_parameters, $.method_parameters))), $._body_separator, body, 'end')
+  );
+  return choice(
+    seq(field('name', $._spaced_definition_name), choice(block, spacedBodyExpression, seq(parameters, bodyExpression))),
+    seq(field('name', $._gapless_definition_name), choice(block, bodyExpression, seq(parameters, bodyExpression))),
+    seq(field('name', choice($.setter, alias('[]=', $.operator))), block)
   );
 }
 

package/package.json

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

package/src/node-types.json

@@ -161,10 +161,6 @@
     "type": "_method_name",
     "named": true,
     "subtypes": [
-      {
-        "type": "_nonlocal_variable",
-        "named": true
-      },
       {
         "type": "constant",
         "named": true
@@ -642,6 +638,10 @@
           {
             "type": "_method_name",
             "named": true
+          },
+          {
+            "type": "global_variable",
+            "named": true
           }
         ]
       },
@@ -652,6 +652,10 @@
           {
             "type": "_method_name",
             "named": true
+          },
+          {
+            "type": "global_variable",
+            "named": true
           }
         ]
       }
@@ -1984,6 +1988,11 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "global_variable",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "hash",
     "named": true,
@@ -2559,7 +2568,19 @@
         "required": true,
         "types": [
           {
-            "type": "_method_name",
+            "type": "constant",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "operator",
+            "named": true
+          },
+          {
+            "type": "setter",
             "named": true
           }
         ]
@@ -3297,7 +3318,19 @@
         "required": true,
         "types": [
           {
-            "type": "_method_name",
+            "type": "constant",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "operator",
+            "named": true
+          },
+          {
+            "type": "setter",
             "named": true
           }
         ]
@@ -3880,6 +3913,10 @@
     "type": "!=",
     "named": false
   },
+  {
+    "type": "!@",
+    "named": false
+  },
   {
     "type": "!~",
     "named": false
@@ -3892,6 +3929,10 @@
     "type": "#{",
     "named": false
   },
+  {
+    "type": "$0",
+    "named": false
+  },
   {
     "type": "%",
     "named": false
@@ -4204,10 +4245,6 @@
     "type": "for",
     "named": false
   },
-  {
-    "type": "global_variable",
-    "named": true
-  },
   {
     "type": "heredoc_beginning",
     "named": true

package/tree-sitter.json

@@ -13,7 +13,7 @@
     }
   ],
   "metadata": {
-    "version": "8.0.0",
+    "version": "10.0.0",
     "license": "MIT",
     "description": "Ruby grammar for tree-sitter",
     "authors": [