feat: support typed class constants

tree-sitter · Jan 5, 2024 · 333495e · 333495e
1 parent 657546d
commit 333495e
Show file tree

Hide file tree

Showing 8 changed files with 138,216 additions and 135,791 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -363,6 +363,7 @@ module.exports = function defineGrammar(dialect) {
       _const_declaration: $ => seq(
         optional($.visibility_modifier),
         keyword('const'),
+        optional(field('type', $._type)),
         commaSep1($.const_element),
         $._semicolon,
       ),

diff --git a/common/test/corpus/class.txt b/common/test/corpus/class.txt
@@ -214,6 +214,43 @@ class Foo {
   )
 )
 
+=========================================
+Typed class constants
+=========================================
+
+<?php
+
+class Foo {
+    public const int A = 1;
+    public const ?array A = [];
+    public const bool D = false;
+}
+
+---
+
+(program
+  (php_tag)
+  (class_declaration
+    (name)
+    (declaration_list
+      (const_declaration
+        (visibility_modifier)
+        (union_type (primitive_type))
+        (const_element (name) (integer))
+      )
+      (const_declaration
+        (visibility_modifier)
+        (union_type (optional_type (primitive_type)))
+        (const_element (name) (array_creation_expression))
+      )
+      (const_declaration
+        (visibility_modifier)
+        (union_type (primitive_type))
+        (const_element (name) (boolean))
+      )
+    )
+  )
+)
 
 =========================================
 Final class

diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -1529,6 +1529,22 @@
           "named": false,
           "value": "const"
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "type",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_type"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SEQ",
           "members": [

diff --git a/php/src/node-types.json b/php/src/node-types.json
@@ -1516,6 +1516,16 @@
             "named": true
           }
         ]
+      },
+      "type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "_type",
+            "named": true
+          }
+        ]
       }
     },
     "children": {