add tree-sitter-language crate

uros-5 · Aug 27, 2024 · 399b157 · 399b157
1 parent 28c6308
commit 399b157
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/jinja-lsp-nodejs/Cargo.toml b/jinja-lsp-nodejs/Cargo.toml
@@ -18,6 +18,7 @@ jinja-lsp = { path = "../jinja-lsp", version = "0.1.81"}
 tree-sitter = "0.23.0"
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 ropey = "1.5.0"
+tree-sitter-language = "0.1.0"
 
 [build-dependencies]
 napi-build = "2.0.1"

diff --git a/jinja-lsp-queries/Cargo.toml b/jinja-lsp-queries/Cargo.toml
@@ -12,4 +12,5 @@ tree-sitter-rust = "0.21.2"
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 ropey = "1.5.0"
 tree-sitter-python = "=0.23.0"
+tree-sitter-language = "0.1.0"
 
diff --git a/jinja-lsp-queries/src/parsers.rs b/jinja-lsp-queries/src/parsers.rs
@@ -23,15 +23,17 @@ impl Parsers {
     pub fn update_backend(&mut self, lang: &str) {
         if lang == "python" {
             self.backend = Parser::new();
-            let _ = self.backend.set_language(&tree_sitter_python::language());
+            let _ = self
+                .backend
+                .set_language(&tree_sitter_python::LANGUAGE.into());
         }
     }
 }
 
 impl Default for Parsers {
     fn default() -> Self {
         let mut jinja = Parser::new();
-        let _ = jinja.set_language(&tree_sitter_jinja2::language());
+        let _ = jinja.set_language(&tree_sitter_jinja2::LANGUAGE.into());
         let mut backend = Parser::new();
         let _ = backend.set_language(&tree_sitter_rust::language());
         Self { jinja, backend }

diff --git a/jinja-lsp-queries/src/search/queries.rs b/jinja-lsp-queries/src/search/queries.rs
@@ -20,15 +20,20 @@ impl Clone for Queries {
 impl Default for Queries {
     fn default() -> Self {
         Self {
-            jinja_definitions: Query::new(&tree_sitter_jinja2::language(), DEFINITIONS).unwrap(),
-            jinja_objects: Query::new(&tree_sitter_jinja2::language(), OBJECTS).unwrap(),
+            jinja_definitions: Query::new(&tree_sitter_jinja2::LANGUAGE.into(), DEFINITIONS)
+                .unwrap(),
+            jinja_objects: Query::new(&tree_sitter_jinja2::LANGUAGE.into(), OBJECTS).unwrap(),
             backend_definitions: Query::new(&tree_sitter_rust::language(), RUST_DEFINITIONS)
                 .unwrap(),
-            jinja_imports: Query::new(&tree_sitter_jinja2::language(), JINJA_IMPORTS).unwrap(),
+            jinja_imports: Query::new(&tree_sitter_jinja2::LANGUAGE.into(), JINJA_IMPORTS).unwrap(),
             backend_templates: Query::new(&tree_sitter_rust::language(), RUST_TEMPLATES).unwrap(),
-            jinja_snippets: Query::new(&tree_sitter_jinja2::language(), JINJA_SNIPPETS).unwrap(),
-            python_identifiers: Query::new(&tree_sitter_python::language(), PYTHON_IDENTIFIERS)
+            jinja_snippets: Query::new(&tree_sitter_jinja2::LANGUAGE.into(), JINJA_SNIPPETS)
                 .unwrap(),
+            python_identifiers: Query::new(
+                &tree_sitter_python::LANGUAGE.into(),
+                PYTHON_IDENTIFIERS,
+            )
+            .unwrap(),
         }
     }
 }
@@ -37,11 +42,11 @@ impl Queries {
     pub fn update_backend(&mut self, lang: &str) {
         if lang == "python" {
             self.backend_templates =
-                Query::new(&tree_sitter_python::language(), PYTHON_TEMPLATES).unwrap();
+                Query::new(&tree_sitter_python::LANGUAGE.into(), PYTHON_TEMPLATES).unwrap();
             self.backend_definitions =
-                Query::new(&tree_sitter_python::language(), PYTHON_DEFINITIONS).unwrap();
+                Query::new(&tree_sitter_python::LANGUAGE.into(), PYTHON_DEFINITIONS).unwrap();
             self.python_identifiers =
-                Query::new(&tree_sitter_python::language(), PYTHON_IDENTIFIERS).unwrap();
+                Query::new(&tree_sitter_python::LANGUAGE.into(), PYTHON_IDENTIFIERS).unwrap();
         }
     }
 }

diff --git a/jinja-lsp/Cargo.toml b/jinja-lsp/Cargo.toml
@@ -32,3 +32,4 @@ anyhow = "1.0.75"
 tree-sitter-jinja2 = "0.0.9"
 tree-sitter-rust = "^0.21.2"
 jinja-lsp-queries = { path = "../jinja-lsp-queries", version = "0.1.81"}
+tree-sitter-language = "0.1.0"