Use tree-sitter-bash from crates.io

Wilfred · Dec 20, 2024 · f9d663e · f9d663e
1 parent 7e8974e
commit f9d663e
Show file tree

Hide file tree

Showing 51 changed files with 20 additions and 238,341 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,9 @@ with YAML.
 
 Improved language detection when one argument is a named pipe.
 
-Updated to the latest tree-sitter parser for C, C++, C#, Go, Haskell,
-Java, JavaScript, Julia, Objective-C, OCaml, Python, Ruby, Scala and
-TypeScript.
+Updated to the latest tree-sitter parser for Bash, C, C++, C#, Go,
+Haskell, Java, JavaScript, Julia, 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
@@ -92,6 +92,7 @@ tree-sitter-typescript = "0.23.2"
 tree-sitter-java = "0.23.4"
 tree-sitter-julia = "0.23.1"
 tree-sitter-go = "0.23.4"
+tree-sitter-bash = "0.23.3"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

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

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -63,7 +63,6 @@ pub(crate) struct TreeSitterConfig {
 extern "C" {
     fn tree_sitter_ada() -> ts::Language;
     fn tree_sitter_apex() -> ts::Language;
-    fn tree_sitter_bash() -> ts::Language;
     fn tree_sitter_clojure() -> ts::Language;
     fn tree_sitter_cmake() -> ts::Language;
     fn tree_sitter_commonlisp() -> ts::Language;
@@ -163,18 +162,17 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Bash => {
-            let language = unsafe { tree_sitter_bash() };
+            let language_fn = tree_sitter_bash::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec!["string", "raw_string", "heredoc_body"]
                     .into_iter()
                     .collect(),
                 delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/bash.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_bash::HIGHLIGHT_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/bash.scm b/vendored_parsers/highlights/bash.scm
diff --git a/vendored_parsers/tree-sitter-bash-src b/vendored_parsers/tree-sitter-bash-src
diff --git a/vendored_parsers/tree-sitter-bash/.eslintrc.js b/vendored_parsers/tree-sitter-bash/.eslintrc.js
diff --git a/vendored_parsers/tree-sitter-bash/.gitattributes b/vendored_parsers/tree-sitter-bash/.gitattributes
diff --git a/vendored_parsers/tree-sitter-bash/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-bash/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-bash/.github/workflows/fuzz.yml b/vendored_parsers/tree-sitter-bash/.github/workflows/fuzz.yml
diff --git a/vendored_parsers/tree-sitter-bash/.github/workflows/lint.yml b/vendored_parsers/tree-sitter-bash/.github/workflows/lint.yml
diff --git a/vendored_parsers/tree-sitter-bash/.github/workflows/pack.yml b/vendored_parsers/tree-sitter-bash/.github/workflows/pack.yml