Use tree-sitter-ruby from crates.io

Wilfred · Dec 20, 2024 · a9ed8bf · a9ed8bf
1 parent 79bdf87
commit a9ed8bf
Show file tree

Hide file tree

Showing 51 changed files with 16 additions and 469,393 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -79,6 +79,7 @@ smallvec = "1.13.2"
 tree-sitter-language = "0.1.3"
 streaming-iterator = "0.1.9"
 tree-sitter-haskell = "0.23.1"
+tree-sitter-ruby = "0.23.1"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

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

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -106,7 +106,6 @@ extern "C" {
     fn tree_sitter_qmljs() -> ts::Language;
     fn tree_sitter_r() -> ts::Language;
     fn tree_sitter_racket() -> ts::Language;
-    fn tree_sitter_ruby() -> ts::Language;
     fn tree_sitter_rust() -> ts::Language;
     fn tree_sitter_scala() -> ts::Language;
     fn tree_sitter_scheme() -> ts::Language;
@@ -944,7 +943,8 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Ruby => {
-            let language = unsafe { tree_sitter_ruby() };
+            let language_fn = tree_sitter_ruby::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec!["string", "heredoc_body", "regex"]
@@ -959,11 +959,8 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
                     ("begin", "end"),
                     ("class", "end"),
                 ],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/ruby.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_ruby::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/ruby.scm b/vendored_parsers/highlights/ruby.scm
diff --git a/vendored_parsers/tree-sitter-ruby-src b/vendored_parsers/tree-sitter-ruby-src
diff --git a/vendored_parsers/tree-sitter-ruby/.gitattributes b/vendored_parsers/tree-sitter-ruby/.gitattributes
diff --git a/vendored_parsers/tree-sitter-ruby/.github/pull_request_template.md b/vendored_parsers/tree-sitter-ruby/.github/pull_request_template.md
diff --git a/vendored_parsers/tree-sitter-ruby/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-ruby/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-ruby/.gitignore b/vendored_parsers/tree-sitter-ruby/.gitignore
diff --git a/vendored_parsers/tree-sitter-ruby/.gitmodules b/vendored_parsers/tree-sitter-ruby/.gitmodules
diff --git a/vendored_parsers/tree-sitter-ruby/.npmignore b/vendored_parsers/tree-sitter-ruby/.npmignore
diff --git a/vendored_parsers/tree-sitter-ruby/Cargo.toml b/vendored_parsers/tree-sitter-ruby/Cargo.toml
diff --git a/vendored_parsers/tree-sitter-ruby/LICENSE b/vendored_parsers/tree-sitter-ruby/LICENSE
diff --git a/vendored_parsers/tree-sitter-ruby/Makefile b/vendored_parsers/tree-sitter-ruby/Makefile
diff --git a/vendored_parsers/tree-sitter-ruby/README.md b/vendored_parsers/tree-sitter-ruby/README.md
diff --git a/vendored_parsers/tree-sitter-ruby/binding.gyp b/vendored_parsers/tree-sitter-ruby/binding.gyp
diff --git a/vendored_parsers/tree-sitter-ruby/bindings/c/tree-sitter.h.in b/vendored_parsers/tree-sitter-ruby/bindings/c/tree-sitter.h.in
diff --git a/vendored_parsers/tree-sitter-ruby/bindings/c/tree-sitter.pc.in b/vendored_parsers/tree-sitter-ruby/bindings/c/tree-sitter.pc.in