From 13eec7fd1fec4e6e74de0d40bc54d033745176e6 Mon Sep 17 00:00:00 2001 From: i582 <51853996+i582@users.noreply.github.com> Date: Sat, 18 Oct 2025 12:19:03 +0400 Subject: [PATCH 1/2] feat(tree-sitter-tolk): add Rust bindings --- .../tolk/tree-sitter-tolk/.gitignore | 2 - .../tolk/tree-sitter-tolk/Cargo.toml | 26 ++++++++++ .../tree-sitter-tolk/bindings/rust/build.rs | 43 +++++++++++++++ .../tree-sitter-tolk/bindings/rust/lib.rs | 52 +++++++++++++++++++ 4 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 server/src/languages/tolk/tree-sitter-tolk/Cargo.toml create mode 100644 server/src/languages/tolk/tree-sitter-tolk/bindings/rust/build.rs create mode 100644 server/src/languages/tolk/tree-sitter-tolk/bindings/rust/lib.rs diff --git a/server/src/languages/tolk/tree-sitter-tolk/.gitignore b/server/src/languages/tolk/tree-sitter-tolk/.gitignore index b1b6d9be..82e1c743 100644 --- a/server/src/languages/tolk/tree-sitter-tolk/.gitignore +++ b/server/src/languages/tolk/tree-sitter-tolk/.gitignore @@ -1,3 +1 @@ -bindings/rust -Cargo.toml tmp.tolk diff --git a/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml b/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml new file mode 100644 index 00000000..356649ea --- /dev/null +++ b/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "tree-sitter-tolk" +description = "tolk grammar for the tree-sitter parsing library" +version = "0.0.1" +keywords = ["incremental", "parsing", "tolk"] +categories = ["parsing", "text-editors"] +repository = "https://github.com/tree-sitter/tree-sitter-tolk" +edition = "2018" +license = "MIT" + +build = "bindings/rust/build.rs" +include = [ + "bindings/rust/*", + "grammar.js", + "queries/*", + "src/*", +] + +[lib] +path = "bindings/rust/lib.rs" + +[dependencies] +tree-sitter = "~0.20.10" + +[build-dependencies] +cc = "1.0" diff --git a/server/src/languages/tolk/tree-sitter-tolk/bindings/rust/build.rs b/server/src/languages/tolk/tree-sitter-tolk/bindings/rust/build.rs new file mode 100644 index 00000000..4cc26f5e --- /dev/null +++ b/server/src/languages/tolk/tree-sitter-tolk/bindings/rust/build.rs @@ -0,0 +1,43 @@ +fn main() { + let src_dir = std::path::Path::new("src"); + + let mut c_config = cc::Build::new(); + c_config.include(&src_dir); + c_config + .flag_if_supported("-Wno-unused-parameter") + .flag_if_supported("-Wno-unused-but-set-variable") + .flag_if_supported("-Wno-trigraphs"); + #[cfg(target_env = "msvc")] + c_config.flag("-utf-8"); + + let parser_path = src_dir.join("parser.c"); + c_config.file(&parser_path); + + // If your language uses an external scanner written in C, + // then include this block of code: + + /* + let scanner_path = src_dir.join("scanner.c"); + c_config.file(&scanner_path); + println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap()); + */ + + c_config.compile("parser"); + println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap()); + + // If your language uses an external scanner written in C++, + // then include this block of code: + + /* + let mut cpp_config = cc::Build::new(); + cpp_config.cpp(true); + cpp_config.include(&src_dir); + cpp_config + .flag_if_supported("-Wno-unused-parameter") + .flag_if_supported("-Wno-unused-but-set-variable"); + let scanner_path = src_dir.join("scanner.cc"); + cpp_config.file(&scanner_path); + cpp_config.compile("scanner"); + println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap()); + */ +} diff --git a/server/src/languages/tolk/tree-sitter-tolk/bindings/rust/lib.rs b/server/src/languages/tolk/tree-sitter-tolk/bindings/rust/lib.rs new file mode 100644 index 00000000..75213572 --- /dev/null +++ b/server/src/languages/tolk/tree-sitter-tolk/bindings/rust/lib.rs @@ -0,0 +1,52 @@ +//! This crate provides tolk language support for the [tree-sitter][] parsing library. +//! +//! Typically, you will use the [language][language func] function to add this language to a +//! tree-sitter [Parser][], and then use the parser to parse some code: +//! +//! ``` +//! let code = ""; +//! let mut parser = tree_sitter::Parser::new(); +//! parser.set_language(tree_sitter_tolk::language()).expect("Error loading tolk grammar"); +//! let tree = parser.parse(code, None).unwrap(); +//! ``` +//! +//! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html +//! [language func]: fn.language.html +//! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html +//! [tree-sitter]: https://tree-sitter.github.io/ + +use tree_sitter::Language; + +extern "C" { + fn tree_sitter_tolk() -> Language; +} + +/// Get the tree-sitter [Language][] for this grammar. +/// +/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html +pub fn language() -> Language { + unsafe { tree_sitter_tolk() } +} + +/// The content of the [`node-types.json`][] file for this grammar. +/// +/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types +pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json"); + +// Uncomment these to include any queries that this grammar contains + +// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm"); +// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm"); +// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm"); +// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm"); + +#[cfg(test)] +mod tests { + #[test] + fn test_can_load_grammar() { + let mut parser = tree_sitter::Parser::new(); + parser + .set_language(super::language()) + .expect("Error loading tolk language"); + } +} From 391d9c587640131576e96b2dd9ec3314016ae381 Mon Sep 17 00:00:00 2001 From: i582 <51853996+i582@users.noreply.github.com> Date: Sat, 18 Oct 2025 12:22:40 +0400 Subject: [PATCH 2/2] fix --- server/src/languages/tolk/tree-sitter-tolk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml b/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml index 356649ea..f68ae8df 100644 --- a/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml +++ b/server/src/languages/tolk/tree-sitter-tolk/Cargo.toml @@ -20,7 +20,7 @@ include = [ path = "bindings/rust/lib.rs" [dependencies] -tree-sitter = "~0.20.10" +tree-sitter = "~0.25.10" [build-dependencies] cc = "1.0"