tree-sitter-sh 0.11.0 → 0.12.0

package/grammar.js

@@ -821,6 +821,8 @@ export default grammar({
     $._quoted_here_document_body_start,
     $._quoted_here_document_end_begin,
     $._quoted_here_document_end_text,
+    $._quoted_here_document_text,
+    $._quoted_here_document_text_run_begin,
     $._here_document_end_begin,
     $._here_document_end_leading_tabs,
     $._here_document_end_commit,
@@ -861,8 +863,10 @@ export default grammar({
     $._command_substitution_body_begin,
     $._subshell_close,
     $._word_bracket_literal_start,
+    $._assignment_bracket_literal_start,
     $._parameter_bracket_literal_start,
     $._word_bracket_fallback_end,
+    $._assignment_bracket_fallback_end,
     $._parameter_bracket_fallback_end,
     $._pattern_bracket_character_token,
     $._parameter_pattern_bracket_character_token,
@@ -1500,9 +1504,18 @@ export default grammar({
         choice(
           seq(
             $._quoted_here_document_end_begin,
-            optional($._here_document_end_leading_tabs),
-            optional(
-              alias($._quoted_here_document_end_text, $.here_document_end_text),
+            repeat(
+              choice(
+                $._here_document_end_leading_tabs,
+                $._line_continuation,
+                seq(
+                  optional($._quoted_here_document_text_run_begin),
+                  alias(
+                    $._quoted_here_document_end_text,
+                    $.here_document_end_text,
+                  ),
+                ),
+              ),
             ),
           ),
           seq(
@@ -1581,9 +1594,16 @@ export default grammar({
       token.immediate(seq("\\", /[^\\\n$`]/)),
 
     quoted_here_document_body: ($) =>
-      repeat1(choice($.quoted_here_document_text, $._newline)),
-
-    quoted_here_document_text: (_) => token.immediate(prec(-1, /[^\n]+/)),
+      repeat1(
+        choice(
+          seq(
+            optional($._quoted_here_document_text_run_begin),
+            alias($._quoted_here_document_text, $.quoted_here_document_text),
+          ),
+          $._line_continuation,
+          $._newline,
+        ),
+      ),
 
     assignment_word: ($) =>
       prec.dynamic(
@@ -1636,10 +1656,21 @@ export default grammar({
     _assignment_word_part: ($) =>
       choice(
         $._assignment_non_delimiter_part,
-        $._word_incomplete_bracket_literal,
+        $._assignment_incomplete_bracket_literal,
         prec(-1, alias($._literal_slash, $.literal)),
       ),
 
+    _assignment_incomplete_bracket_literal: ($) =>
+      incompleteBracketLiteral(
+        $,
+        $._assignment_bracket_literal_start,
+        choice(
+          $._word_incomplete_bracket_literal_part,
+          prec(-1, $._pattern_special_literal_left),
+        ),
+        $._assignment_bracket_fallback_end,
+      ),
+
     _assignment_literal: ($) => prec.right(assignmentPlainChunk($)),
 
     _assignment_colon_part: ($) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-sh",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "type": "module",
   "description": "Tree-sitter grammar for POSIX sh.",
   "license": "MIT",

package/src/grammar.json

@@ -3528,33 +3528,46 @@
                   "name": "_quoted_here_document_end_begin"
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "_here_document_end_leading_tabs"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "ALIAS",
-                      "content": {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
                         "type": "SYMBOL",
-                        "name": "_quoted_here_document_end_text"
+                        "name": "_here_document_end_leading_tabs"
                       },
-                      "named": true,
-                      "value": "here_document_end_text"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                      {
+                        "type": "SYMBOL",
+                        "name": "_line_continuation"
+                      },
+                      {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "CHOICE",
+                            "members": [
+                              {
+                                "type": "SYMBOL",
+                                "name": "_quoted_here_document_text_run_begin"
+                              },
+                              {
+                                "type": "BLANK"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "ALIAS",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "_quoted_here_document_end_text"
+                            },
+                            "named": true,
+                            "value": "here_document_end_text"
+                          }
+                        ]
+                      }
+                    ]
+                  }
                 }
               ]
             },
@@ -3963,9 +3976,35 @@
       "content": {
         "type": "CHOICE",
         "members": [
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_quoted_here_document_text_run_begin"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_quoted_here_document_text"
+                },
+                "named": true,
+                "value": "quoted_here_document_text"
+              }
+            ]
+          },
           {
             "type": "SYMBOL",
-            "name": "quoted_here_document_text"
+            "name": "_line_continuation"
           },
           {
             "type": "SYMBOL",
@@ -3974,17 +4013,6 @@
         ]
       }
     },
-    "quoted_here_document_text": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "PREC",
-        "value": -1,
-        "content": {
-          "type": "PATTERN",
-          "value": "[^\\n]+"
-        }
-      }
-    },
     "assignment_word": {
       "type": "PREC_DYNAMIC",
       "value": 3,
@@ -4200,7 +4228,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "_word_incomplete_bracket_literal"
+          "name": "_assignment_incomplete_bracket_literal"
         },
         {
           "type": "PREC",
@@ -4217,6 +4245,52 @@
         }
       ]
     },
+    "_assignment_incomplete_bracket_literal": {
+      "type": "PREC_DYNAMIC",
+      "value": -2,
+      "content": {
+        "type": "PREC_RIGHT",
+        "value": 1,
+        "content": {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_assignment_bracket_literal_start"
+              },
+              "named": true,
+              "value": "literal"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_word_incomplete_bracket_literal_part"
+                  },
+                  {
+                    "type": "PREC",
+                    "value": -1,
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "_pattern_special_literal_left"
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_assignment_bracket_fallback_end"
+            }
+          ]
+        }
+      }
+    },
     "_assignment_literal": {
       "type": "PREC_RIGHT",
       "value": 0,
@@ -13443,6 +13517,14 @@
       "type": "SYMBOL",
       "name": "_quoted_here_document_end_text"
     },
+    {
+      "type": "SYMBOL",
+      "name": "_quoted_here_document_text"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "_quoted_here_document_text_run_begin"
+    },
     {
       "type": "SYMBOL",
       "name": "_here_document_end_begin"
@@ -13639,6 +13721,10 @@
       "type": "SYMBOL",
       "name": "_word_bracket_literal_start"
     },
+    {
+      "type": "SYMBOL",
+      "name": "_assignment_bracket_literal_start"
+    },
     {
       "type": "SYMBOL",
       "name": "_parameter_bracket_literal_start"
@@ -13647,6 +13733,10 @@
       "type": "SYMBOL",
       "name": "_word_bracket_fallback_end"
     },
+    {
+      "type": "SYMBOL",
+      "name": "_assignment_bracket_fallback_end"
+    },
     {
       "type": "SYMBOL",
       "name": "_parameter_bracket_fallback_end"

package/src/node-types.json

@@ -2999,6 +2999,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "line_continuation",
+          "named": true
+        },
         {
           "type": "quoted_here_document_text",
           "named": true