Use tree-sitter-lua from crates.io

Wilfred · Dec 20, 2024 · cef0b56 · cef0b56
1 parent a6eb339
commit cef0b56
Show file tree

Hide file tree

Showing 57 changed files with 19 additions and 21,353 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#, CSS,
-Go, Haskell, HTML, Java, JavaScript, JSON, Julia, Objective-C, OCaml,
-PHP, Python, Ruby, Scala, TOML and TypeScript.
+Go, Haskell, HTML, Java, JavaScript, JSON, Julia, Lua, Objective-C,
+OCaml, PHP, Python, Ruby, Scala, TOML and TypeScript.
 
 ### Syntax Highlighting
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,6 +98,7 @@ tree-sitter-json = "0.24.8"
 tree-sitter-html = "0.23.2"
 tree-sitter-css = "0.23.1"
 tree-sitter-toml-ng = "0.7.0"
+tree-sitter-lua = "0.2.0"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

diff --git a/build.rs b/build.rs
@@ -162,11 +162,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-latex-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-lua",
-            src_dir: "vendored_parsers/tree-sitter-lua-src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-make",
             src_dir: "vendored_parsers/tree-sitter-make-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_janet_simple() -> ts::Language;
     fn tree_sitter_kotlin() -> ts::Language;
     fn tree_sitter_latex() -> ts::Language;
-    fn tree_sitter_lua() -> ts::Language;
     fn tree_sitter_make() -> ts::Language;
     fn tree_sitter_newick() -> ts::Language;
     fn tree_sitter_nix() -> ts::Language;
@@ -683,18 +682,17 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Lua => {
-            let language = unsafe { tree_sitter_lua() };
+            let language_fn = tree_sitter_lua::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec!["string"].into_iter().collect(),
                 delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")]
                     .into_iter()
                     .collect(),
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/lua.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_lua::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/lua.scm b/vendored_parsers/highlights/lua.scm
diff --git a/vendored_parsers/tree-sitter-lua-src b/vendored_parsers/tree-sitter-lua-src
diff --git a/vendored_parsers/tree-sitter-lua/.editorconfig b/vendored_parsers/tree-sitter-lua/.editorconfig
diff --git a/vendored_parsers/tree-sitter-lua/.gitattributes b/vendored_parsers/tree-sitter-lua/.gitattributes
diff --git a/vendored_parsers/tree-sitter-lua/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-lua/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-lua/.github/workflows/publish.yml b/vendored_parsers/tree-sitter-lua/.github/workflows/publish.yml
diff --git a/vendored_parsers/tree-sitter-lua/.gitignore b/vendored_parsers/tree-sitter-lua/.gitignore
diff --git a/vendored_parsers/tree-sitter-lua/.prettierignore b/vendored_parsers/tree-sitter-lua/.prettierignore
diff --git a/vendored_parsers/tree-sitter-lua/.prettierrc.json b/vendored_parsers/tree-sitter-lua/.prettierrc.json
diff --git a/vendored_parsers/tree-sitter-lua/Cargo.toml b/vendored_parsers/tree-sitter-lua/Cargo.toml
diff --git a/vendored_parsers/tree-sitter-lua/LICENSE.md b/vendored_parsers/tree-sitter-lua/LICENSE.md