fixed the $.text node and $.php_node closes #39

EmranMR · Dec 3, 2023 · 8353cbb · 8353cbb
1 parent a54fb1e
commit 8353cbb
Show file tree

Hide file tree

Showing 6 changed files with 127,543 additions and 120,844 deletions.
diff --git a/corpus/conditionals.txt b/corpus/conditionals.txt
@@ -317,10 +317,6 @@ conditional keywords
       (parameter)
       (bracket_end)
       (text)
-      (text)
-      (text)
-      (text)
-      (text)
       (conditional_keyword
         (directive)
         (bracket_start)
@@ -352,10 +348,6 @@ conditional keywords
       (parameter)
       (bracket_end)
       (text)
-      (text)
-      (text)
-      (text)
-      (text)
       (conditional_keyword
         (directive)
         (bracket_start)
@@ -384,10 +376,6 @@ conditional keywords
       (parameter)
       (bracket_end)
       (text)
-      (text)
-      (text)
-      (text)
-      (text)
       (conditional_keyword
         (directive)
         (bracket_start)

diff --git a/corpus/conflicts.txt b/corpus/conflicts.txt
@@ -7,15 +7,6 @@ Orphan Punctuation Marks
 --------------------------------------------------------------------------------
 
 (blade
-  (text)
-  (text)
-  (text)
-  (text)
-  (text)
-  (text)
-  (text)
-  (text)
-  (text)
   (text))
 
 ================================================================================
@@ -33,9 +24,6 @@ test@test.com
 --------------------------------------------------------------------------------
 
 (blade
-  (text)
-  (text)
-  (text)
   (text)
   (conditional
     (directive_start)

diff --git a/grammar.js b/grammar.js
@@ -13,15 +13,10 @@ module.exports = grammar({
                 $._inline_directive,
                 $._nested_directive,
                 $.loop_operator,
-                alias($._text, $.text)
+                $.text
             ),
 
-        comment: ($) =>
-            seq(
-                '{{--',
-                optional(repeat(alias($._text, $.text))),
-                '--}}'
-            ),
+        comment: ($) => seq('{{--', optional($.text), '--}}'),
 
         // !keywords
         keyword: ($) =>
@@ -538,14 +533,11 @@ module.exports = grammar({
             ),
         // !section parameters
         _section_parameter: ($) =>
-            seq(
-                optional(/[\"\']/),
-                alias($._text, $.text),
-                optional(/[\"\']/)
-            ),
+            seq(optional(/[\"\']/), $.text, optional(/[\"\']/)),
 
         // !text definitions
         php_only: ($) => prec.right(repeat1($._text)),
+        text: ($) => prec.right(repeat1($._text)),
         // hidden to reduce AST noise in php_only #39
         // It is selectively unhidden for other areas
         _text: ($) =>

diff --git a/src/grammar.json b/src/grammar.json
@@ -36,13 +36,8 @@
           "name": "loop_operator"
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_text"
-          },
-          "named": true,
-          "value": "text"
+          "type": "SYMBOL",
+          "name": "text"
         }
       ]
     },
@@ -57,16 +52,8 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "REPEAT",
-              "content": {
-                "type": "ALIAS",
-                "content": {
-                  "type": "SYMBOL",
-                  "name": "_text"
-                },
-                "named": true,
-                "value": "text"
-              }
+              "type": "SYMBOL",
+              "name": "text"
             },
             {
               "type": "BLANK"
@@ -2305,13 +2292,8 @@
           ]
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_text"
-          },
-          "named": true,
-          "value": "text"
+          "type": "SYMBOL",
+          "name": "text"
         },
         {
           "type": "CHOICE",
@@ -2338,6 +2320,17 @@
         }
       }
     },
+    "text": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "REPEAT1",
+        "content": {
+          "type": "SYMBOL",
+          "name": "_text"
+        }
+      }
+    },
     "_text": {
       "type": "CHOICE",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -225,7 +225,7 @@
     "named": true,
     "fields": {},
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": false,
       "types": [
         {