Merge pull request #225 from calebdw/bump_cli

chore: bump tree-sitter-cli version to 0.21.0

package.json

@@ -22,7 +22,7 @@
     "eslint-config-google": "^0.14.0",
     "node-gyp": "^10.0.1",
     "shelljs": "^0.8.5",
-    "tree-sitter-cli": "^0.20.8"
+    "tree-sitter-cli": "^0.21.0"
   },
   "scripts": {
     "build": "npm run build-php && npm run build-php_only && node-gyp rebuild",
@@ -49,7 +49,10 @@
         "queries/injections.scm",
         "queries/injections-text.scm"
       ],
-      "tags": "queries/tags.scm"
+      "tags": "queries/tags.scm",
+      "external-files": [
+        "common/scanner.h"
+      ]
     }
   ]
 }

php/src/grammar.json

@@ -9192,4 +9192,3 @@
     "_literal"
   ]
 }
-

php_only/src/grammar.json

@@ -9183,4 +9183,3 @@
     "_literal"
   ]
 }
-

queries/highlights.scm

@@ -1,6 +1,21 @@
 (php_tag) @tag
 "?>" @tag
 
+
+; Variables
+
+(relative_scope) @variable.builtin
+
+(variable_name) @variable
+
+((name) @constant
+ (#match? @constant "^_?[A-Z][A-Z\\d_]+$"))
+((name) @constant.builtin
+ (#match? @constant.builtin "^__[A-Z][A-Z\d_]+__$"))
+
+((name) @constructor
+ (#match? @constructor "^[A-Z]"))
+
 ; Types
 
 (primitive_type) @type.builtin
@@ -38,23 +53,6 @@
 (member_access_expression
   name: (name) @property)
 
-; Variables
-
-(relative_scope) @variable.builtin
-
-((name) @constant
- (#match? @constant "^_?[A-Z][A-Z\\d_]+$"))
-((name) @constant.builtin
- (#match? @constant.builtin "^__[A-Z][A-Z\d_]+__$"))
-
-((name) @constructor
- (#match? @constructor "^[A-Z]"))
-
-((name) @variable.builtin
- (#eq? @variable.builtin "this"))
-
-(variable_name) @variable
-
 ; Basic tokens
 [
   (string)
@@ -70,6 +68,9 @@
 (float) @number
 (comment) @comment
 
+((name) @variable.builtin
+ (#eq? @variable.builtin "this"))
+
 "$" @operator
 
 ; Keywords

script/parse-examples

@@ -12,14 +12,14 @@ function clone_repo {
 	path=examples/$name
 	if [ ! -d "$path" ]; then
 		echo "Cloning $owner/$name"
-		git clone "https://github.com/$owner/$name" "$path"
+		git clone --depth 1 "https://github.com/$owner/$name" "$path"
 	fi
 
 	pushd "$path" >/dev/null
 	actual_sha=$(git rev-parse HEAD)
 	if [ "$actual_sha" != "$sha" ]; then
 		echo "Updating $owner/$name to $sha"
-		git fetch
+		git fetch --depth 1 origin "$sha"
 		git reset --hard "$sha"
 	fi
 	popd >/dev/null