Skip to content

add some important features from ruby > 3.0 and solve some issue #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Magikdidi24 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add some important features from ruby > 3.0 and solve some issue #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f882b6c
run npm audit to fix 4 high vulnerabilities and regenerate
Oct 13, 2025
9c97fe5
fix lambda with shadow variables
Oct 13, 2025
9fc7bab
fix bad return with argument_list like return (0,2)
Magikdidi24 Oct 14, 2025
ed9906d
fix function ruby > 3.0
Magikdidi24 Oct 14, 2025
65bb643
fix for range with begin only
Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ const ALPHA_CHAR = /[^\x00-\x1F\s0-9:;`"'@$#.,|^&<=>+\-*/\\%?!~()\[\]{}]/;
module.exports = grammar({
name: 'ruby',
inline: $ => [$._arg_rhs, $._call_operator],
conflicts: $ => [
[$._expression, $._chained_command_call],
[$._pattern_expr_alt, $.alternative_pattern],
[$._array_pattern_n, $.as_pattern, $._find_pattern_body],
],
externals: $ => [
$._line_break,
$._no_line_break,
Expand Down Expand Up @@ -159,7 +164,8 @@ module.exports = grammar({
_method_rest: $ => seq(
field('name', $._method_name),
choice(
$._body_expr,
prec(2, $._body_expr),
// with parameters
seq(
field('parameters', alias($.parameters, $.method_parameters)),
choice(
Expand All @@ -168,6 +174,7 @@ module.exports = grammar({
),

),
// without parameters but with body
seq(
optional(
field('parameters', alias($.bare_parameters, $.method_parameters)),
Expand Down Expand Up @@ -195,15 +202,16 @@ module.exports = grammar({
),
),

_body_expr: $ =>
_body_expr: $ => prec.right(1,
seq(
'=',
field('body',
choice(
$._arg,
alias($.rescue_modifier_arg, $.rescue_modifier),
$._expression,
alias($.rescue_modifier_expression, $.rescue_modifier),
)),
),
),


parameters: $ => seq(
Expand Down Expand Up @@ -300,7 +308,7 @@ module.exports = grammar({
yield_command: $ => prec.left(seq('yield', alias($.command_argument_list, $.argument_list))),
break_command: $ => prec.left(seq('break', alias($.command_argument_list, $.argument_list))),
next_command: $ => prec.left(seq('next', alias($.command_argument_list, $.argument_list))),
return: $ => prec.left(seq('return', optional($.argument_list))),
return: $ => prec.left('return'),
yield: $ => prec.left(seq('yield', optional($.argument_list))),
break: $ => prec.left(seq('break', optional($.argument_list))),
next: $ => prec.left(seq('next', optional($.argument_list))),
Expand Down Expand Up @@ -436,7 +444,7 @@ module.exports = grammar({
$._pattern_expr_basic,
),

alternative_pattern: $ => seq(field('alternatives', $._pattern_expr_basic), repeat1(seq('|', field('alternatives', $._pattern_expr_basic)))),
alternative_pattern: $ => prec.right(seq(field('alternatives', $._pattern_expr_basic), repeat1(seq('|', field('alternatives', $._pattern_expr_basic))))),

_array_pattern_body: $ => choice(
$._pattern_expr,
Expand Down Expand Up @@ -507,11 +515,11 @@ module.exports = grammar({
const begin = field('begin', $._pattern_primitive);
const end = field('end', $._pattern_primitive);
const operator = field('operator', choice('..', '...'));
return choice(
return prec.right(choice(
seq(begin, operator, end),
seq(operator, end),
seq(begin, operator),
);
));
},

_pattern_primitive: $ => choice(
Expand Down Expand Up @@ -1216,13 +1224,32 @@ module.exports = grammar({

lambda: $ => seq(
'->',
field('parameters', optional(choice(
alias($.parameters, $.lambda_parameters),
alias($.bare_parameters, $.lambda_parameters),
))),
// Optional parameters: either parenthesized, bare, or absent
optional(
field(
'parameters',
alias(
choice(
$.lambda_parameters_with_parens,
$.bare_parameters
),
$.lambda_parameters
)
)
),
// Body can be a regular or "do" block
field('body', choice($.block, $.do_block)),
),


// Lambda parameters with optional shadow variables: (a, b; x, y)
lambda_parameters_with_parens: $ => seq(
'(',
seq(commaSep($._formal_parameter), optional(',')),
optional(seq(';', sep1(field('locals', $.identifier), ','))),
')',
),

empty_statement: _ => prec(-1, ';'),

_terminator: $ => choice(
Expand Down
Loading