Skip to content

Commit

Permalink
Merge branch 'main' into raw-strings-pt2
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrdgo
mrdgo committed Nov 22, 2024
2 parents 4906a08 + 4305155 commit e063b90
Show file tree
Hide file tree
Showing 9 changed files with 286,284 additions and 280,452 deletions.
185 changes: 99 additions & 86 deletions grammar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,22 @@ module.exports = grammar({

conflicts: ($) => [
[$._binary_predicate_parenthesized],
[$._block_body, $.record_body, $.val_closure],
[$._block_body, $.shebang],
[$._block_body, $.val_closure],
[$._expression_parenthesized, $._expr_binary_expression_parenthesized],
[$._match_pattern_list, $.val_list],
[$._match_pattern_record, $.val_record],
[$._match_pattern_record_variable, $._value],
[$._match_pattern_value, $._value],
[$._parenthesized_body],
[$._block_body, $.record_body],
[$._block_body, $.shebang],
[$._val_number_decimal],
[$.block, $.val_closure],
[$.block, $.val_record],
[$.ctrl_if_parenthesized],
[$.ctrl_match],
[$.ctrl_try_parenthesized],
[$.expr_binary_parenthesized],
[$.list_body, $.val_table],
[$.parameter, $.param_type, $.param_value],
[$.pipeline],
[$.pipeline_parenthesized],
Expand All @@ -56,22 +57,16 @@ module.exports = grammar({

...block_body_rules(),

// Because everything inside of the parentheses are treated as if they were written together,
// terminator must be semicolon.
...parenthesized_body_rules(),

_block_body: ($) =>
choice(
seq(
repeat($._terminator),
prec.right(
repeat(seq($._block_body_statement, repeat1($._terminator))),
),
$._block_body_statement,
repeat($._terminator),
),
// empty blocks
repeat1($._terminator),
general_body_rules(
"",
$._block_body_statement,
$._terminator,
null,
null,
$._terminator,
),

/// Identifiers
Expand Down Expand Up @@ -191,7 +186,9 @@ module.exports = grammar({
_multiple_types: ($) =>
seq(
BRACK().open_brack,
optional(general_body_rules("", "_one_type", "_entry_separator")($)),
optional(
general_body_rules("", $._one_type, $._entry_separator, $._newline),
),
BRACK().close_brack,
),

Expand Down Expand Up @@ -444,9 +441,15 @@ module.exports = grammar({
"scrutinee",
choice($._item_expression, alias($.unquoted, $.val_string)),
),
open_brace(),
optional(general_body_rules("", "match_arm", "_entry_separator")($)),
optional($.default_arm),
BRACK().open_brace,
optional(
general_body_rules(
"",
choice($.match_arm, $.default_arm),
$._entry_separator,
$._newline,
),
),
BRACK().close_brace,
),

Expand All @@ -462,7 +465,6 @@ module.exports = grammar({
field("default_pattern", PUNC().underscore),
PUNC().fat_arrow,
field("expression", $._match_expression),
repeat($._entry_separator),
),

_match_expression: ($) =>
Expand Down Expand Up @@ -534,7 +536,7 @@ module.exports = grammar({

_match_pattern_record: ($) =>
seq(
open_brace(),
BRACK().open_brace,
repeat(
field(
"entry",
Expand Down Expand Up @@ -682,15 +684,20 @@ module.exports = grammar({
seq(
BRACK().open_brack,
optional(
general_body_rules("cmd", "_command_name", "_entry_separator")($),
general_body_rules(
"cmd",
$._command_name,
$._entry_separator,
$._newline,
),
),
BRACK().close_brack,
),

/// Block

block: ($) =>
seq(open_brace(), optional($._block_body), BRACK().close_brace),
seq(BRACK().open_brace, optional($._block_body), BRACK().close_brace),

_blosure: ($) => choice(prec.dynamic(10, $.block), $.val_closure),

Expand Down Expand Up @@ -831,22 +838,16 @@ module.exports = grammar({
),

_parenthesized_body: ($) =>
choice(
seq(
repeat($._terminator),
repeat(
seq(
$._block_body_statement_parenthesized,
// at least one ;
repeat1(seq(repeat($._newline), PUNC().semicolon)),
),
),
general_body_rules(
"",
$._block_body_statement_parenthesized,
$._terminator,
null,
[
repeat1(seq(repeat($._newline), PUNC().semicolon)),
repeat($._newline),
$._block_body_statement_parenthesized,
repeat($._terminator),
),
// empty body
repeat1($._terminator),
],
$._terminator,
),

val_range: _range_rule(false),
Expand Down Expand Up @@ -1102,7 +1103,15 @@ module.exports = grammar({
alias($._spread_parenthesized, $.expr_parenthesized),
),

list_body: general_body_rules("entry", "val_entry", "_entry_separator"),
list_body: ($) =>
general_body_rules(
"entry",
$.val_entry,
$._entry_separator,
$._newline,
null,
choice($._newline, PUNC().comma),
),

val_entry: ($) =>
prec(
Expand All @@ -1123,7 +1132,7 @@ module.exports = grammar({

val_record: ($) =>
seq(
open_brace(),
BRACK().open_brace,
optional($.record_body),
BRACK().close_brace,
optional($.cell_path),
Expand All @@ -1144,11 +1153,13 @@ module.exports = grammar({
alias($._spread_parenthesized, $.expr_parenthesized),
),

record_body: general_body_rules(
"entry",
"record_entry",
"_entry_separator",
),
record_body: ($) =>
general_body_rules(
"entry",
$.record_entry,
$._entry_separator,
$._newline,
),

_entry_separator: (_$) =>
token(prec(PREC().higher, choice(PUNC().comma, /\s/))),
Expand Down Expand Up @@ -1205,15 +1216,19 @@ module.exports = grammar({
seq(
BRACK().open_brack,
repeat($._newline),
field("head", seq($.val_list, $._table_head_separator)),
optional(general_body_rules("row", "val_list", "_entry_separator")($)),
field("head", $.val_list),
alias($._table_head_separator, PUNC().semicolon),
optional(
general_body_rules("row", $.val_list, $._entry_separator, $._newline),
),
BRACK().close_brack,
optional($.cell_path),
),

val_closure: ($) =>
seq(
open_brace(),
BRACK().open_brace,
repeat($._newline),
optional(field("parameters", $.parameter_pipes)),
$._block_body,
BRACK().close_brace,
Expand Down Expand Up @@ -1349,40 +1364,47 @@ function _identifier_rules(immediate) {
}

/**
* for rules of repeated pattern that require separator in-between
* e.g. list, record, blocks
* @param {string} field_name
* @param {string} entry
* @param {string} separator
* @param {any} entry base build block
* @param {any} separator separator between entries
* @param {any} preceding separator before first entry, defaults to separator
* @param {array} alt_sep array of rules to override default separator
* @param {any} empty_unit optional for empty body
*/
function general_body_rules(field_name, entry, separator) {
return (/** @type {{ [x: string]: RuleOrLiteral; }} */ $) => {
const field_entry =
field_name.length == 0 ? $[entry] : field(field_name, $[entry]);
return prec(
PREC().higher,
seq(
repeat($._newline),
// Normal entries MUST have a separator
repeat(seq(field_entry, repeat1($[separator]))),
// Final entry may or may not have separator
seq(field_entry, repeat($[separator])),
),
);
};
function general_body_rules(
field_name,
entry,
separator,
preceding = null,
alt_sep = null,
empty_unit = null,
) {
const field_entry = field_name.length == 0 ? entry : field(field_name, entry);
const prec_sep = preceding || separator;
// Normal entries MUST have a separator
const sep_array = alt_sep || [repeat1(separator)];
const rule = prec(
PREC().higher,
seq(
repeat(prec_sep),
repeat(seq(field_entry, ...sep_array)),
field_entry,
// Final entry may or may not have separator
repeat(separator),
),
);
return empty_unit ? choice(repeat1(empty_unit), rule) : rule;
}

/**
* @param {string} suffix
* @param {{ (_$: any): string; (_$: any): ChoiceRule; (arg0: any): RuleOrLiteral; }} terminator
*/
function parenthesized_body_rules() {
return {
..._block_body_rules("_parenthesized"),

/// pipeline

pipeline_parenthesized: (
/** @type {{ pipe_element_parenthesized: RuleOrLiteral; pipe_element: string; }} */ $,
) =>
pipeline_parenthesized: ($) =>
seq(
repeat(
seq(
Expand All @@ -1396,17 +1418,13 @@ function parenthesized_body_rules() {
};
}

/**
* @param {string} suffix
* @param {{ ($: { _terminator: any; }): any; ($: { _terminator: RuleOrLiteral; }): ChoiceRule; (arg0: any): RuleOrLiteral; }} terminator
*/
function block_body_rules() {
return {
..._block_body_rules(""),

/// pipeline

pipeline: (/** @type {any} */ $) =>
pipeline: ($) =>
seq(
repeat(seq($.pipe_element, $._pipe_separator, optional($._newline))),
$.pipe_element,
Expand Down Expand Up @@ -1585,7 +1603,7 @@ function _command_rule(parenthesized) {
field("head", seq(optional(PUNC().caret), $.cmd_identifier)),
field("head", seq(PUNC().caret, $._stringish)),
),
prec.dynamic(10, repeat(seq(sep, optional($._cmd_arg)))),
repeat(seq(sep, optional($._cmd_arg))),
),
);
};
Expand Down Expand Up @@ -1836,6 +1854,7 @@ function _range_rule(anonymous, with_end_decimal = false) {
}

/**
* For expressions like: foo('bar')baz
* @param {string} type
*/
function _unquoted_with_expr_rule(type) {
Expand Down Expand Up @@ -2063,20 +2082,14 @@ function BRACK() {
};
}

// group open_brace and following whitespace/newline together
// so they won't participate in conflicts resolving between record and block
function open_brace() {
return alias(token(seq(BRACK().open_brace, /\s*/)), BRACK().open_brace);
}

/**
* group operator and its preceding/succeeding whitespace/newline
* @param {string} opr
* @param {boolean} parenthesized
*/
function operator_with_separator(opr, parenthesized) {
const sep = parenthesized ? choice(/[ \t]/, /\r?\n/) : /[ \t]/;
return alias(token(seq(repeat1(sep), opr, repeat1(sep))), opr);
return alias(token(seq(sep, opr, sep)), opr);
}

/**
Expand Down
12 changes: 1 addition & 11 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@
"prettier": "3.3.3",
"tree-sitter-cli": "^0.23.0"
},
"tree-sitter": [
{
"scope": "source.nu",
"file-types": [
"nu"
],
"highlights": "queries/nu/highlights.scm",
"injections": "queries/nu/injections.scm"
}
],
"files": [
"grammar.js",
"binding.gyp",
Expand All @@ -47,4 +37,4 @@
"queries/*",
"src/**"
]
}
}
Loading

0 comments on commit e063b90

Please sign in to comment.