kamov/website
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor: tree-sitter configs

Browse source
This commit is contained in:
Maciej Jur 2024-05-08 21:58:33 +02:00
parent 3d3b091129
commit 8314c2e48d
Signed by: kamov
GPG key ID: 191CBFF5F72ECAFD
3 changed files with 54 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Cargo.lock generated
View file

@ -1230,7 +1230,7 @@ dependencies = [
"pulldown-cmark", "pulldown-cmark",
"regex", "regex",
"serde", "serde",
"tree-sitter 0.22.6", "tree-sitter",
"tree-sitter-css", "tree-sitter-css",
"tree-sitter-haskell", "tree-sitter-haskell",
"tree-sitter-highlight", "tree-sitter-highlight",
@ -1359,16 +1359,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tree-sitter"
version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
dependencies = [
"cc",
"regex",
]
[[package]] [[package]]
name = "tree-sitter" name = "tree-sitter"
version = "0.22.6" version = "0.22.6"
@ -1386,7 +1376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2f806f96136762b0121f5fdd7172a3dcd8f42d37a2f23ed7f11b35895e20eb4" checksum = "e2f806f96136762b0121f5fdd7172a3dcd8f42d37a2f23ed7f11b35895e20eb4"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1396,7 +1386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef25a7e6c73cc1cbe0c0b7dbd5406e7b3485b370bd61c5d8d852ae0781f9bf9a" checksum = "ef25a7e6c73cc1cbe0c0b7dbd5406e7b3485b370bd61c5d8d852ae0781f9bf9a"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1408,17 +1398,17 @@ dependencies = [
"lazy_static", "lazy_static",
"regex", "regex",
"thiserror", "thiserror",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
name = "tree-sitter-html" name = "tree-sitter-html"
version = "0.20.0" version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "017822b6bd42843c4bd67fabb834f61ce23254e866282dd93871350fd6b7fa1d" checksum = "95b3492b08a786bf5cc79feb0ef2ff3b115d5174364e0ddfd7860e0b9b088b53"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.20.10", "tree-sitter",
] ]
[[package]] [[package]]
@ -1428,7 +1418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "080880908cb6e8d03cb9ceaeecec9a3d3a2f4e122e74642509bbb22aaefd991b" checksum = "080880908cb6e8d03cb9ceaeecec9a3d3a2f4e122e74642509bbb22aaefd991b"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1438,7 +1428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c3cfd068f2527250bbd8ff407431164e12b17863e7eafb76e311dd3f96965a" checksum = "d9c3cfd068f2527250bbd8ff407431164e12b17863e7eafb76e311dd3f96965a"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1448,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9" checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1457,7 +1447,7 @@ version = "0.2.1"
source = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?rev=87b1a3d#87b1a3dc6c5a76c5cedcdfc60efe75805468cb90" source = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?rev=87b1a3d#87b1a3dc6c5a76c5cedcdfc60efe75805468cb90"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1467,7 +1457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ff1286fe9651b2797484839ffa37aa76c8618d4ccb6836d7e31765dfd60c0d5" checksum = "5ff1286fe9651b2797484839ffa37aa76c8618d4ccb6836d7e31765dfd60c0d5"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1477,7 +1467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93" checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1487,7 +1477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33909a9ca86390ebbf3461e9949c4bbe2767d2d024b486306d27616641d4ba24" checksum = "33909a9ca86390ebbf3461e9949c4bbe2767d2d024b486306d27616641d4ba24"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1497,7 +1487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "695d20cd83acf16c02c773f03e76d7b43b19883d4e2ce3652a8f06b5e0da7455" checksum = "695d20cd83acf16c02c773f03e76d7b43b19883d4e2ce3652a8f06b5e0da7455"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]
@ -1507,7 +1497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4" checksum = "f07523e51e3b88529360a89038c0cca7ee877db40a40141514eece8b4cddcbb4"
dependencies = [ dependencies = [
"cc", "cc",
"tree-sitter 0.22.6", "tree-sitter",
] ]
[[package]] [[package]]

2
Cargo.toml
View file

@ -34,7 +34,7 @@ tree-sitter-highlight = "0.22"
# tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" } # tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" }
tree-sitter-css = "0.21" tree-sitter-css = "0.21"
tree-sitter-haskell = "0.21" tree-sitter-haskell = "0.21"
tree-sitter-html = "0.20" tree-sitter-html = "0.20.3"
tree-sitter-javascript = "0.21" tree-sitter-javascript = "0.21"
tree-sitter-md = "0.2" tree-sitter-md = "0.2"
tree-sitter-python = "0.21" tree-sitter-python = "0.21"

62
src/ts/configs.rs
View file

