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

Allow unquoted values in val_record #136

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Allow unquoted values in val_record #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
119 changes: 60 additions & 59 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,12 +437,7 @@ module.exports = grammar({
match_guard: ($) => seq(KEYWORD().if, $._expression),

_match_pattern_expression: ($) =>
choice(
$._match_pattern_value,
alias($._expr_unary_minus, $.expr_unary),
$.val_range,
$.expr_parenthesized,
),
choice($._match_pattern_value, $.val_range, $.expr_parenthesized),

_match_pattern_value: ($) =>
choice(
Expand Down Expand Up @@ -470,9 +465,6 @@ module.exports = grammar({
choice(
$._match_pattern_expression,
alias($._unquoted_in_list, $.val_string),
alias($.short_flag, $.val_string),
alias($.long_flag, $.val_string),
alias($._list_item_starts_with_sign, $.val_string),
),
optional(PUNC().comma),
),
Expand Down Expand Up @@ -1046,26 +1038,12 @@ module.exports = grammar({
$._list_item_expression,
alias($._unquoted_in_list, $.val_string),
alias($._unquoted_in_list_with_expr, $.val_string),
alias($.short_flag, $.val_string),
alias($.long_flag, $.val_string),
alias($._list_item_starts_with_sign, $.val_string),
),
),
),

_list_item_expression: ($) =>
choice(
$._value,
alias($._expr_unary_minus, $.expr_unary),
$.val_range,
$.expr_parenthesized,
),

_list_item_starts_with_sign: (_$) =>
seq(
choice(token(OPR().minus), token(OPR().plus)),
token.immediate(/[^\s\n\t\r{}()\[\]"`';]*/),
),
choice($._value, $.val_range, $.expr_parenthesized),

val_record: ($) =>
seq(
Expand Down Expand Up @@ -1106,8 +1084,9 @@ module.exports = grammar({
field(
"value",
choice(
prec.right(10, $._expression),
alias($.cmd_identifier, $.val_string),
$._list_item_expression,
alias($._unquoted_in_record, $.val_string),
alias($._unquoted_in_record_with_expr, $.val_string),
),
),
),
Expand Down Expand Up @@ -1258,10 +1237,12 @@ module.exports = grammar({

long_flag_value: ($) => $._cmd_arg,

unquoted: _unquoted_rule(false),
_unquoted_in_list: _unquoted_rule(true),
_unquoted_with_expr: _unquoted_with_expr_rule(false),
_unquoted_in_list_with_expr: _unquoted_with_expr_rule(true),
unquoted: _unquoted_rule("command"),
_unquoted_in_list: _unquoted_rule("list"),
_unquoted_in_record: _unquoted_rule("record"),
_unquoted_with_expr: _unquoted_with_expr_rule("command"),
_unquoted_in_list_with_expr: _unquoted_with_expr_rule("list"),
_unquoted_in_record_with_expr: _unquoted_with_expr_rule("record"),

_unquoted_anonymous_prefix: ($) =>
choice(
Expand Down Expand Up @@ -1588,12 +1569,28 @@ function _range_rule(anonymous, with_end_decimal = false) {
}

/**
* @param {boolean} in_list
* @param {string} type
*/
function _unquoted_with_expr_rule(in_list) {
const pattern_repeat = in_list ? /[^\s\n\t\r();,]*/ : /[^\s\n\t\r();]*/;
function _unquoted_with_expr_rule(type) {
var pattern_repeat = /[^\s\n\t\r();]*/;
switch (type) {
case "list":
pattern_repeat = /[^\s\n\t\r();,]*/;
break;
case "record":
pattern_repeat = /[^\s\n\t\r();:,]*/;
break;
}
return ($) => {
const unquoted_head = in_list ? $._unquoted_in_list : $.unquoted;
var unquoted_head = $.unquoted;
switch (type) {
case "list":
unquoted_head = $._unquoted_in_list;
break;
case "record":
unquoted_head = $._unquoted_in_record;
break;
}
return prec(
-1,
seq(
Expand All @@ -1619,31 +1616,36 @@ function _unquoted_with_expr_rule(in_list) {
}

/**
* @param {boolean} in_list
* @param {string} type
*/
function _unquoted_rule(in_list) {
const pattern = in_list
? /[^-$\s\n\t\r{}()\[\]"`';,][^\s\n\t\r{}()\[\]"`';,]*/
: /[^-$\s\n\t\r{}()\[\]"`';][^\s\n\t\r{}()\[\]"`';]*/;
const pattern_repeat = in_list
? /[^\s\n\t\r{}()\[\]"`';,]*/
: /[^\s\n\t\r{}()\[\]"`';]*/;
const pattern_repeat1 = in_list
? /[^\s\n\t\r{}()\[\]"`';,]+/
: /[^\s\n\t\r{}()\[\]"`';]+/;
const pattern_once = in_list
? /[^\s\n\t\r{}()\[\]"`';,]/
: /[^\s\n\t\r{}()\[\]"`';]/;
const pattern_with_dot = in_list
? /[^\s\n\t\r{}()\[\]"`';,.]/
: /[^\s\n\t\r{}()\[\]"`';.]/;
const pattern_with_le = in_list
? /[^\s\n\t\r{}()\[\]"`';,=<]/
: /[^\s\n\t\r{}()\[\]"`';=<]/;
const pattern_with_dollar = in_list
? /[^\s\n\t\r{}()\[\]"`';,$]/
: /[^\s\n\t\r{}()\[\]"`';$]/;

function _unquoted_rule(type) {
var pattern = /[^-$\s\n\t\r{}()\[\]"`';][^\s\n\t\r{}()\[\]"`';]*/;
var pattern_repeat = /[^\s\n\t\r{}()\[\]"`';]*/;
var pattern_repeat1 = /[^\s\n\t\r{}()\[\]"`';]+/;
var pattern_once = /[^\s\n\t\r{}()\[\]"`';]/;
var pattern_with_dot = /[^\s\n\t\r{}()\[\]"`';.]/;
var pattern_with_le = /[^\s\n\t\r{}()\[\]"`';=<]/;
var pattern_with_dollar = /[^\s\n\t\r{}()\[\]"`';$]/;
switch (type) {
case "list":
pattern = /[^$\s\n\t\r{}()\[\]"`';,][^\s\n\t\r{}()\[\]"`';,]*/;
pattern_repeat = /[^\s\n\t\r{}()\[\]"`';,]*/;
pattern_repeat1 = /[^\s\n\t\r{}()\[\]"`';,]+/;
pattern_once = /[^\s\n\t\r{}()\[\]"`';,]/;
pattern_with_dot = /[^\s\n\t\r{}()\[\]"`';,.]/;
pattern_with_le = /[^\s\n\t\r{}()\[\]"`';,=<]/;
pattern_with_dollar = /[^\s\n\t\r{}()\[\]"`';,$]/;
break;
case "record":
pattern = /[^$\s\n\t\r{}()\[\]"`';:,][^\s\n\t\r{}()\[\]"`';:,]*/;
pattern_repeat = /[^\s\n\t\r{}()\[\]"`';:,]*/;
pattern_repeat1 = /[^\s\n\t\r{}()\[\]"`';:,]+/;
pattern_once = /[^\s\n\t\r{}()\[\]"`';:,]/;
pattern_with_dot = /[^\s\n\t\r{}()\[\]"`';:,.]/;
pattern_with_le = /[^\s\n\t\r{}()\[\]"`';:,=<]/;
pattern_with_dollar = /[^\s\n\t\r{}()\[\]"`';:,$]/;
break;
}
// because this catches almost anything, we want to ensure it is
// picked as the a last resort after everything else has failed.
// so we give it a ridiculously low precedence and place it at the
Expand Down Expand Up @@ -1710,7 +1712,6 @@ function _unquoted_rule(in_list) {
seq(
$._val_number_decimal,
token.immediate(PUNC().dot),
$._immediate_decimal,
token.immediate(pattern_repeat),
),

Expand Down
Loading