Allow enums to use heredocs and double quoted strings

tree-sitter · Jan 6, 2024 · ea40b7b · ea40b7b
1 parent 2f791d9
commit ea40b7b
Show file tree

Hide file tree

Showing 8 changed files with 36,794 additions and 36,732 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -314,7 +314,7 @@ module.exports = function defineGrammar(dialect) {
         optional(field('attributes', $.attribute_list)),
         keyword('case'),
         field('name', $.name),
-        optional(seq('=', field('value', choice($.string, $.integer)))),
+        optional(seq('=', field('value', choice($._string, $.integer)))),
         $._semicolon,
       ),
 

diff --git a/common/test/corpus/declarations.txt b/common/test/corpus/declarations.txt
@@ -391,7 +391,7 @@ class B {
     name: (name)
     parameters: (formal_parameters
       (simple_parameter
-        attributes: (attribute_list 
+        attributes: (attribute_list
           (attribute_group (attribute (name)))
         )
         name: (variable_name (name))
@@ -651,8 +651,10 @@ enum Suit: string
 {
   case Hearts = 'H';
   case Diamonds;
-  case Clubs = 'C';
-  case Spades = 'S';
+  case Clubs = "C";
+  case Spades = <<<TXT
+      S
+      TXT;
 
   // Fulfills the interface contract.
   public function color(): string {
@@ -688,14 +690,12 @@ enum Suit: string
   (enum_declaration
     (name)
     (primitive_type)
-    (enum_declaration_list 
+    (enum_declaration_list
       (enum_case (name) (string (string_value)))
       (enum_case (name))
-      (enum_case (name) (string (string_value)))
-      (enum_case (name) (string (string_value)))
-
+      (enum_case (name) (encapsed_string (string_value)))
+      (enum_case (name) (heredoc (heredoc_start) (heredoc_body (string_value)) (heredoc_end)))
       (comment)
-
       (method_declaration
         (visibility_modifier)
         (name)

diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -1157,7 +1157,7 @@
                     "members": [
                       {
                         "type": "SYMBOL",
-                        "name": "string"
+                        "name": "_string"
                       },
                       {
                         "type": "SYMBOL",

diff --git a/php/src/node-types.json b/php/src/node-types.json
@@ -1833,10 +1833,22 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "encapsed_string",
+            "named": true
+          },
+          {
+            "type": "heredoc",
+            "named": true
+          },
           {
             "type": "integer",
             "named": true
           },
+          {
+            "type": "nowdoc",
+            "named": true
+          },
           {
             "type": "string",
             "named": true