@ -16,12 +16,27 @@ macro_rules! query {
}; };
} }
macro_rules! insert {
($_:tt $e:expr) => { $e };
}
macro_rules! merge {
([$($e:expr),+ $(,)?]) => { &format!(concat!($(insert!($e "{} ")),*), $($e),* ) };
($e:expr) => { $e };
}
macro_rules! language { macro_rules! language {
($name:expr, $lang:expr, $highlights:expr, $injections:expr, $locals:expr $(,)?) => { ($name:expr, $lang:expr, $highlights:expr, $injections:expr, $locals:expr $(,)?) => {
( (
$name, $name,
{ {
let mut config = HighlightConfiguration::new($lang, $name, $highlights, $injections, $locals).unwrap(); let mut config = HighlightConfiguration::new(
$lang,
$name,
$highlights,
$injections,
$locals,
).unwrap();
config.configure(captures::NAMES); config.configure(captures::NAMES);
config config
} }
@ -68,34 +83,31 @@ pub static CONFIGS: Lazy<HashMap<&'static str, HighlightConfiguration>> = Lazy::
"", "",
tree_sitter_haskell::LOCALS_QUERY, tree_sitter_haskell::LOCALS_QUERY,
), ),
// ( language!(
// "html", "html",
// config_for( tree_sitter_html::language(),
// tree_sitter_html::language(), tree_sitter_html::HIGHLIGHTS_QUERY,
// "html", tree_sitter_html::INJECTIONS_QUERY,
// tree_sitter_html::HIGHLIGHTS_QUERY, "",
// tree_sitter_html::INJECTIONS_QUERY, ),
// "",
// )
// ),
language!( language!(
"javascript", "javascript",
tree_sitter_javascript::language(), tree_sitter_javascript::language(),
&format!("{} {}", merge!([
query!("ecma/highlights"), query!("ecma/highlights"),
tree_sitter_javascript::HIGHLIGHT_QUERY, tree_sitter_javascript::HIGHLIGHT_QUERY,
), ]),
tree_sitter_javascript::INJECTIONS_QUERY, tree_sitter_javascript::INJECTIONS_QUERY,
tree_sitter_javascript::LOCALS_QUERY, tree_sitter_javascript::LOCALS_QUERY,
), ),
language!( language!(
"jsx", "jsx",
tree_sitter_javascript::language(), tree_sitter_javascript::language(),
&format!("{} {} {}", merge!([
query!("ecma/highlights"), query!("ecma/highlights"),
tree_sitter_javascript::HIGHLIGHT_QUERY, tree_sitter_javascript::HIGHLIGHT_QUERY,
tree_sitter_javascript::JSX_HIGHLIGHT_QUERY, tree_sitter_javascript::JSX_HIGHLIGHT_QUERY,
), ]),
tree_sitter_javascript::INJECTIONS_QUERY, tree_sitter_javascript::INJECTIONS_QUERY,
tree_sitter_javascript::LOCALS_QUERY, tree_sitter_javascript::LOCALS_QUERY,
), ),
@ -130,10 +142,10 @@ pub static CONFIGS: Lazy<HashMap<&'static str, HighlightConfiguration>> = Lazy::
language!( language!(
"scss", "scss",
tree_sitter_scss::language(), tree_sitter_scss::language(),
&format!("{} {}", merge!([
tree_sitter_css::HIGHLIGHTS_QUERY, tree_sitter_css::HIGHLIGHTS_QUERY,
tree_sitter_scss::HIGHLIGHTS_QUERY, tree_sitter_scss::HIGHLIGHTS_QUERY,
), ]),
"", "",
"", "",
), ),
@ -154,31 +166,31 @@ pub static CONFIGS: Lazy<HashMap<&'static str, HighlightConfiguration>> = Lazy::
language!( language!(
"typescript", "typescript",
tree_sitter_typescript::language_typescript(), tree_sitter_typescript::language_typescript(),
&format!("{} {} {}", merge!([
query!("ecma/highlights"), query!("ecma/highlights"),
tree_sitter_javascript::HIGHLIGHT_QUERY, tree_sitter_javascript::HIGHLIGHT_QUERY,
tree_sitter_typescript::HIGHLIGHTS_QUERY, tree_sitter_typescript::HIGHLIGHTS_QUERY,
), ]),
tree_sitter_javascript::INJECTIONS_QUERY, tree_sitter_javascript::INJECTIONS_QUERY,
&format!("{} {}", merge!([
tree_sitter_javascript::LOCALS_QUERY, tree_sitter_javascript::LOCALS_QUERY,
tree_sitter_typescript::LOCALS_QUERY, tree_sitter_typescript::LOCALS_QUERY,
) ])
), ),
language!( language!(
"tsx", "tsx",
tree_sitter_typescript::language_tsx(), tree_sitter_typescript::language_tsx(),
&format!("{} {} {} {}", merge!([
query!("ecma/highlights"), query!("ecma/highlights"),
tree_sitter_javascript::HIGHLIGHT_QUERY, tree_sitter_javascript::HIGHLIGHT_QUERY,
tree_sitter_javascript::JSX_HIGHLIGHT_QUERY, tree_sitter_javascript::JSX_HIGHLIGHT_QUERY,
tree_sitter_typescript::HIGHLIGHTS_QUERY, tree_sitter_typescript::HIGHLIGHTS_QUERY,
), ]),
tree_sitter_javascript::INJECTIONS_QUERY, tree_sitter_javascript::INJECTIONS_QUERY,
&format!("{} {}", merge!([
tree_sitter_javascript::LOCALS_QUERY, tree_sitter_javascript::LOCALS_QUERY,
tree_sitter_typescript::LOCALS_QUERY, tree_sitter_typescript::LOCALS_QUERY,
) ]),
), ),
]) ])
}); });