Skip to content
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

Wrap class, module, method, and block bodies in a named node #224

Merged
merged 14 commits into from
Aug 15, 2022
Merged

Wrap class, module, method, and block bodies in a named node #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
95fac13
Wrap namespaces, methods, and blocks contents in a body node
npezza93 Jul 17, 2022
c1edbfa
Use different name for class, module, and singleton class bodies
npezza93 Jul 17, 2022
de8c134
Remove named field
npezza93 Jul 17, 2022
d069a22
Name method and do block bodies
npezza93 Jul 17, 2022
5fbf676
Fix tests
npezza93 Jul 17, 2022
7ff8659
Use only body as a named node but add name to specific kinds for
npezza93 Jul 18, 2022
0d804b0
body -> body_statement
npezza93 Jul 23, 2022
dd191a8
Remove double quotes
npezza93 Jul 23, 2022
99381fb
wrap curly block body
npezza93 Jul 23, 2022
ec7fdab
Remove specific named body fields
npezza93 Jul 23, 2022
76b00c5
Cleanup begin
npezza93 Jul 23, 2022
9f6775c
Revert "Remove specific named body fields"
npezza93 Jul 23, 2022
b75c896
Merge remote-tracking branch 'upstream/master' into body
npezza93 Jul 23, 2022
a7f429c
Try using general body as name
npezza93 Aug 15, 2022
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
32 changes: 20 additions & 12 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ module.exports = grammar({

uninterpreted: $ => /(.|\s)*/,

block_body: $ => $._statements,
npezza93 marked this conversation as resolved.
Show resolved Hide resolved

_statements: $ => choice(
seq(
repeat1(choice(
Expand Down Expand Up @@ -158,7 +160,7 @@ module.exports = grammar({
seq(
field('parameters', alias($.parameters, $.method_parameters)),
choice(
seq(optional($._terminator), $._body_statement),
seq(optional($._terminator), optional(field('body', $.body_statement)), 'end'),
$._body_expr
)

Expand All @@ -168,7 +170,8 @@ module.exports = grammar({
field('parameters', alias($.bare_parameters, $.method_parameters))
),
$._terminator,
$._body_statement
optional(field('body', $.body_statement)),
'end'
),
),
),
Expand Down Expand Up @@ -266,7 +269,8 @@ module.exports = grammar({
seq(field('superclass', $.superclass), $._terminator),
optional($._terminator)
),
$._body_statement
optional(field('body', $.body_statement)),
'end'
),

superclass: $ => seq('<', $._expression),
Expand All @@ -276,14 +280,16 @@ module.exports = grammar({
alias($._singleton_class_left_angle_left_langle, '<<'),
field('value', $._arg),
$._terminator,
$._body_statement
optional(field('body', $.body_statement)),
'end'
),

module: $ => seq(
'module',
field('name', choice($.constant, $.scope_resolution)),
optional($._terminator),
$._body_statement,
optional(field('body', $.body_statement)),
'end'
),

return_command: $ => prec.left(seq('return', alias($.command_argument_list, $.argument_list))),
Expand Down Expand Up @@ -592,7 +598,7 @@ module.exports = grammar({
)
),

begin: $ => seq('begin', optional($._terminator), $._body_statement),
begin: $ => seq('begin', optional($._terminator), optional($._body_statement), 'end'),

ensure: $ => seq('ensure', optional($._statements)),

Expand All @@ -610,10 +616,11 @@ module.exports = grammar({

exception_variable: $ => seq('=>', $._lhs),

_body_statement: $ => seq(
optional($._statements),
repeat(choice($.rescue, $.else, $.ensure)),
'end'
body_statement: $ => $._body_statement,

_body_statement: $ => choice(
seq($._statements, repeat(choice($.rescue, $.else, $.ensure))),
seq(optional($._statements), repeat1(choice($.rescue, $.else, $.ensure))),
),

// Method calls without parentheses (aka "command calls") are only allowed
Expand Down Expand Up @@ -821,13 +828,14 @@ module.exports = grammar({
field('parameters', $.block_parameters),
optional($._terminator)
)),
$._body_statement
optional(field('body', $.body_statement)),
'end'
),

block: $ => prec(PREC.CURLY_BLOCK, seq(
'{',
field('parameters', optional($.block_parameters)),
optional($._statements),
optional(field('body', $.block_body)),
'}'
)),

Expand Down
Loading