Merge pull request #245 from calebdw/string_content

fix: repeated string_content nodes
tree-sitter · May 19, 2024 · 053cf2b · 053cf2b
2 parents 17cca5f + 2b0575b
commit 053cf2b
Show file tree

Hide file tree

Showing 8 changed files with 130,883 additions and 130,738 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -1417,7 +1417,7 @@ module.exports = function defineGrammar(dialect) {
         '\'',
       ),
 
-      string_content: _ => token.immediate(prec(1, /\\?[^'\\]+/)),
+      string_content: _ => prec.right(repeat1(token.immediate(prec(1, /\\?[^'\\]+/)))),
 
       heredoc_body: $ => seq(
         $._new_line,

diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -7294,13 +7294,20 @@
       ]
     },
     "string_content": {
-      "type": "IMMEDIATE_TOKEN",
+      "type": "PREC_RIGHT",
+      "value": 0,
       "content": {
-        "type": "PREC",
-        "value": 1,
+        "type": "REPEAT1",
         "content": {
-          "type": "PATTERN",
-          "value": "\\\\?[^'\\\\]+"
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "PREC",
+            "value": 1,
+            "content": {
+              "type": "PATTERN",
+              "value": "\\\\?[^'\\\\]+"
+            }
+          }
         }
       }
     },

diff --git a/php/src/node-types.json b/php/src/node-types.json
@@ -4455,6 +4455,11 @@
       ]
     }
   },
+  {
+    "type": "string_content",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "subscript_expression",
     "named": true,
@@ -5506,11 +5511,11 @@
   },
   {
     "type": "float",
-    "named": false
+    "named": true
   },
   {
     "type": "float",
-    "named": true
+    "named": false
   },
   {
     "type": "fn",
@@ -5676,10 +5681,6 @@
     "type": "string",
     "named": false
   },
-  {
-    "type": "string_content",
-    "named": true
-  },
   {
     "type": "switch",
     "named": false