fix: escape brace in regex

tree-sitter · Mar 10, 2024 · 2128072 · 2128072
1 parent 365fd18
commit 2128072
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,13 +10,13 @@ license = "MIT"
 
 build = "bindings/rust/build.rs"
 include = [
-    "common",
-    "bindings/rust",
-    "php/grammar.js",
-    "php/src",
-    "php_only/grammar.js",
-    "php_only/src",
-    "queries",
+	"common",
+	"bindings/rust",
+	"php/grammar.js",
+	"php/src",
+	"php_only/grammar.js",
+	"php_only/src",
+	"queries",
 ]
 
 [lib]

diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
@@ -16,7 +16,7 @@ fn main() {
         php_only_dir.join("parser.c"),
         php_only_dir.join("scanner.c"),
     ] {
-        c_config.file(&path);
+        c_config.file(path);
         println!("cargo:rerun-if-changed={}", path.to_str().unwrap());
     }
 

diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -1310,7 +1310,7 @@ module.exports = function defineGrammar(dialect) {
           '`',
           /[0-7]{1,3}/,
           /x[0-9A-Fa-f]{1,2}/,
-          /u{[0-9A-Fa-f]+}/,
+          /u\{[0-9A-Fa-f]+\}/,
         ),
       )),
 

diff --git a/package.json b/package.json
@@ -15,10 +15,11 @@
   },
   "homepage": "https://github.com/tree-sitter/tree-sitter-php#readme",
   "dependencies": {
-    "nan": "^2.18.0"
+    "nan": "^2.19.0",
+    "tree-sitter": "^0.20.6"
   },
   "devDependencies": {
-    "eslint": ">=8.54.0",
+    "eslint": ">=8.57.0",
     "eslint-config-google": "^0.14.0",
     "node-gyp": "^10.0.1",
     "shelljs": "^0.8.5",
@@ -42,7 +43,9 @@
   "tree-sitter": [
     {
       "scope": "source.php",
-      "file-types": ["php"],
+      "file-types": [
+        "php"
+      ],
       "path": "php",
       "highlights": "queries/highlights.scm",
       "injections": [

diff --git a/php/package.json b/php/package.json
@@ -3,13 +3,18 @@
   "tree-sitter": [
     {
       "scope": "source.php",
-      "file-types": ["php"],
+      "file-types": [
+        "php"
+      ],
       "highlights": "../queries/highlights.scm",
       "injections": [
         "../queries/injections.scm",
         "../queries/injections-text.scm"
       ],
-      "tags": "../queries/tags.scm"
+      "tags": "../queries/tags.scm",
+      "external-files": [
+        "../common/scanner.h"
+      ]
     }
   ]
 }
diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -7081,7 +7081,7 @@
               },
               {
                 "type": "PATTERN",
-                "value": "u{[0-9A-Fa-f]+}"
+                "value": "u\\{[0-9A-Fa-f]+\\}"
               }
             ]
           }

diff --git a/php/src/parser.c b/php/src/parser.c
@@ -1,7 +1,6 @@
 #include "tree_sitter/parser.h"
 
 #if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
@@ -144079,10 +144078,12 @@ unsigned tree_sitter_php_external_scanner_serialize(void *, char *);
 void tree_sitter_php_external_scanner_deserialize(void *, const char *, unsigned);
 
 #ifdef _WIN32
-#define extern __declspec(dllexport)
+#define TS_PUBLIC __declspec(dllexport)
+#else
+#define TS_PUBLIC __attribute__((visibility("default")))
 #endif
 
-extern const TSLanguage *tree_sitter_php(void) {
+TS_PUBLIC const TSLanguage *tree_sitter_php() {
   static const TSLanguage language = {
     .version = LANGUAGE_VERSION,
     .symbol_count = SYMBOL_COUNT,

diff --git a/php_only/package.json b/php_only/package.json
@@ -3,10 +3,15 @@
   "tree-sitter": [
     {
       "scope": "source.php",
-      "file-types": ["php"],
+      "file-types": [
+        "php"
+      ],
       "highlights": "../queries/highlights.scm",
       "injections": "../queries/injections.scm",
-      "tags": "../queries/tags.scm"
+      "tags": "../queries/tags.scm",
+      "external-files": [
+        "../common/scanner.h"
+      ]
     }
   ]
 }
diff --git a/php_only/src/grammar.json b/php_only/src/grammar.json
@@ -7076,7 +7076,7 @@
               },
               {
                 "type": "PATTERN",
-                "value": "u{[0-9A-Fa-f]+}"
+                "value": "u\\{[0-9A-Fa-f]+\\}"
               }
             ]
           }

diff --git a/php_only/src/parser.c b/php_only/src/parser.c
@@ -1,7 +1,6 @@
 #include "tree_sitter/parser.h"
 
 #if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
@@ -133228,10 +133227,12 @@ unsigned tree_sitter_php_only_external_scanner_serialize(void *, char *);
 void tree_sitter_php_only_external_scanner_deserialize(void *, const char *, unsigned);
 
 #ifdef _WIN32
-#define extern __declspec(dllexport)
+#define TS_PUBLIC __declspec(dllexport)
+#else
+#define TS_PUBLIC __attribute__((visibility("default")))
 #endif
 
-extern const TSLanguage *tree_sitter_php_only(void) {
+TS_PUBLIC const TSLanguage *tree_sitter_php_only() {
   static const TSLanguage language = {
     .version = LANGUAGE_VERSION,
     .symbol_count = SYMBOL_COUNT,
-Original file line number
+Diff line change
@@ Expand Up / @@ -7081,7 +7081,7 @@ @@
                   },
                   {
                     "type": "PATTERN",
-                    "value": "u{[0-9A-Fa-f]+}"
+                    "value": "u\\{[0-9A-Fa-f]+\\}"
                   }
                 ]
               }
@@ Expand Down @@