Merge pull request #236 from calebdw/static_modifier

fix: use $.static_modifier instead of raw string
tree-sitter · Mar 22, 2024 · 29838ad · 29838ad
2 parents 8040208 + 8fc97bb
commit 29838ad
Show file tree

Hide file tree

Showing 10 changed files with 152,901 additions and 152,872 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -958,7 +958,7 @@ module.exports = function defineGrammar(dialect) {
 
       anonymous_function_creation_expression: $ => seq(
         optional(field('attributes', $.attribute_list)),
-        optional(keyword('static')),
+        optional(field('static_modifier', $.static_modifier)),
         keyword('function'),
         optional(field('reference_modifier', $.reference_modifier)),
         field('parameters', $.formal_parameters),

diff --git a/common/test/corpus/expressions.txt b/common/test/corpus/expressions.txt
@@ -669,6 +669,8 @@ header_register_callback(
 ob_start(function($buffer) use (&$storage) { $storage .= $buffer; }, 20);
 ob_start(function($buffer) use (&$storage,) { $storage .= $buffer; }, 20);
 
+static function &($a) { return $a; };
+
 ---
 
 (program
@@ -705,7 +707,19 @@ ob_start(function($buffer) use (&$storage,) { $storage .= $buffer; }, 20);
             body: (compound_statement (expression_statement (augmented_assignment_expression
               left: (variable_name (name))
               right: (variable_name (name)))))))
-        (argument (integer))))))
+        (argument (integer)))))
+  (expression_statement
+    (anonymous_function_creation_expression
+      static_modifier: (static_modifier)
+      reference_modifier: (reference_modifier)
+      parameters: (formal_parameters
+        (simple_parameter
+          name: (variable_name
+            (name))))
+      body: (compound_statement
+        (return_statement
+          (variable_name
+            (name)))))))
 
 
 ================================

diff --git a/common/test/highlight/keywords.php b/common/test/highlight/keywords.php
@@ -50,6 +50,15 @@
 function a() {}
 // <- @keyword
 
+static function a() {}
+// <- @keyword
+
+static function () {}
+// <- @keyword
+
+static fn () => 1;
+// <- @keyword
+
 abstract class A
 // <- @keyword
 //       ^^^^^ @keyword

diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -4945,14 +4945,12 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "static_modifier",
               "content": {
-                "type": "PATTERN",
-                "value": "static",
-                "flags": "i"
-              },
-              "named": false,
-              "value": "static"
+                "type": "SYMBOL",
+                "name": "static_modifier"
+              }
             },
             {
               "type": "BLANK"

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