Use tree-sitter-java from crates.io

Wilfred · Dec 20, 2024 · d2ed2f6 · d2ed2f6
1 parent 80f0100
commit d2ed2f6
Show file tree

Hide file tree

Showing 56 changed files with 18 additions and 86,120 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,8 @@ with YAML.
 Improved language detection when one argument is a named pipe.
 
 Updated to the latest tree-sitter parser for C, C++, C#, Haskell,
-JavaScript, Objective-C, OCaml, Python, Ruby, Scala and TypeScript.
+Java, JavaScript, Objective-C, OCaml, Python, Ruby, Scala and
+TypeScript.
 
 ### Syntax Highlighting
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -89,6 +89,7 @@ tree-sitter-cpp = "0.23.4"
 tree-sitter-c = "0.23.4"
 tree-sitter-javascript = "0.23.1"
 tree-sitter-typescript = "0.23.2"
+tree-sitter-java = "0.23.4"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

diff --git a/build.rs b/build.rs
@@ -174,11 +174,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-janet-simple-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-java",
-            src_dir: "vendored_parsers/tree-sitter-java-src",
-            extra_files: vec![],
-        },
         TreeSitterParser {
             name: "tree-sitter-json",
             src_dir: "vendored_parsers/tree-sitter-json-src",

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -83,7 +83,6 @@ extern "C" {
     fn tree_sitter_hcl() -> ts::Language;
     fn tree_sitter_html() -> ts::Language;
     fn tree_sitter_janet_simple() -> ts::Language;
-    fn tree_sitter_java() -> ts::Language;
     fn tree_sitter_json() -> ts::Language;
     fn tree_sitter_julia() -> ts::Language;
     fn tree_sitter_kotlin() -> ts::Language;
@@ -573,7 +572,8 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Java => {
-            let language = unsafe { tree_sitter_java() };
+            let language_fn = tree_sitter_java::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec![
@@ -594,11 +594,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/java.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_java::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/java.scm b/vendored_parsers/highlights/java.scm
diff --git a/vendored_parsers/tree-sitter-java-src b/vendored_parsers/tree-sitter-java-src
diff --git a/vendored_parsers/tree-sitter-java/.gitattributes b/vendored_parsers/tree-sitter-java/.gitattributes
diff --git a/vendored_parsers/tree-sitter-java/.github/pull_request_template.md b/vendored_parsers/tree-sitter-java/.github/pull_request_template.md
diff --git a/vendored_parsers/tree-sitter-java/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-java/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-java/.github/workflows/publish_crate.yml b/vendored_parsers/tree-sitter-java/.github/workflows/publish_crate.yml
diff --git a/vendored_parsers/tree-sitter-java/.gitignore b/vendored_parsers/tree-sitter-java/.gitignore
diff --git a/vendored_parsers/tree-sitter-java/.npmignore b/vendored_parsers/tree-sitter-java/.npmignore
diff --git a/vendored_parsers/tree-sitter-java/CMakeLists.txt b/vendored_parsers/tree-sitter-java/CMakeLists.txt
diff --git a/vendored_parsers/tree-sitter-java/CONTRIBUTING.md b/vendored_parsers/tree-sitter-java/CONTRIBUTING.md
diff --git a/vendored_parsers/tree-sitter-java/Cargo.toml b/vendored_parsers/tree-sitter-java/Cargo.toml
diff --git a/vendored_parsers/tree-sitter-java/LICENSE b/vendored_parsers/tree-sitter-java/LICENSE