Adds support for trailing comma in parameter and clousure use lists a…

…s per PHP 8.0
tree-sitter · Apr 13, 2021 · 59cef2b · 59cef2b
1 parent c307ec4
commit 59cef2b
Show file tree

Hide file tree

Showing 4 changed files with 36,521 additions and 36,131 deletions.
diff --git a/grammar.js b/grammar.js
@@ -375,6 +375,7 @@ module.exports = grammar({
     formal_parameters: $ => seq(
       '(',
       commaSep(choice($.simple_parameter, $.variadic_parameter)),
+      optional(','),
       ')'
     ),
 
@@ -773,6 +774,7 @@ module.exports = grammar({
       keyword('use'),
       '(',
       commaSep1(seq(optional('&'), $.variable_name)),
+      optional(','),
       ')'
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1689,6 +1689,18 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": ")"
@@ -3768,6 +3780,18 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": ")"