tree-sitter-sh 0.16.0 → 0.18.0

package/grammar.js

@@ -189,6 +189,8 @@ const structuredSourceParts = ($) => [
   $.arithmetic_expansion,
   $.backquote_substitution,
 ];
+const patternSpecialValue = ($, character) =>
+  repeat1(field("value", choice(character, ...structuredSourceParts($))));
 const hiddenPhysical = ($, begin) => physicalSource($, begin);
 const fallbackLiteralParts = ($, character) =>
   choice(
@@ -247,30 +249,22 @@ const fallbackRules = (kind) => {
       field("operator", $.pattern_bracket_range_operator_source),
       field("end", endpoint($)),
     );
-  const special = ($, marker, body) =>
-    prec.dynamic(
+  const special = ($, marker, body) => {
+    const delimiter = physical(
+      $,
+      $[`_fallback_${marker}`],
+      marker === "colon" ? ":" : marker === "dot" ? "." : "=",
+    );
+    return prec.dynamic(
       PATTERN_PRECEDENCE.specialElement,
       seq(
         physical($, $._fallback_special_bracket_open, "["),
-        physical(
-          $,
-          $[`_fallback_${marker}`],
-          marker === "colon" ? ":" : marker === "dot" ? "." : "=",
-        ),
+        delimiter,
         body,
-        prec(
-          1,
-          seq(
-            physical(
-              $,
-              $[`_fallback_${marker}`],
-              marker === "colon" ? ":" : marker === "dot" ? "." : "=",
-            ),
-            physical($, $._fallback_bracket_close, "]"),
-          ),
-        ),
+        prec(1, seq(delimiter, physical($, $._fallback_bracket_close, "]"))),
       ),
     );
+  };
   return {
     [`${prefix}_first`]: ($) =>
       fallbackFirstLiteral($, $[`${prefix}_literal_begin`], cell($)),
@@ -360,17 +354,12 @@ const fallbackRules = (kind) => {
       special(
         $,
         "dot",
-        repeat1(
-          field(
-            "value",
-            choice(
-              classified(
-                $,
-                "collating_character",
-                "pattern_collating_symbol_character_source",
-              ),
-              ...structuredSourceParts($),
-            ),
+        patternSpecialValue(
+          $,
+          classified(
+            $,
+            "collating_character",
+            "pattern_collating_symbol_character_source",
           ),
         ),
       ),
@@ -379,17 +368,12 @@ const fallbackRules = (kind) => {
       special(
         $,
         "equals",
-        repeat1(
-          field(
-            "value",
-            choice(
-              classified(
-                $,
-                "equivalence_character",
-                "pattern_equivalence_class_character_source",
-              ),
-              ...structuredSourceParts($),
-            ),
+        patternSpecialValue(
+          $,
+          classified(
+            $,
+            "equivalence_character",
+            "pattern_equivalence_class_character_source",
           ),
         ),
       ),
@@ -401,6 +385,13 @@ const wordPatternSpecialSources = ($) => [
   $.pattern_equivalence_class_source,
 ];
 
+const patternBracketPlainAtoms = ($, character) => [
+  character,
+  $._pattern_operator_bracket_character,
+  $.pattern_bracket_hyphen_source,
+  ...structuredSourceParts($),
+];
+
 const parameterPatternCollatingSymbolSource = ($) =>
   alias(
     $._parameter_pattern_collating_symbol_source,
@@ -549,16 +540,9 @@ const arithmeticExpansion = ($, start, dynamicStart) =>
       arithmeticClosingLayout($),
     ),
   );
-const linebreakLayout = ($) =>
-  seq(optional($.linebreak), optional($._horizontal_layout));
 
 const separatorOperatorLayout = ($, operator) =>
   seq(operator, optional(field("linebreak", $.linebreak)));
-const reservedWordLinebreak = ($) =>
-  choice(
-    seq($.linebreak, optional($._horizontal_layout)),
-    $._horizontal_layout,
-  );
 
 const newlineListElements = ($) => [
   $.here_document_sequence,
@@ -575,14 +559,18 @@ const boundaryLineComment = ($, comment) =>
 const trailingComment = ($) =>
   seq($._trailing_comment_boundary, optional($._horizontal_layout), $.comment);
 
+// Expansions whose parameter words inherit a double-quoted context.
+const quotedExpansionParts = ($) => [
+  alias($._double_quoted_parameter_expansion, $.parameter_expansion),
+  $.command_substitution,
+  $.arithmetic_expansion,
+  alias($._double_quoted_backquote_substitution, $.backquote_substitution),
+];
 const doubleQuotedPart = ($) =>
   choice(
     $.double_quote_text,
     $.double_quote_escape,
-    alias($._double_quoted_parameter_expansion, $.parameter_expansion),
-    $.command_substitution,
-    $.arithmetic_expansion,
-    alias($._double_quoted_backquote_substitution, $.backquote_substitution),
+    ...quotedExpansionParts($),
   );
 const singleQuoted = ($, opener) =>
   seq(
@@ -603,6 +591,19 @@ const dollarSingleQuoted = ($, dollar) =>
     repeat(choice($.dollar_single_quote_text, $.dollar_single_quote_escape)),
     physical($, $._dollar_sq_close, "'"),
   );
+const hereDocumentRedirect = ($, operator, end) =>
+  seq(
+    field("operator", operator),
+    optional($._horizontal_layout),
+    field("end", end),
+  );
+// The begin token tells the scanner whether <<- strips leading tabs.
+const hereEnd = ($, begin) =>
+  seq(
+    begin,
+    field("word", alias($._here_end_source_word, $.word)),
+    $._here_end_commit,
+  );
 const hereDocumentEndSource = ($, begin, text) =>
   seq(begin, repeat(choice($._here_document_end_leading_tabs, text)));
 const backquoteSubstitution = ($, start) =>
@@ -642,10 +643,9 @@ const dollarExpansionStart = (
   start = $._dollar_expansion_start,
 ) => seq(dollarExpansionPrefix($, start), physical($, token, spelling));
 const backquoteDelimiter = ($, token) => physical($, token, "`");
-const commandSubstitution = ($, start) =>
+const commandSubstitution = ($, prefix) =>
   seq(
-    start,
-    $._command_substitution_body_begin,
+    prefix,
     optional(field("body", $.command_substitution_body)),
     physical($, $._punct_right_parenthesis, ")"),
     $._command_substitution_end,
@@ -659,9 +659,7 @@ const patternSpecialClassSource = ($, marker, characterSource) =>
     PATTERN_PRECEDENCE.specialElement,
     seq(
       patternSpecialStart($, marker),
-      repeat1(
-        field("value", choice(characterSource, ...structuredSourceParts($))),
-      ),
+      patternSpecialValue($, characterSource),
       patternSpecialEnd($, marker),
     ),
   );
@@ -698,8 +696,9 @@ const patternCharacterClassSource = ($, content) =>
 
 const parameterExpansion = (
   $,
-  bracedExpansion,
+  word,
   start = $._dollar_expansion_start,
+  prefix = "",
 ) =>
   prec(
     1,
@@ -708,10 +707,7 @@ const parameterExpansion = (
         dollarExpansionPrefix($, start),
         field("parameter", $._unbraced_parameter),
       ),
-      seq(
-        dollarExpansionStart($, $._parameter_open, "{", start),
-        bracedExpansion,
-      ),
+      bracedParameterExpansion($, word, prefix),
     ),
   );
 
@@ -721,33 +717,71 @@ const bracedParameterSource = ($, classifiedParameter) =>
     $._unclassified_numeric_parameter_source,
   );
 
-const bracedParameterExpansion = ($, tail) =>
-  choice(
-    seq(bracedParameterSource($, $._braced_parameter), tail),
-    prec.dynamic(2, seq(field("parameter", $._special_parameter_hash), tail)),
-    prec.dynamic(
-      3,
-      seq(
-        field("operator", $._parameter_length_operator),
-        bracedParameterSource($, $._length_parameter),
-        physical($, $._parameter_close, "}"),
-      ),
-    ),
+const parameterHeaderRules = () =>
+  Object.fromEntries(
+    ["", "_word_initial"].flatMap((prefix) => {
+      const name = `${prefix}_braced_parameter`;
+      return [
+        [
+          `${name}_header`,
+          ($) =>
+            seq(
+              $[`${name}_start`],
+              choice(
+                bracedParameterSource($, $._braced_parameter),
+                prec.dynamic(2, field("parameter", $._special_parameter_hash)),
+              ),
+            ),
+        ],
+        [
+          `${name}_value_header`,
+          ($) =>
+            seq(
+              $[`${name}_header`],
+              field("operator", $._parameter_value_operator),
+            ),
+        ],
+        [
+          `${name}_pattern_header`,
+          ($) =>
+            seq(
+              $[`${name}_header`],
+              field("operator", $._parameter_pattern_operator),
+            ),
+        ],
+        [
+          `${name}_length_header`,
+          ($) =>
+            seq(
+              $[`${name}_start`],
+              field("operator", $._parameter_length_operator),
+              bracedParameterSource($, $._length_parameter),
+            ),
+        ],
+      ];
+    }),
   );
 
-const parameterOperatorTail = ($, word) =>
-  choice(
+const bracedParameterExpansion = ($, word, prefix) => {
+  const name = `${prefix}_braced_parameter`;
+  return choice(
+    seq($[`${name}_header`], physical($, $._parameter_close, "}")),
     seq(
-      field("operator", $._parameter_value_operator),
+      $[`${name}_value_header`],
       optional(field("word", word)),
       physical($, $._parameter_close, "}"),
     ),
     seq(
-      field("operator", $._parameter_pattern_operator),
+      $[`${name}_pattern_header`],
       optional(field("pattern", $.parameter_pattern)),
       physical($, $._parameter_close, "}"),
     ),
+    prec.dynamic(
+      3,
+      seq($[`${name}_length_header`], physical($, $._parameter_close, "}")),
+    ),
   );
+};
 
 const parameterPatternSource = ($) =>
   choice(
@@ -791,12 +825,7 @@ const ifClause = ($) =>
   );
 
 const loopClause = ($, keyword) =>
-  seq(
-    keyword,
-    compoundListField($, "condition"),
-    optional($._closing_layout),
-    field("body", $.do_group),
-  );
+  seq(keyword, $._loop_condition, field("body", $.do_group));
 
 const separatedForHeader = ($) =>
   seq(
@@ -821,7 +850,7 @@ const forHeaderTail = ($) =>
     $._horizontal_layout,
     separatedForHeader($),
     seq(
-      reservedWordLinebreak($),
+      $._linebreak_layout,
       field("in", $.in),
       optional(seq($._horizontal_layout, field("words", $.wordlist))),
       separatedForHeader($),
@@ -935,9 +964,8 @@ export default grammar({
       $._esac_keyword_begin,
       $._while_keyword_begin,
       $._until_keyword_begin,
-      $._dless_commit,
-      $._dlessdash_commit,
       $._here_end_begin,
+      $._here_end_strip_begin,
       $._here_end_commit,
       $._here_document_line_end_begin,
       $._here_document_body_start,
@@ -1170,17 +1198,15 @@ export default grammar({
 
   rules: {
     program: ($) =>
-      choice(
-        seq(
-          optional(field("leading", $.linebreak)),
-          optional($._horizontal_layout),
-          field("commands", $.complete_commands),
-          optional(field("trailing", $.linebreak)),
-          optional($._free_trailing_layout),
-        ),
-        seq(
-          optional(field("leading", $.linebreak)),
-          optional($._horizontal_layout),
+      seq(
+        optional(field("leading", $.linebreak)),
+        optional($._horizontal_layout),
+        choice(
+          seq(
+            field("commands", $.complete_commands),
+            optional(field("trailing", $.linebreak)),
+            optional($._free_trailing_layout),
+          ),
           optional(trailingComment($)),
         ),
       ),
@@ -1304,10 +1330,11 @@ export default grammar({
         field("pipeline", $.pipeline),
         repeat(
           seq(
-            $._and_or_continuation,
-            optional($._horizontal_layout),
+            optional(
+              seq($._and_or_continuation, optional($._horizontal_layout)),
+            ),
             field("operator", choice($._and_if, $._or_if)),
-            linebreakLayout($),
+            optional($._linebreak_layout),
             field("pipeline", $.pipeline),
           ),
         ),
@@ -1326,10 +1353,9 @@ export default grammar({
         field("command", $.command),
         repeat(
           seq(
-            $._pipe_continuation,
-            optional($._horizontal_layout),
+            optional(seq($._pipe_continuation, optional($._horizontal_layout))),
             physical($, $._punct_pipe, "|"),
-            linebreakLayout($),
+            optional($._linebreak_layout),
             field("command", $.command),
           ),
         ),
@@ -1517,6 +1543,9 @@ export default grammar({
         ),
       ),
 
+    _loop_condition: ($) =>
+      seq(compoundListField($, "condition"), optional($._closing_layout)),
+
     while_clause: ($) => loopClause($, $._while_keyword_source),
 
     until_clause: ($) => loopClause($, $._until_keyword_source),
@@ -1527,9 +1556,9 @@ export default grammar({
     case_clause: ($) =>
       seq(
         $._case_selector_header,
-        reservedWordLinebreak($),
+        $._linebreak_layout,
         field("in", $.in),
-        linebreakLayout($),
+        optional($._linebreak_layout),
         caseClauseItems($),
       ),
 
@@ -1541,12 +1570,17 @@ export default grammar({
 
     case_list: ($) => repeat1(field("item", $.case_item)),
 
-    case_item_ns: ($) =>
+    _case_item_header: ($) =>
       seq(
         field("patterns", $.pattern_list),
         $._pattern_end,
         optional($._horizontal_layout),
         physical($, $._punct_right_parenthesis, ")"),
+      ),
+
+    case_item_ns: ($) =>
+      seq(
+        $._case_item_header,
         choice(
           seq(optional($.linebreak), optional($._horizontal_layout)),
           prec.dynamic(
@@ -1558,17 +1592,14 @@ export default grammar({
 
     case_item: ($) =>
       seq(
-        field("patterns", $.pattern_list),
-        $._pattern_end,
-        optional($._horizontal_layout),
-        physical($, $._punct_right_parenthesis, ")"),
+        $._case_item_header,
         choice(
-          linebreakLayout($),
+          optional($._linebreak_layout),
           prec.dynamic(10, field("body", $.compound_list)),
         ),
         seq($._case_item_end, optional($._horizontal_layout)),
         field("terminator", choice($._dsemi, $._semi_and)),
-        optional(reservedWordLinebreak($)),
+        optional($._linebreak_layout),
       ),
 
     pattern_list: ($) =>
@@ -1651,7 +1682,7 @@ export default grammar({
       field("body", choice($.io_file, $.io_here)),
 
     io_number: ($) => lexical($, $._io_number_begin),
-    io_file: ($) =>
+    _io_file_prefix: ($) =>
       seq(
         choice(
           physical($, $._punct_less, "<", "operator"),
@@ -1662,9 +1693,10 @@ export default grammar({
           ),
         ),
         optional($._horizontal_layout),
-        field("filename", $.filename),
       ),
 
+    io_file: ($) => seq($._io_file_prefix, field("filename", $.filename)),
+
     filename: ($) => field("word", $.word),
 
     lessand: ($) => lexical($, $._lessand_begin),
@@ -1673,25 +1705,20 @@ export default grammar({
     lessgreat: ($) => lexical($, $._lessgreat_begin),
     clobber: ($) => lexical($, $._clobber_begin),
     io_here: ($) =>
-      seq(
-        field("operator", choice($._dless, $._dlessdash)),
-        optional($._horizontal_layout),
-        field("end", $.here_end),
-      ),
-
-    _dless: ($) =>
-      seq(alias($._dless_operator_lexeme, $.dless), $._dless_commit),
-    _dlessdash: ($) =>
-      seq(
-        alias($._dlessdash_operator_lexeme, $.dlessdash),
-        $._dlessdash_commit,
-      ),
-    here_end: ($) =>
-      seq(
-        $._here_end_begin,
-        field("word", alias($._here_end_source_word, $.word)),
-        $._here_end_commit,
+      choice(
+        hereDocumentRedirect(
+          $,
+          alias($._dless_operator_lexeme, $.dless),
+          $.here_end,
+        ),
+        hereDocumentRedirect(
+          $,
+          alias($._dlessdash_operator_lexeme, $.dlessdash),
+          alias($._here_end_strip, $.here_end),
+        ),
       ),
+    here_end: ($) => hereEnd($, $._here_end_begin),
+    _here_end_strip: ($) => hereEnd($, $._here_end_strip_begin),
 
     _here_end_source_word: ($) =>
       seq($._word_initial_part, repeat($._word_part)),
@@ -1703,18 +1730,22 @@ export default grammar({
         repeat1(field("document", $.here_document)),
         $._here_document_sequence_end,
       ),
+    _here_document_prefix: ($) =>
+      seq(
+        $._here_document_body_start,
+        optional(field("body", $.here_document_body)),
+      ),
+
+    _quoted_here_document_prefix: ($) =>
+      seq(
+        $._quoted_here_document_body_start,
+        optional(field("body", $.quoted_here_document_body)),
+      ),
+
     here_document: ($) =>
       choice(
-        seq(
-          $._here_document_body_start,
-          optional(field("body", $.here_document_body)),
-          field("end", $.here_document_end),
-        ),
-        seq(
-          $._quoted_here_document_body_start,
-          optional(field("body", $.quoted_here_document_body)),
-          field("end", $.here_document_end),
-        ),
+        seq($._here_document_prefix, field("end", $.here_document_end)),
+        seq($._quoted_here_document_prefix, field("end", $.here_document_end)),
       ),
 
     here_document_end: ($) =>
@@ -1896,11 +1927,19 @@ export default grammar({
       doubleQuoted($, $._word_initial_dq_open),
     _word_initial_dollar_single_quoted: ($) =>
       dollarSingleQuoted($, $._word_initial_dollar_sq_dollar),
+    _word_initial_braced_parameter_start: ($) =>
+      dollarExpansionStart(
+        $,
+        $._parameter_open,
+        "{",
+        $._word_initial_dollar_expansion_start,
+      ),
     _word_initial_parameter_expansion: ($) =>
       parameterExpansion(
         $,
-        $._braced_parameter_expansion,
+        $.parameter_word,
         $._word_initial_dollar_expansion_start,
+        "_word_initial",
       ),
     _word_initial_command_start: ($) =>
       dollarExpansionStart(
@@ -1909,8 +1948,10 @@ export default grammar({
         "(",
         $._word_initial_dollar_expansion_start,
       ),
+    _word_initial_command_substitution_prefix: ($) =>
+      seq($._word_initial_command_start, $._command_substitution_body_begin),
     _word_initial_command_substitution: ($) =>
-      commandSubstitution($, $._word_initial_command_start),
+      commandSubstitution($, $._word_initial_command_substitution_prefix),
     _word_initial_arithmetic_start: ($) =>
       arithmeticExpansionStart(
         $,
@@ -2000,10 +2041,7 @@ export default grammar({
       choice(
         ...wordPatternSpecialSources($),
         $.pattern_bracket_range_source,
-        $.pattern_bracket_character_source,
-        $._pattern_operator_bracket_character,
-        $.pattern_bracket_hyphen_source,
-        ...structuredSourceParts($),
+        ...patternBracketPlainAtoms($, $.pattern_bracket_character_source),
       ),
 
     _parameter_pattern_bracket_member: ($) =>
@@ -2013,13 +2051,13 @@ export default grammar({
           $._parameter_pattern_bracket_range,
           $.pattern_bracket_range_source,
         ),
-        alias(
-          $._parameter_pattern_bracket_character,
-          $.pattern_bracket_character_source,
+        ...patternBracketPlainAtoms(
+          $,
+          alias(
+            $._parameter_pattern_bracket_character,
+            $.pattern_bracket_character_source,
+          ),
         ),
-        $._pattern_operator_bracket_character,
-        $.pattern_bracket_hyphen_source,
-        ...structuredSourceParts($),
       ),
 
     pattern_bracket_range_source: ($) =>
@@ -2039,23 +2077,20 @@ export default grammar({
 
     _pattern_bracket_range_endpoint: ($) =>
       choice(
-        $.pattern_bracket_character_source,
-        $._pattern_operator_bracket_character,
+        ...patternBracketPlainAtoms($, $.pattern_bracket_character_source),
         $.pattern_collating_symbol_source,
-        $.pattern_bracket_hyphen_source,
-        ...structuredSourceParts($),
       ),
 
     _parameter_pattern_bracket_range_endpoint: ($) =>
       choice(
-        alias(
-          $._parameter_pattern_bracket_character,
-          $.pattern_bracket_character_source,
+        ...patternBracketPlainAtoms(
+          $,
+          alias(
+            $._parameter_pattern_bracket_character,
+            $.pattern_bracket_character_source,
+          ),
         ),
-        $._pattern_operator_bracket_character,
         parameterPatternCollatingSymbolSource($),
-        $.pattern_bracket_hyphen_source,
-        ...structuredSourceParts($),
       ),
 
     pattern_bracket_character_source: ($) =>
@@ -2147,35 +2182,13 @@ export default grammar({
     dollar_single_quote_escape: ($) =>
       lexical($, $._dollar_single_quote_escape_begin),
 
-    parameter_expansion: ($) =>
-      parameterExpansion($, $._braced_parameter_expansion),
+    _braced_parameter_start: ($) =>
+      dollarExpansionStart($, $._parameter_open, "{"),
+    ...parameterHeaderRules(),
+    parameter_expansion: ($) => parameterExpansion($, $.parameter_word),
 
     _double_quoted_parameter_expansion: ($) =>
-      parameterExpansion($, $._double_quoted_braced_parameter_expansion),
-
-    _braced_parameter_expansion: ($) =>
-      bracedParameterExpansion($, $._parameter_expansion_tail),
-
-    _double_quoted_braced_parameter_expansion: ($) =>
-      bracedParameterExpansion($, $._double_quoted_parameter_expansion_tail),
-
-    _parameter_expansion_tail: ($) =>
-      choice(
-        physical($, $._parameter_close, "}"),
-        $._parameter_operator_expansion_tail,
-      ),
-
-    _parameter_operator_expansion_tail: ($) =>
-      parameterOperatorTail($, $.parameter_word),
-
-    _double_quoted_parameter_expansion_tail: ($) =>
-      choice(
-        physical($, $._parameter_close, "}"),
-        $._double_quoted_parameter_operator_expansion_tail,
-      ),
-
-    _double_quoted_parameter_operator_expansion_tail: ($) =>
-      parameterOperatorTail(
+      parameterExpansion(
         $,
         alias($._double_quoted_parameter_word, $.parameter_word),
       ),
@@ -2221,9 +2234,19 @@ export default grammar({
     _parameter_length_operator: ($) =>
       alias($._special_parameter_hash_lexeme, $.parameter_length_operator),
     _parameter_value_operator: ($) =>
-      alias($._parameter_value_operator_lexeme, $.parameter_value_operator),
+      wholeSource(
+        $,
+        $._parameter_value_operator_begin,
+        $._parameter_value_operator_lexeme,
+        $.parameter_value_operator,
+      ),
     _parameter_pattern_operator: ($) =>
-      alias($._parameter_pattern_operator_lexeme, $.parameter_pattern_operator),
+      wholeSource(
+        $,
+        $._parameter_pattern_operator_begin,
+        $._parameter_pattern_operator_lexeme,
+        $.parameter_pattern_operator,
+      ),
     parameter_word: ($) => parameterPatternSource($),
 
     _double_quoted_parameter_word: ($) =>
@@ -2234,13 +2257,7 @@ export default grammar({
         alias($._double_quoted_parameter_text, $.double_quote_text),
         alias($._double_quoted_parameter_escape, $.double_quote_escape),
         $.double_quoted,
-        alias($._double_quoted_parameter_expansion, $.parameter_expansion),
-        $.command_substitution,
-        $.arithmetic_expansion,
-        alias(
-          $._double_quoted_backquote_substitution,
-          $.backquote_substitution,
-        ),
+        ...quotedExpansionParts($),
       ),
     parameter_pattern: ($) => prec.right(1, parameterPatternSource($)),
 
@@ -2265,8 +2282,10 @@ export default grammar({
 
     _double_quoted_parameter_escape: ($) =>
       lexical($, $._double_quoted_parameter_escape_begin),
+    _command_substitution_prefix: ($) =>
+      seq($._command_substitution_start, $._command_substitution_body_begin),
     command_substitution: ($) =>
-      commandSubstitution($, $._command_substitution_start),
+      commandSubstitution($, $._command_substitution_prefix),
 
     _command_substitution_start: ($) =>
       dollarExpansionStart($, $._command_open, "("),
@@ -2320,13 +2339,7 @@ export default grammar({
 
     _arithmetic_runtime_fragment: ($) =>
       choice(
-        alias($._double_quoted_parameter_expansion, $.parameter_expansion),
-        $.command_substitution,
-        $.arithmetic_expansion,
-        alias(
-          $._double_quoted_backquote_substitution,
-          $.backquote_substitution,
-        ),
+        ...quotedExpansionParts($),
         $.parenthesized_arithmetic_dynamic_source,
       ),
 
@@ -2411,13 +2424,7 @@ export default grammar({
       choice(
         $.arithmetic_number,
         $.arithmetic_variable,
-        alias($._double_quoted_parameter_expansion, $.parameter_expansion),
-        $.command_substitution,
-        $.arithmetic_expansion,
-        alias(
-          $._double_quoted_backquote_substitution,
-          $.backquote_substitution,
-        ),
+        ...quotedExpansionParts($),
         $.parenthesized_arithmetic,
       ),
 
@@ -2467,6 +2474,12 @@ export default grammar({
 
     linebreak: ($) => $.newline_list,
 
+    _linebreak_layout: ($) =>
+      choice(
+        seq($.linebreak, optional($._horizontal_layout)),
+        $._horizontal_layout,
+      ),
+
     _horizontal_layout: ($) => seq(optional($._layout_begin), $._blank),
     _closing_layout: ($) => $._blank,
     _word_separator: ($) => wordSeparator($, $._word_separator_begin),