Bump tree-sitter to 0.21 (#84)

* broken

* Changes for tree-sitter 0.21

* More bumps

* Properly await parser load

Author: pokey

Makefile

@@ -9,37 +9,42 @@ parsers: $(addprefix parsers/tree-sitter-,$(addsuffix .wasm,$(LANGUAGES)))
 
 parsers/%.wasm: node_modules/%/package.json
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
 	mv $(notdir $@) $@
 
 parsers/tree-sitter-elm.wasm: node_modules/@elm-tooling/tree-sitter-elm/package.json
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
 	mv $(notdir $@) $@
 
 parsers/tree-sitter-markdown.wasm: node_modules/tree-sitter-markdown/tree-sitter-markdown/grammar.js
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
 	mv $(notdir $@) $@
 
 parsers/tree-sitter-typescript.wasm: node_modules/tree-sitter-typescript/typescript/package.json
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
 	mv $(notdir $@) $@
 
 parsers/tree-sitter-tsx.wasm: node_modules/tree-sitter-typescript/tsx/package.json
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
 	mv $(notdir $@) $@
 
-parsers/tree-sitter-xml.wasm: node_modules/tree-sitter-xml/tree-sitter-xml/package.json
+parsers/tree-sitter-xml.wasm: node_modules/tree-sitter-xml/xml/package.json
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
+	mv $(notdir $@) $@
+
+parsers/tree-sitter-php.wasm: node_modules/tree-sitter-php/php/package.json
+	mkdir -p $(dir $@)
+	npx tree-sitter build --wasm $(dir $^)
 	mv $(notdir $@) $@
 
 parsers/tree-sitter-c-sharp.wasm: node_modules/tree-sitter-c-sharp/package.json
 	mkdir -p $(dir $@)
-	npx tree-sitter build-wasm $(dir $^)
+	npx tree-sitter build --wasm $(dir $^)
 	mv tree-sitter-c_sharp.wasm $@
 
 

package.json

@@ -97,41 +97,41 @@
     "eslint-config-prettier": "^9.0.0",
     "tree-sitter-agda": "github:pokey/tree-sitter-agda#e5fba6cabe8c7fc7993ced2b86704f3841215284",
     "tree-sitter-bash": "github:tree-sitter/tree-sitter-bash#7331995b19b8f8aba2d5e26deb51d2195c18bc94",
-    "tree-sitter-c": "^0.19.0",
+    "tree-sitter-c": "github:tree-sitter/tree-sitter-c#deca017a554045b4c203e7ddff39ae64ff05e071",
     "tree-sitter-c-sharp": "^0.19.0",
-    "tree-sitter-cli": "^0.20.1",
+    "tree-sitter-cli": "^0.22.6",
     "tree-sitter-clojure": "github:sogaiu/tree-sitter-clojure#master",
-    "tree-sitter-cpp": "^0.19.0",
+    "tree-sitter-cpp": "github:tree-sitter/tree-sitter-cpp#9d412ba7e597fe158f209da33e60f31b1f0df967",
     "tree-sitter-css": "^0.19.0",
     "tree-sitter-elixir": "github:elixir-lang/tree-sitter-elixir#b20eaa75565243c50be5e35e253d8beb58f45d56",
     "tree-sitter-gleam": "github:gleam-lang/tree-sitter-gleam#2012f294baacf30e7a62414754021284377366c6",
     "tree-sitter-go": "github:tree-sitter/tree-sitter-go#bbaa67a180cfe0c943e50c55130918be8efb20bd",
-    "tree-sitter-haskell": "github:tree-sitter/tree-sitter-haskell#dd924b8df1eb76261f009e149fc6f3291c5081c2",
+    "tree-sitter-haskell": "github:tree-sitter/tree-sitter-haskell#a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19",
     "tree-sitter-hcl": "github:MichaHoffmann/tree-sitter-hcl#e135399cb31b95fac0760b094556d1d5ce84acf0",
-    "tree-sitter-html": "^0.19.0",
+    "tree-sitter-html": "github:tree-sitter/tree-sitter-html#e4d834eb4918df01dcad5c27d1b15d56e3bd94cd",
     "tree-sitter-java": "github:tree-sitter/tree-sitter-java#ac14b4b1884102839455d32543ab6d53ae089ab7",
-    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#5720b249490b3c17245ba772f6be4a43edb4e3b7",
+    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#391a8fcc48a11f63bf18ec9885f6f069e760949a",
     "tree-sitter-json": "github:tree-sitter/tree-sitter-json#3fef30de8aee74600f25ec2e319b62a1a870d51e",
     "tree-sitter-julia": "github:tree-sitter/tree-sitter-julia#e2f449e2bcc95f1d07ceb62d67f986005f73a6be",
-    "tree-sitter-kotlin": "github:fwcd/tree-sitter-kotlin#a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569",
+    "tree-sitter-kotlin": "github:fwcd/tree-sitter-kotlin#c9cb8504b81684375e7beb8907517dbd6947a1be",
     "tree-sitter-latex": "github:latex-lsp/tree-sitter-latex#1666e9780de42a31b1376d32fbe8332e8dd5850f",
     "tree-sitter-lua": "github:MunifTanjim/tree-sitter-lua#9668709211b2e683f27f414454a8b51bf0a6bda1",
-    "tree-sitter-markdown": "github:MDeiml/tree-sitter-markdown#272e080bca0efd19a06a7f4252d746417224959e",
+    "tree-sitter-markdown": "github:tree-sitter-grammars/tree-sitter-markdown#7fe453beacecf02c86f7736439f238f5bb8b5c9b",
     "tree-sitter-nix": "github:nix-community/tree-sitter-nix#66e3e9ce9180ae08fc57372061006ef83f0abde7",
     "tree-sitter-perl": "github:ganezdragon/tree-sitter-perl#3d3a95ee6645d7bcd993e77b252ffd33fd297c8e",
-    "tree-sitter-php": "github:tree-sitter/tree-sitter-php#0ce134234214427b6aeb2735e93a307881c6cd6f",
-    "tree-sitter-python": "github:tree-sitter/tree-sitter-python#de221eccf9a221f5b85474a553474a69b4b5784d",
+    "tree-sitter-php": "github:tree-sitter/tree-sitter-php#4f124bc6075e1c3333e80190c1c170933ed72c95",
+    "tree-sitter-python": "github:tree-sitter/tree-sitter-python#71778c2a472ed00a64abf4219544edbf8e4b86d7",
     "tree-sitter-query": "github:nvim-treesitter/tree-sitter-query#5217c6805c09f8fc00ed13d17d5fcb791437aee6",
-    "tree-sitter-ruby": "github:tree-sitter/tree-sitter-ruby#1ebfdb288842dae5a9233e2509a135949023dd82",
+    "tree-sitter-ruby": "github:tree-sitter/tree-sitter-ruby#dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b",
     "tree-sitter-rust": "github:tree-sitter/tree-sitter-rust#36ae187ed6dd3803a8a89dbb54f3124c8ee74662",
     "tree-sitter-scala": "github:tree-sitter/tree-sitter-scala#master",
     "tree-sitter-scss": "github:serenadeai/tree-sitter-scss#c478c6868648eff49eb04a4df90d703dc45b312a",
     "tree-sitter-sparql": "^0.1.0",
     "tree-sitter-swift": "github:alex-pinkus/tree-sitter-swift#7e4ccc97a25315022a70b730085deccd5680a39b",
-    "tree-sitter-talon": "github:wenkokke/tree-sitter-talon#dafc9fabf7acc1a46d51cce379cec00c07661aa7",
-    "tree-sitter-typescript": "github:tree-sitter/tree-sitter-typescript#286e90c32060032225f636a573d0e999f7766c97",
-    "tree-sitter-xml": "github:ObserverOfTime/tree-sitter-xml#dd7ef38c74d8430da729b4da815e4c40776e03bb",
-    "tree-sitter-yaml": "^0.5.0",
+    "tree-sitter-talon": "github:pokey/tree-sitter-talon#f69923ea2490530babe105f0a36434e4a23e127e",
+    "tree-sitter-typescript": "github:tree-sitter/tree-sitter-typescript#4ad3010c91d700026d036b5230e2d99ba94ae8a4",
+    "tree-sitter-xml": "github:ObserverOfTime/tree-sitter-xml#648183d86f6f8ffb240ea11b4c6873f6f45d8b67",
+    "tree-sitter-yaml": "github:tree-sitter-grammars/tree-sitter-yaml#7b03feefd36b5f155465ca736c6304aca983b267",
     "typescript": "^4.5.5"
   },
   "dependencies": {

src/extension.ts

@@ -91,6 +91,7 @@ export async function activate(context: vscode.ExtensionContext) {
     }
 
     const wasm = path.relative(process.cwd(), absolute);
+    await initParser;
     const lang = await Parser.Language.load(wasm);
     const parser = new Parser();
     parser.setLanguage(lang);
@@ -202,11 +203,7 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.workspace.onDidOpenTextDocument(openIfVisible)
   );
   // Don't wait for the initial color, it takes too long to inspect the themes and causes VSCode extension host to hang
-  async function activateLazily() {
-    await initParser;
-    colorAllOpen();
-  }
-  activateLazily();
+  colorAllOpen();
 
   function getTreeForUri(uri: vscode.Uri) {
     const ret = trees[uri.toString()];

tree-sitter-version

@@ -1 +1 @@
-6bbb50bef8249e6460e7d69e42cc8146622fa4fd
+604d38e6b327ed33877e1285680b505b9484a71c