Skip to content

Improve outer attribute attachment #269

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improve outer attribute attachment #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d537982
Attach outer attributes to the elements they annotate
wetneb Nov 14, 2024
c632897
Run tree-sitter generate
wetneb Mar 19, 2025
0338a0d
Update and improve tests
wetneb Apr 1, 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
110 changes: 76 additions & 34 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,22 @@

// https://doc.rust-lang.org/reference/expressions.html#expression-precedence
const PREC = {
call: 15,
field: 14,
try: 13,
unary: 12,
cast: 11,
multiplicative: 10,
additive: 9,
shift: 8,
bitand: 7,
bitxor: 6,
bitor: 5,
comparative: 4,
and: 3,
or: 2,
range: 1,
call: 16,
field: 15,
try: 14,
unary: 13,
cast: 12,
multiplicative: 11,
additive: 10,
shift: 9,
bitand: 8,
bitxor: 7,
bitor: 6,
comparative: 5,
and: 4,
or: 3,
range: 2,
attribute: 1,
assign: 0,
closure: -1,
};
Expand Down Expand Up @@ -95,8 +96,10 @@ module.exports = grammar({
$._field_identifier,
$._non_special_token,
$._declaration_statement,
$._declaration_statement_without_attribute,
$._reserved_identifier,
$._expression_ending_with_block,
$._expression_ending_with_block_without_attribute,
],

conflicts: $ => [
Expand Down Expand Up @@ -132,12 +135,11 @@ module.exports = grammar({
prec(1, $._expression_ending_with_block),
),

_declaration_statement: $ => choice(
_declaration_statement_without_attribute: $ => choice(
$.const_item,
$.macro_invocation,
$.macro_definition,
$.empty_statement,
$.attribute_item,
$.inner_attribute_item,
$.mod_item,
$.foreign_mod_item,
Expand All @@ -156,6 +158,16 @@ module.exports = grammar({
$.static_item,
),

declaration_with_attribute: $ => seq(
field('attributes', $.attributes),
field('declaration', $._declaration_statement),
),

_declaration_statement: $ => choice(
$._declaration_statement_without_attribute,
$.declaration_with_attribute,
),

// Section - Macro definitions

macro_definition: $ => {
Expand Down Expand Up @@ -252,6 +264,10 @@ module.exports = grammar({
']',
),

attributes: $ => prec.left(-3,
repeat1($.attribute_item)
),

inner_attribute_item: $ => seq(
'#',
'!',
Expand Down Expand Up @@ -332,12 +348,13 @@ module.exports = grammar({

enum_variant_list: $ => seq(
'{',
sepBy(',', seq(repeat($.attribute_item), $.enum_variant)),
sepBy(',', seq($.enum_variant)),
optional(','),
'}',
),

enum_variant: $ => seq(
optional($.attributes),
optional($.visibility_modifier),
field('name', $.identifier),
field('body', optional(choice(
Expand All @@ -352,7 +369,7 @@ module.exports = grammar({

field_declaration_list: $ => seq(
'{',
sepBy(',', seq(repeat($.attribute_item), $.field_declaration)),
sepBy(',', seq(optional($.attributes), $.field_declaration)),
optional(','),
'}',
),
Expand All @@ -367,7 +384,7 @@ module.exports = grammar({
ordered_field_declaration_list: $ => seq(
'(',
sepBy(',', seq(
repeat($.attribute_item),
optional($.attributes),
optional($.visibility_modifier),
field('type', $._type),
)),
Expand Down Expand Up @@ -549,7 +566,7 @@ module.exports = grammar({
type_parameters: $ => prec(1, seq(
'<',
sepBy1(',', seq(
repeat($.attribute_item),
optional($.attributes),
choice(
$.metavariable,
$.type_parameter,
Expand Down Expand Up @@ -660,7 +677,7 @@ module.exports = grammar({
parameters: $ => seq(
'(',
sepBy(',', seq(
optional($.attribute_item),
optional($.attributes),
choice(
$.parameter,
$.self_parameter,
Expand Down Expand Up @@ -951,15 +968,27 @@ module.exports = grammar({
$.closure_expression,
$.parenthesized_expression,
$.struct_expression,
$._expression_ending_with_block,
$._expression_ending_with_block_without_attribute,
),

_expression: $ => choice(
$._expression_without_attribute,
$.expression_with_attribute,
),

expression_with_attribute: $ => prec(PREC.attribute,
seq(
field('attributes', $.attributes),
field('expression', $._expression_without_attribute),
)
),

_expression_without_attribute: $ => choice(
$._expression_except_range,
$.range_expression,
),

_expression_ending_with_block: $ => choice(
_expression_ending_with_block_without_attribute: $ => choice(
$.unsafe_block,
$.async_block,
$.gen_block,
Expand All @@ -973,6 +1002,18 @@ module.exports = grammar({
$.const_block,
),

block_expression_with_attribute: $ => prec(PREC.attribute,
seq(
field('attributes', $.attributes),
field('expression', $._expression_ending_with_block_without_attribute),
)
),

_expression_ending_with_block: $ => choice(
$._expression_ending_with_block_without_attribute,
$.block_expression_with_attribute,
),

macro_invocation: $ => seq(
field('macro', choice(
$.scoped_identifier,
Expand Down Expand Up @@ -1113,22 +1154,22 @@ module.exports = grammar({

arguments: $ => seq(
'(',
sepBy(',', seq(repeat($.attribute_item), $._expression)),
sepBy(',', $._expression),
optional(','),
')',
),

array_expression: $ => seq(
'[',
repeat($.attribute_item),
optional($.attributes),
choice(
seq(
$._expression,
';',
field('length', $._expression),
),
seq(
sepBy(',', seq(repeat($.attribute_item), $._expression)),
sepBy(',', seq(optional($.attributes), $._expression)),
optional(','),
),
),
Expand All @@ -1143,7 +1184,7 @@ module.exports = grammar({

tuple_expression: $ => seq(
'(',
repeat($.attribute_item),
optional($.attributes),
seq($._expression, ','),
repeat(seq($._expression, ',')),
optional($._expression),
Expand Down Expand Up @@ -1173,12 +1214,12 @@ module.exports = grammar({
),

shorthand_field_initializer: $ => seq(
repeat($.attribute_item),
optional($.attributes),
$.identifier,
),

field_initializer: $ => seq(
repeat($.attribute_item),
optional($.attributes),
field('field', choice($._field_identifier, $.integer_literal)),
':',
field('value', $._expression),
Expand Down Expand Up @@ -1233,6 +1274,7 @@ module.exports = grammar({

match_block: $ => seq(
'{',
repeat($.inner_attribute_item),
optional(seq(
repeat($.match_arm),
alias($.last_match_arm, $.match_arm),
Expand All @@ -1241,7 +1283,7 @@ module.exports = grammar({
),

match_arm: $ => prec.right(seq(
repeat(choice($.attribute_item, $.inner_attribute_item)),
optional($.attributes),
field('pattern', $.match_pattern),
'=>',
choice(
Expand All @@ -1251,7 +1293,7 @@ module.exports = grammar({
)),

last_match_arm: $ => seq(
repeat(choice($.attribute_item, $.inner_attribute_item)),
optional($.attributes),
field('pattern', $.match_pattern),
'=>',
field('value', $._expression),
Expand Down Expand Up @@ -1358,13 +1400,13 @@ module.exports = grammar({
$.block,
),

block: $ => seq(
block: $ => prec.right(3, seq(
optional(seq($.label, ':')),
'{',
repeat($._statement),
optional($._expression),
'}',
),
)),

// Section - Patterns

Expand Down
Loading