Fixes bugs in heredoc implementation

tree-sitter · Jun 9, 2022 · 1e03dc3 · 1e03dc3
1 parent 56af3f2
commit 1e03dc3
Show file tree

Hide file tree

Showing 5 changed files with 58,915 additions and 58,675 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1268,7 +1268,7 @@ module.exports = grammar({
         alias('\\u', $.string_value),
         alias("'", $.string_value), // Needed to avoid the edge case "$b'" from breaking parsing by trying to apply the $.string rule for some reason
         alias('<?', $.string_value),
-        alias(token(prec(1, '?>')), $.string_value)
+        alias(token(prec(1, '?>')), $.string_value),
       ),
     ),
 
@@ -1304,8 +1304,17 @@ module.exports = grammar({
         $.heredoc_start,
         seq('"', $.heredoc_start, token.immediate('"'))
       )),
-      field('value', optional($.heredoc_body)),
-      seq($._new_line, field('end_tag', $.heredoc_end)),
+      choice(
+        seq(
+          field('value', $.heredoc_body),
+          $._new_line,
+          field('end_tag', $.heredoc_end),
+        ),
+        seq(
+          field('value', optional($.heredoc_body)),
+          field('end_tag', $.heredoc_end),
+        )
+      ),
     ),
 
     _new_line: $ => token(/\r?\n/),

diff --git a/src/grammar.json b/src/grammar.json
@@ -7200,35 +7200,61 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "value",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "heredoc_body"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        },
-        {
-          "type": "SEQ",
+          "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_new_line"
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "value",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "heredoc_body"
+                  }
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_new_line"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "end_tag",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "heredoc_end"
+                  }
+                }
+              ]
             },
             {
-              "type": "FIELD",
-              "name": "end_tag",
-              "content": {
-                "type": "SYMBOL",
-                "name": "heredoc_end"
-              }
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "value",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "heredoc_body"
+                      },
+                      {
+                        "type": "BLANK"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "FIELD",
+                  "name": "end_tag",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "heredoc_end"
+                  }
+                }
+              ]
             }
           ]
         }