Name 'commaSeparated*' helpers consistently

This commit is contained in:
Bruno BELANYI 2024-04-23 15:27:52 +00:00
parent 8166742493
commit 96ae542119

View file

@ -1,4 +1,4 @@
function commaSeparated(elem) { function commaSeparatedOptTrailing(elem) {
return seq(elem, repeat(seq(",", elem)), optional(",")) return seq(elem, repeat(seq(",", elem)), optional(","))
} }
@ -6,7 +6,7 @@ function commaSeparatedNoTrailing(elem) {
return seq(elem, repeat(seq(",", elem))) return seq(elem, repeat(seq(",", elem)))
} }
function trailingCommaSeparated(elem) { function commaSeparatedTrailing(elem) {
return repeat(seq(elem, ",")) return repeat(seq(elem, ","))
} }
@ -48,7 +48,7 @@ module.exports = grammar({
_old_module: ($) => seq( _old_module: ($) => seq(
field("type", $.identifier), field("type", $.identifier),
"{", "{",
optional(commaSeparated( optional(commaSeparatedOptTrailing(
alias(field("property", $._colon_property), $.property) alias(field("property", $._colon_property), $.property)
)), )),
"}", "}",
@ -57,7 +57,7 @@ module.exports = grammar({
_new_module: ($) => seq( _new_module: ($) => seq(
field("type", $.identifier), field("type", $.identifier),
"(", "(",
optional(commaSeparated( optional(commaSeparatedOptTrailing(
alias(field("property", $._equal_property), $.property) alias(field("property", $._equal_property), $.property)
)), )),
")", ")",
@ -140,7 +140,7 @@ module.exports = grammar({
select_cases: ($) => seq( select_cases: ($) => seq(
"{", "{",
optional(trailingCommaSeparated($.select_case)), optional(commaSeparatedTrailing($.select_case)),
"}", "}",
), ),
@ -161,13 +161,13 @@ module.exports = grammar({
list_expression: ($) => seq( list_expression: ($) => seq(
"[", "[",
optional(commaSeparated(field("element", $._expr))), optional(commaSeparatedOptTrailing(field("element", $._expr))),
"]", "]",
), ),
map_expression: ($) => seq( map_expression: ($) => seq(
"{", "{",
optional(commaSeparated( optional(commaSeparatedOptTrailing(
alias(field("property", $._colon_property), $.property) alias(field("property", $._colon_property), $.property)
)), )),
"}", "}",