Switch to tree-sitter-rust-orchard

wetneb · wetneb · commit 49f2c6251bfd · 2025-09-11T14:05:04.000+02:00
Offers better attachment of attributes and doc comments and supports newer language constructs. Closes #35.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -100,7 +100,7 @@ tree-sitter-pascal = "0.10.0"
 tree-sitter-php = "0.23.11"
 tree-sitter-python = "0.23.5"
 tree-sitter-ruby = "0.23.1"
-tree-sitter-rust = "0.23.2"
+tree-sitter-rust-orchard = "0.12.0"
 tree-sitter-scala = "0.23.3"
 tree-sitter-swift = "0.7.0"
 tree-sitter-toml-ng = "0.7.0"
diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -917,15 +917,18 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Rust => {
-            let language_fn = tree_sitter_rust::LANGUAGE;
+            let language_fn = tree_sitter_rust_orchard::LANGUAGE;
             let language = tree_sitter::Language::new(language_fn);
 
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: ["char_literal", "string_literal"].into_iter().collect(),
                 delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("|", "|"), ("<", ">")],
-                highlight_query: ts::Query::new(&language, tree_sitter_rust::HIGHLIGHTS_QUERY)
-                    .unwrap(),
+                highlight_query: ts::Query::new(
+                    &language,
+                    tree_sitter_rust_orchard::HIGHLIGHTS_QUERY,
+                )
+                .unwrap(),
                 sub_languages: vec![],
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -917,15 +917,18 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {`
`917`	`917`	`}`
`918`	`918`	`}`
`919`	`919`	`Rust => {`
`920`		`- let language_fn = tree_sitter_rust::LANGUAGE;`
	`920`	`+ let language_fn = tree_sitter_rust_orchard::LANGUAGE;`
`921`	`921`	`let language = tree_sitter::Language::new(language_fn);`
`922`	`922`
`923`	`923`	`TreeSitterConfig {`
`924`	`924`	`language: language.clone(),`
`925`	`925`	`atom_nodes: ["char_literal", "string_literal"].into_iter().collect(),`
`926`	`926`	`delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("\|", "\|"), ("<", ">")],`
`927`		`- highlight_query: ts::Query::new(&language, tree_sitter_rust::HIGHLIGHTS_QUERY)`
`928`		`- .unwrap(),`
	`927`	`+ highlight_query: ts::Query::new(`
	`928`	`+ &language,`
	`929`	`+ tree_sitter_rust_orchard::HIGHLIGHTS_QUERY,`
	`930`	`+ )`
	`931`	`+ .unwrap(),`
`929`	`932`	`sub_languages: vec![],`
`930`	`933`	`}`
`931`	`934`	`}`