From 771eb8cc856ff20dc46132672ca25be4d97e2f89 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Sun, 8 Sep 2024 22:17:14 +0200 Subject: [PATCH] bump treesitter to 0.23 --- Cargo.lock | 142 +++++++++++++++++----------------------------- Cargo.toml | 31 +++++----- src/html/head.rs | 4 +- src/ts/configs.rs | 114 ++++++++++++++++++------------------- 4 files changed, 128 insertions(+), 163 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0455fdc..61cc921 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,9 +192,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.96" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -964,7 +967,6 @@ dependencies = [ "hayagriva", "hypertext", "katex", - "npezza93-tree-sitter-nix", "once_cell", "pulldown-cmark", "rayon", @@ -976,13 +978,10 @@ dependencies = [ "tree-sitter-highlight", "tree-sitter-html", "tree-sitter-javascript", - "tree-sitter-md", + "tree-sitter-language", "tree-sitter-python", - "tree-sitter-query", "tree-sitter-regex", "tree-sitter-rust", - "tree-sitter-scss", - "tree-sitter-toml-ng", "tree-sitter-typescript", ] @@ -1030,9 +1029,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -1130,16 +1129,6 @@ dependencies = [ "notify", ] -[[package]] -name = "npezza93-tree-sitter-nix" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398a0cd89e29f25d2f2141b05020e475907e39f7e5886f77f528f862586d13b" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "num-traits" version = "0.2.18" @@ -1419,9 +1408,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rstml" @@ -1530,6 +1519,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -1627,18 +1622,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -1682,39 +1677,41 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tree-sitter" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff" dependencies = [ "cc", "regex", + "regex-syntax", + "tree-sitter-language", ] [[package]] name = "tree-sitter-css" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f806f96136762b0121f5fdd7172a3dcd8f42d37a2f23ed7f11b35895e20eb4" +checksum = "8d0018d6b1692a806f9cddaa1e5616951fd58840c39a0b21401b55ab3df12292" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-haskell" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef25a7e6c73cc1cbe0c0b7dbd5406e7b3485b370bd61c5d8d852ae0781f9bf9a" +checksum = "9b92c8a4c4ceaae105621b00624ee8d9029fb23116f400832e4be30d0639d054" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-highlight" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaca0fe34fa96eec6aaa8e63308dbe1bafe65a6317487c287f93938959b21907" +checksum = "395d7a477a4504fd7d5e4d003e0dd41bd5b9c4985d53592a943a8354ec452dae" dependencies = [ "lazy_static", "regex", @@ -1724,101 +1721,68 @@ dependencies = [ [[package]] name = "tree-sitter-html" -version = "0.20.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3492b08a786bf5cc79feb0ef2ff3b115d5174364e0ddfd7860e0b9b088b53" +checksum = "7d52d710a3723360ebade986d3f0ae2aa2c3bcfb87bb1cdf60988ec51c81c40d" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-javascript" -version = "0.21.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080880908cb6e8d03cb9ceaeecec9a3d3a2f4e122e74642509bbb22aaefd991b" +checksum = "59e1f62f8babb640b909f30675d1addeb1f17802f2a4d2af287569753b243977" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] -name = "tree-sitter-md" -version = "0.2.3" +name = "tree-sitter-language" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c3cfd068f2527250bbd8ff407431164e12b17863e7eafb76e311dd3f96965a" -dependencies = [ - "cc", - "tree-sitter", -] +checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57" [[package]] name = "tree-sitter-python" -version = "0.21.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" +checksum = "65661b1a3e24139e2e54207e47d910ab07e28790d78efc7d5dc3a11ce2a110eb" dependencies = [ "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-query" -version = "0.4.0" -source = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?rev=f767fb0#f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0" -dependencies = [ - "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-regex" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff1286fe9651b2797484839ffa37aa76c8618d4ccb6836d7e31765dfd60c0d5" +checksum = "0b9a7087b1cf769c96b7e74414947df067fb6135f04d176fd23be08b9396cc0e" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-rust" -version = "0.21.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" dependencies = [ "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-scss" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33909a9ca86390ebbf3461e9949c4bbe2767d2d024b486306d27616641d4ba24" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml-ng" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d20cd83acf16c02c773f03e76d7b43b19883d4e2ce3652a8f06b5e0da7455" -dependencies = [ - "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-typescript" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4" +checksum = "aecf1585ae2a9dddc2b1d4c0e2140b2ec9876e2a25fd79de47fcf7dae0384685" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c3e40e5..72cfca2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,20 +25,21 @@ serde = { version = "1.0.208", features = ["derive"] } pulldown-cmark = "0.12.0" # Treesitter -tree-sitter = "0.22" -tree-sitter-highlight = "0.22" +tree-sitter = "0.23" +tree-sitter-highlight = "0.23" +tree-sitter-language = "0.1.0" # Treesitter languages -tree-sitter-css = "0.21" -tree-sitter-haskell = "0.21" -tree-sitter-html = "0.20" -tree-sitter-javascript = "0.21" -tree-sitter-md = "0.2" -tree-sitter-nix = { package = "npezza93-tree-sitter-nix", version = "0.0.2" } -tree-sitter-python = "0.21" -tree-sitter-regex = "0.21" -tree-sitter-rust = "0.21" -tree-sitter-scss = "1.0" -tree-sitter-query = { git = "https://github.com/tree-sitter-grammars/tree-sitter-query", rev = "f767fb0" } -tree-sitter-toml-ng = "0.6" -tree-sitter-typescript = "0.21" +tree-sitter-css = "0.23" +tree-sitter-haskell = "0.23" +tree-sitter-html = "0.23" +tree-sitter-javascript = "0.23" +# tree-sitter-md = "0.2" +# tree-sitter-nix = { package = "npezza93-tree-sitter-nix", version = "0.0.2" } +tree-sitter-python = "0.23" +tree-sitter-regex = "0.23" +tree-sitter-rust = "0.23" +# tree-sitter-scss = "1.0" +# tree-sitter-query = { git = "https://github.com/tree-sitter-grammars/tree-sitter-query", rev = "f767fb0" } +# tree-sitter-toml-ng = "0.6" +tree-sitter-typescript = "0.23" diff --git a/src/html/head.rs b/src/html/head.rs index 3b01e93..6a00827 100644 --- a/src/html/head.rs +++ b/src/html/head.rs @@ -13,7 +13,7 @@ pub(crate) fn render_head<'s, 'r>( sack: &'s Sack, title: String, styles: &'s [&str], - js: Option<&'s [String]>, + scripts: Option<&'s [String]>, ) -> impl Renderable + 'r where 's: 'r, @@ -46,7 +46,7 @@ where script { (Raw(JS_RELOAD)) } } - @if let Some(scripts) = js { + @if let Some(scripts) = scripts { @for script in scripts { (emit_tag_script(sack, script)) } diff --git a/src/ts/configs.rs b/src/ts/configs.rs index ab65f80..8133777 100644 --- a/src/ts/configs.rs +++ b/src/ts/configs.rs @@ -73,28 +73,28 @@ static CONFIGS: Lazy> = Lazy::new( // ), language!( "css", - tree_sitter_css::language(), + tree_sitter_css::LANGUAGE.into(), tree_sitter_css::HIGHLIGHTS_QUERY, "", "", ), language!( "haskell", - tree_sitter_haskell::language(), + tree_sitter_haskell::LANGUAGE.into(), tree_sitter_haskell::HIGHLIGHTS_QUERY, tree_sitter_haskell::INJECTIONS_QUERY, tree_sitter_haskell::LOCALS_QUERY, ), language!( "html", - tree_sitter_html::language(), - tree_sitter_html::HIGHLIGHTS_QUERY, - tree_sitter_html::INJECTIONS_QUERY, + tree_sitter_html::LANGUAGE.into(), + "", + "", "", ), language!( "javascript", - tree_sitter_javascript::language(), + tree_sitter_javascript::LANGUAGE.into(), merge![ query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY, @@ -104,7 +104,7 @@ static CONFIGS: Lazy> = Lazy::new( ), language!( "jsx", - tree_sitter_javascript::language(), + tree_sitter_javascript::LANGUAGE.into(), merge![ query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY, @@ -113,75 +113,75 @@ static CONFIGS: Lazy> = Lazy::new( tree_sitter_javascript::INJECTIONS_QUERY, tree_sitter_javascript::LOCALS_QUERY, ), - language!( - "markdown", - tree_sitter_md::language(), - tree_sitter_md::HIGHLIGHT_QUERY_BLOCK, - tree_sitter_md::INJECTION_QUERY_BLOCK, - "", - ), - language!( - "markdown_inline", - tree_sitter_md::inline_language(), - tree_sitter_md::HIGHLIGHT_QUERY_INLINE, - tree_sitter_md::INJECTION_QUERY_INLINE, - "", - ), - language!( - "nix", - tree_sitter_nix::language(), - tree_sitter_nix::HIGHLIGHTS_QUERY, - "", - "", - ), + // language!( + // "markdown", + // tree_sitter_md::language(), + // tree_sitter_md::HIGHLIGHT_QUERY_BLOCK, + // tree_sitter_md::INJECTION_QUERY_BLOCK, + // "", + // ), + // language!( + // "markdown_inline", + // tree_sitter_md::inline_language(), + // tree_sitter_md::HIGHLIGHT_QUERY_INLINE, + // tree_sitter_md::INJECTION_QUERY_INLINE, + // "", + // ), + // language!( + // "nix", + // tree_sitter_nix::language(), + // tree_sitter_nix::HIGHLIGHTS_QUERY, + // "", + // "", + // ), language!( "python", - tree_sitter_python::language(), + tree_sitter_python::LANGUAGE.into(), tree_sitter_python::HIGHLIGHTS_QUERY, "", "", ), language!( "regex", - tree_sitter_regex::language(), + tree_sitter_regex::LANGUAGE.into(), tree_sitter_regex::HIGHLIGHTS_QUERY, "", "", ), language!( "rust", - tree_sitter_rust::language(), + tree_sitter_rust::LANGUAGE.into(), tree_sitter_rust::HIGHLIGHTS_QUERY, tree_sitter_rust::INJECTIONS_QUERY, "", ), - language!( - "scss", - tree_sitter_scss::language(), - merge![ - tree_sitter_css::HIGHLIGHTS_QUERY, - tree_sitter_scss::HIGHLIGHTS_QUERY, - ], - "", - "", - ), - language!( - "query", - tree_sitter_query::language(), - tree_sitter_query::HIGHLIGHTS_QUERY, - tree_sitter_query::INJECTIONS_QUERY, - "", - ), - language!( - "toml", - tree_sitter_toml_ng::language(), - tree_sitter_toml_ng::HIGHLIGHTS_QUERY, - "", - "", - ), + // language!( + // "scss", + // tree_sitter_scss::, + // merge![ + // tree_sitter_css::HIGHLIGHTS_QUERY, + // tree_sitter_scss::HIGHLIGHTS_QUERY, + // ], + // "", + // "", + // ), + // language!( + // "query", + // tree_sitter_query::language(), + // tree_sitter_query::HIGHLIGHTS_QUERY, + // tree_sitter_query::INJECTIONS_QUERY, + // "", + // ), + // language!( + // "toml", + // tree_sitter_toml_ng::language(), + // tree_sitter_toml_ng::HIGHLIGHTS_QUERY, + // "", + // "", + // ), language!( "typescript", - tree_sitter_typescript::language_typescript(), + tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(), merge![ query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY, @@ -195,7 +195,7 @@ static CONFIGS: Lazy> = Lazy::new( ), language!( "tsx", - tree_sitter_typescript::language_tsx(), + tree_sitter_typescript::LANGUAGE_TSX.into(), merge![ query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY,