Switch to tree-sitter-xml

Author: pokey

Makefile

@@ -1,6 +1,6 @@
 # For generating .wasm files for parsers
 # See https://www.npmjs.com/package/web-tree-sitter
-LANGUAGES = agda bash c c-sharp clojure cpp css elm elixir go haskell hcl html java javascript json julia kotlin latex lua markdown nix perl php python query ruby rust scala scss sparql swift talon tsx typescript yaml
+LANGUAGES = agda bash c c-sharp clojure cpp css elm elixir go haskell hcl html java javascript json julia kotlin latex lua markdown nix perl php python query ruby rust scala scss sparql swift talon tsx typescript xml yaml
 
 # Build web-tree-sitter parsers for $(LANGUAGES)
 
@@ -32,6 +32,11 @@ parsers/tree-sitter-tsx.wasm: node_modules/tree-sitter-typescript/tsx/package.js
 	npx tree-sitter build-wasm $(dir $^)
 	mv $(notdir $@) $@
 
+parsers/tree-sitter-xml.wasm: node_modules/tree-sitter-xml/tree-sitter-xml/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 $^)

package.json

@@ -127,6 +127,7 @@
     "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",
     "typescript": "^4.5.5"
   },

src/extension.ts

@@ -50,7 +50,7 @@ const languages: {
   terraform: { module: "tree-sitter-hcl" },
   typescript: { module: "tree-sitter-typescript" },
   typescriptreact: { module: "tree-sitter-tsx" },
-  xml: { module: "tree-sitter-html" },
+  xml: { module: "tree-sitter-xml" },
   yaml: { module: "tree-sitter-yaml" },
 };
 

yarn.lock

@@ -1842,7 +1842,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-nan@^2.11.1, nan@^2.12.1, nan@^2.14.0, nan@^2.14.1, nan@^2.14.2, nan@^2.15.0, nan@^2.16.0, nan@^2.17.0:
+nan@^2.11.1, nan@^2.12.1, nan@^2.14.0, nan@^2.14.1, nan@^2.14.2, nan@^2.15.0, nan@^2.16.0, nan@^2.17.0, nan@^2.18.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
   integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
@@ -2871,6 +2871,12 @@ tree-sitter-sparql@^0.1.0:
   dependencies:
     nan "^2.14.0"
 
+"tree-sitter-xml@github:ObserverOfTime/tree-sitter-xml#dd7ef38c74d8430da729b4da815e4c40776e03bb":
+  version "0.2.0"
+  resolved "https://codeload.github.com/ObserverOfTime/tree-sitter-xml/tar.gz/dd7ef38c74d8430da729b4da815e4c40776e03bb"
+  dependencies:
+    nan "^2.18.0"
+
 tree-sitter-yaml@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/tree-sitter-yaml/-/tree-sitter-yaml-0.5.0.tgz#c617ba72837399d8105ec10cdb4c360e1ed76076"