Use tree-sitter-json from crates.io

Wilfred · Dec 20, 2024 · 507b60b · 507b60b
1 parent d9e9b87
commit 507b60b
Show file tree

Hide file tree

Showing 36 changed files with 19 additions and 2,999 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,8 @@ with YAML.
 Improved language detection when one argument is a named pipe.
 
 Updated to the latest tree-sitter parser for Bash, C, C++, C#, Go,
-Haskell, Java, JavaScript, Julia, Objective-C, OCaml, PHP, Python, Ruby,
-Scala and TypeScript.
+Haskell, Java, JavaScript, JSON, Julia, Objective-C, OCaml, PHP,
+Python, Ruby, Scala and TypeScript.
 
 ### Syntax Highlighting
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -94,6 +94,7 @@ tree-sitter-julia = "0.23.1"
 tree-sitter-go = "0.23.4"
 tree-sitter-bash = "0.23.3"
 tree-sitter-php = "0.23.11"
+tree-sitter-json = "0.24.8"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

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

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -81,7 +81,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_json() -> ts::Language;
     fn tree_sitter_kotlin() -> ts::Language;
     fn tree_sitter_latex() -> ts::Language;
     fn tree_sitter_lua() -> ts::Language;
@@ -617,16 +616,15 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Json => {
-            let language = unsafe { tree_sitter_json() };
+            let language_fn = tree_sitter_json::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec!["string"].into_iter().collect(),
                 delimiter_tokens: vec![("{", "}"), ("[", "]")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/json.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_json::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/json.scm b/vendored_parsers/highlights/json.scm
diff --git a/vendored_parsers/tree-sitter-json-src b/vendored_parsers/tree-sitter-json-src
diff --git a/vendored_parsers/tree-sitter-json/.eslintrc.js b/vendored_parsers/tree-sitter-json/.eslintrc.js
diff --git a/vendored_parsers/tree-sitter-json/.gitattributes b/vendored_parsers/tree-sitter-json/.gitattributes
diff --git a/vendored_parsers/tree-sitter-json/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-json/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-json/.github/workflows/lint.yml b/vendored_parsers/tree-sitter-json/.github/workflows/lint.yml
diff --git a/vendored_parsers/tree-sitter-json/.github/workflows/publish.yml b/vendored_parsers/tree-sitter-json/.github/workflows/publish.yml
diff --git a/vendored_parsers/tree-sitter-json/.gitignore b/vendored_parsers/tree-sitter-json/.gitignore
diff --git a/vendored_parsers/tree-sitter-json/.npmignore b/vendored_parsers/tree-sitter-json/.npmignore
diff --git a/vendored_parsers/tree-sitter-json/Cargo.toml b/vendored_parsers/tree-sitter-json/Cargo.toml
diff --git a/vendored_parsers/tree-sitter-json/LICENSE b/vendored_parsers/tree-sitter-json/LICENSE