Skip to content

Use second version of reserved words API #344

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 4 commits into
base: master
Choose a base branch
from
Open

Use second version of reserved words API #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba0971e
Use new reserved words API to improve error recovery
maxbrunsfeld Apr 3, 2022
88b4235
Merge branch 'master' into reserved-words
maxbrunsfeld Nov 8, 2024
62c0d3c
Use new grammar API for reserved words
maxbrunsfeld Nov 22, 2024
719c93e
get it nearly working
amaanq Nov 27, 2024
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
88 changes: 52 additions & 36 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,48 @@ module.exports = grammar({
/[\s\p{Zs}\uFEFF\u2028\u2029\u2060\u200B]/,
],

reserved: {
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#reserved_words
global: $ => [
'break',
'case',
'catch',
'class',
'const',
'continue',
'debugger',
'default',
'delete',
'do',
'else',
'export',
'extends',
'false',
'finally',
'for',
'function',
'if',
'import',
'in',
'instanceof',
'new',
'null',
'return',
'super',
'switch',
'this',
'throw',
'true',
'try',
'typeof',
'var',
'void',
'while',
'with',
],
properties: $ => [],
},

supertypes: $ => [
$.statement,
$.declaration,
Expand All @@ -44,7 +86,6 @@ module.exports = grammar({
$._expressions,
$._semicolon,
$._identifier,
$._reserved_identifier,
$._jsx_attribute,
$._jsx_element_name,
$._jsx_child,
Expand Down Expand Up @@ -90,9 +131,6 @@ module.exports = grammar({

conflicts: $ => [
[$.primary_expression, $._property_name],
[$.primary_expression, $._property_name, $.arrow_function],
[$.primary_expression, $.arrow_function],
[$.primary_expression, $.method_definition],
[$.primary_expression, $.rest_pattern],
[$.primary_expression, $.pattern],
[$.primary_expression, $._for_header],
Expand All @@ -104,7 +142,6 @@ module.exports = grammar({
[$.labeled_statement, $._property_name],
[$.computed_property_name, $.array],
[$.binary_expression, $._initializer],
[$.class_static_block, $._property_name],
],

word: $ => $.identifier,
Expand Down Expand Up @@ -173,6 +210,7 @@ module.exports = grammar({
_module_export_name: $ => choice(
$.identifier,
$.string,
'default',
),

declaration: $ => choice(
Expand Down Expand Up @@ -425,7 +463,7 @@ module.exports = grammar({
empty_statement: _ => ';',

labeled_statement: $ => prec.dynamic(-1, seq(
field('label', alias(choice($.identifier, $._reserved_identifier), $.statement_identifier)),
field('label', alias($.identifier, $.statement_identifier)),
':',
field('body', $.statement),
)),
Expand Down Expand Up @@ -497,7 +535,6 @@ module.exports = grammar({
$.member_expression,
$.parenthesized_expression,
$._identifier,
alias($._reserved_identifier, $.identifier),
$.this,
$.super,
$.number,
Expand Down Expand Up @@ -530,10 +567,7 @@ module.exports = grammar({
$.pair,
$.spread_element,
$.method_definition,
alias(
choice($.identifier, $._reserved_identifier),
$.shorthand_property_identifier,
),
alias($.identifier, $.shorthand_property_identifier),
))),
'}',
)),
Expand All @@ -544,10 +578,7 @@ module.exports = grammar({
$.pair_pattern,
$.rest_pattern,
$.object_assignment_pattern,
alias(
choice($.identifier, $._reserved_identifier),
$.shorthand_property_identifier_pattern,
),
alias($.identifier, $.shorthand_property_identifier_pattern),
))),
'}',
)),
Expand All @@ -560,8 +591,8 @@ module.exports = grammar({

object_assignment_pattern: $ => seq(
field('left', choice(
alias(choice($._reserved_identifier, $.identifier), $.shorthand_property_identifier_pattern),
$._destructuring_pattern,
alias($.identifier, $.shorthand_property_identifier_pattern),
)),
'=',
field('right', $.expression),
Expand Down Expand Up @@ -763,7 +794,6 @@ module.exports = grammar({
optional('async'),
choice(
field('parameter', choice(
alias($._reserved_identifier, $.identifier),
$.identifier,
)),
$._call_signature,
Expand Down Expand Up @@ -813,8 +843,8 @@ module.exports = grammar({
choice('.', field('optional_chain', $.optional_chain)),
field('property', choice(
$.private_property_identifier,
alias($.identifier, $.property_identifier))),
)),
reserved('properties', alias($.identifier, $.property_identifier))),
))),

subscript_expression: $ => prec.right('member', seq(
field('object', choice($.expression, $.primary_expression)),
Expand All @@ -826,7 +856,6 @@ module.exports = grammar({
$.member_expression,
$.subscript_expression,
$._identifier,
alias($._reserved_identifier, $.identifier),
$._destructuring_pattern,
),

Expand All @@ -839,7 +868,6 @@ module.exports = grammar({
_augmented_assignment_lhs: $ => choice(
$.member_expression,
$.subscript_expression,
alias($._reserved_identifier, $.identifier),
$.identifier,
$.parenthesized_expression,
),
Expand Down Expand Up @@ -1196,32 +1224,20 @@ module.exports = grammar({
field('value', choice($.pattern, $.assignment_pattern)),
),

_property_name: $ => choice(
alias(
choice($.identifier, $._reserved_identifier),
$.property_identifier,
),
_property_name: $ => reserved('properties', choice(
alias($.identifier, $.property_identifier),
$.private_property_identifier,
$.string,
$.number,
$.computed_property_name,
),
)),

computed_property_name: $ => seq(
'[',
$.expression,
']',
),

_reserved_identifier: _ => choice(
'get',
'set',
'async',
'static',
'export',
'let',
),

_semicolon: $ => choice($._automatic_semicolon, ';'),
},
});
Expand Down
Loading
Loading