fix: use grammar field to reference PHP rules, regenerate with late…

…st master, remove reset function
claytonrcarter · May 5, 2024 · 8f22b14 · 8f22b14
1 parent f285e33
commit 8f22b14
Show file tree

Hide file tree

Showing 9 changed files with 960 additions and 918 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1,4 +1,4 @@
-const PHP = require('tree-sitter-php/php/grammar');
+const PHP = require('tree-sitter-php/php/grammar').grammar;
 
 // PHPDoc reference: https://docs.phpdoc.org/3.0/guide/references/phpdoc/index.html
 // PHPDoc tags: https://docs.phpdoc.org/3.0/guide/references/phpdoc/tags/index.html#tag-reference

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
   },
   "homepage": "https://github.com/claytonrcarter/tree-sitter-phpdoc#readme",
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.7",
-    "tree-sitter-php": "^0.21.1"
+    "tree-sitter-cli": "^0.22.6",
+    "tree-sitter-php": "^0.22.2"
   },
   "dependencies": {
     "nan": "^2.15.0"

diff --git a/src/grammar.json b/src/grammar.json
@@ -2026,7 +2026,7 @@
     },
     "name": {
       "type": "PATTERN",
-      "value": "[_a-zA-Z\\u00A1-\\u00ff][_a-zA-Z\\u00A1-\\u00ff\\d]*"
+      "value": "[_a-zA-Z\\u0080-\\u009f\\u00a1-\\u200a\\u200c-\\u205f\\u2061-\\ufefe\\uff00-\\uffff][_a-zA-Z\\u0080-\\u009f\\u00a1-\\u200a\\u200c-\\u205f\\u2061-\\ufefe\\uff00-\\uffff\\d]*"
     },
     "named_type": {
       "type": "CHOICE",
@@ -2722,4 +2722,3 @@
   "inline": [],
   "supertypes": []
 }
-