Skip to content

Commit a67ab08

Browse files
committed
feat: support the user option prefix @ in variable names
1 parent 445a093 commit a67ab08

10 files changed

Lines changed: 12788 additions & 12761 deletions

File tree

grammar.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,11 @@ module.exports = grammar({
358358
),
359359
$._shell,
360360
),
361-
_variable_name: (_) => /[A-Za-z_][A-Za-z0-9_]*/,
361+
variable_name: (_) => /[A-Za-z_][A-Za-z0-9_]*/,
362362
environment_assignment: ($) =>
363363
prec.right(
364364
seq(
365-
field("name", alias($._variable_name, $.name)),
365+
field("name", alias($.variable_name, $.name)),
366366
"=",
367367
field("value", alias($._string, $.value)),
368368
),
@@ -372,7 +372,7 @@ module.exports = grammar({
372372
seq(
373373
alias(/\%hidden/, $.hidden_keyword),
374374
/\s+/,
375-
field("name", alias($._variable_name, $.name)),
375+
field("name", alias($.variable_name, $.name)),
376376
"=",
377377
field("value", alias($._string, $.value)),
378378
),
@@ -889,8 +889,8 @@ module.exports = grammar({
889889
_hash: (_) => token.immediate(prec(1, /#[^#,{}"'HhDPTSFIW]/)),
890890
backslash_escape: (_) =>
891891
/\\(u[\da-fA-F]{4}|u[\da-fA-F]{8}|[0-7]{3}|[^;\n])/,
892+
expr_variable_name: (_) => /@?[a-z-_\d]+/,
892893
variable_name_short: (_) => /[HhDPTSFIW]/,
893-
variable_name: (_) => /[a-z-_\d]+/,
894894
expr_single_quotes: ($) => expr_rule($, "'"),
895895
expr_double_quotes: ($) => expr_rule($, '"'),
896896
operator: (_) => /==|!=|<|>|<=|>=|\|\||&&/,
@@ -1005,11 +1005,11 @@ function expr_rule($, quote) {
10051005
seq(
10061006
token.immediate(prec(1, "#{")),
10071007
choice(
1008-
$.variable_name,
1008+
$.expr_variable_name,
10091009
seq(
10101010
choice(
1011-
seq("?", choice(expr, $.variable_name)),
1012-
seq(alias($.variable_name, $.function_name), ":"),
1011+
seq("?", choice(expr, $.expr_variable_name)),
1012+
seq(alias($.expr_variable_name, $.function_name), ":"),
10131013
seq($.operator, ":"),
10141014
),
10151015
commaSep1(

src/grammar.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node-types.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)