@willbooster/tree-sitter-ruby 3.0.5 → 3.0.7

package/grammar.js

@@ -87,9 +87,10 @@ module.exports = grammar({
     $._uninterpreted,
     $._not_parenthesized,
     $._lambda_brace,
+    $._heredoc_literal_resume,
   ],
 
-  extras: ($) => [$.comment, $.heredoc_body, /\s/, /\\\r?\n/],
+  extras: ($) => [$.comment, $.heredoc_body, $._heredoc_literal_resume, /\s/, /\\\r?\n/],
 
   word: ($) => $.identifier,
 
@@ -1207,10 +1208,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),
@@ -1611,6 +1622,7 @@ module.exports = grammar({
         seq(
           '\\',
           choice(
+            /\r\n/,
             /[^ux0-7]/, // single character
             /x[0-9a-fA-F]{1,2}/, // hex code
             /[0-7]{1,3}/, // octal

package/package.json

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

package/tree-sitter.json

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