Use tree-sitter-yaml from crates.io

Wilfred · Dec 21, 2024 · dfcb26c · dfcb26c
1 parent dda6433
commit dfcb26c
Show file tree

Hide file tree

Showing 45 changed files with 19 additions and 60,908 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Parsing
 
-Updated to the latest tree-sitter parser for Make.
+Updated to the latest tree-sitter parser for Make and YAML.
 
 ## 0.62 (released 20th December 2024)
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -97,6 +97,7 @@ tree-sitter-toml-ng = "0.7.0"
 tree-sitter-lua = "0.2.0"
 tree-sitter-xml = "0.7.0"
 tree-sitter-make = "1.1.1"
+tree-sitter-yaml = "0.7.0"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

diff --git a/build.rs b/build.rs
@@ -242,11 +242,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-vhdl-src",
             extra_files: vec![],
         },
-        TreeSitterParser {
-            name: "tree-sitter-yaml",
-            src_dir: "vendored_parsers/tree-sitter-yaml-src",
-            extra_files: vec!["scanner.cc"],
-        },
         TreeSitterParser {
             name: "tree-sitter-zig",
             src_dir: "vendored_parsers/tree-sitter-zig-src",

diff --git a/manual/src/languages_supported.md b/manual/src/languages_supported.md
@@ -71,5 +71,5 @@ with `difft --list-languages`.
 | SCSS     | [serenadeai/tree-sitter-scss](https://github.com/serenadeai/tree-sitter-scss)                     |
 | TOML     | [tree-sitter-grammars/tree-sitter-toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) |
 | XML      | [tree-sitter-grammars/tree-sitter-xml](https://github.com/tree-sitter-grammars/tree-sitter-xml)   |
-| YAML     | [ikatyang/tree-sitter-yaml](https://github.com/ikatyang/tree-sitter-yaml)                         |
+| YAML     | [tree-sitter-grammars/tree-sitter-yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) |
 
diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -96,7 +96,6 @@ extern "C" {
     fn tree_sitter_sql() -> ts::Language;
     fn tree_sitter_swift() -> ts::Language;
     fn tree_sitter_vhdl() -> ts::Language;
-    fn tree_sitter_yaml() -> ts::Language;
     fn tree_sitter_zig() -> ts::Language;
 }
 
@@ -1093,7 +1092,9 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Yaml => {
-            let language = unsafe { tree_sitter_yaml() };
+            let language_fn = tree_sitter_yaml::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec![
@@ -1105,11 +1106,8 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
                 .into_iter()
                 .collect(),
                 delimiter_tokens: (vec![("{", "}"), ("(", ")"), ("[", "]")]),
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/yaml.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_yaml::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/yaml.scm b/vendored_parsers/highlights/yaml.scm
diff --git a/vendored_parsers/tree-sitter-yaml-src b/vendored_parsers/tree-sitter-yaml-src
diff --git a/vendored_parsers/tree-sitter-yaml/.editorconfig b/vendored_parsers/tree-sitter-yaml/.editorconfig
diff --git a/vendored_parsers/tree-sitter-yaml/.gitattributes b/vendored_parsers/tree-sitter-yaml/.gitattributes
diff --git a/vendored_parsers/tree-sitter-yaml/.gitignore b/vendored_parsers/tree-sitter-yaml/.gitignore
diff --git a/vendored_parsers/tree-sitter-yaml/.gitmodules b/vendored_parsers/tree-sitter-yaml/.gitmodules
diff --git a/vendored_parsers/tree-sitter-yaml/.npmignore b/vendored_parsers/tree-sitter-yaml/.npmignore
diff --git a/vendored_parsers/tree-sitter-yaml/.travis.yml b/vendored_parsers/tree-sitter-yaml/.travis.yml
diff --git a/vendored_parsers/tree-sitter-yaml/CHANGELOG.md b/vendored_parsers/tree-sitter-yaml/CHANGELOG.md
diff --git a/vendored_parsers/tree-sitter-yaml/LICENSE b/vendored_parsers/tree-sitter-yaml/LICENSE
diff --git a/vendored_parsers/tree-sitter-yaml/README.md b/vendored_parsers/tree-sitter-yaml/README.md
diff --git a/vendored_parsers/tree-sitter-yaml/binding.gyp b/vendored_parsers/tree-sitter-yaml/binding.gyp
diff --git a/vendored_parsers/tree-sitter-yaml/bindings/node/binding.cc b/vendored_parsers/tree-sitter-yaml/bindings/node/binding.cc