Author:
Hash:
Timestamp:
+13 -14 +/-3 browse
Kevin Schoon [me@kevinschoon.com]
84ec01162ba42463223cb50f80d1f4c7a56d452a
Tue, 13 May 2025 13:41:41 +0000 (6 months ago)
| 1 | diff --git a/Cargo.lock b/Cargo.lock |
| 2 | index 3404e2c..2a8d76f 100644 |
| 3 | --- a/Cargo.lock |
| 4 | +++ b/Cargo.lock |
| 5 | @@ -2942,6 +2942,7 @@ version = "1.0.140" |
| 6 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 7 | checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" |
| 8 | dependencies = [ |
| 9 | + "indexmap 2.7.1", |
| 10 | "itoa", |
| 11 | "memchr", |
| 12 | "ryu", |
| 13 | @@ -3635,27 +3636,27 @@ dependencies = [ |
| 14 | |
| 15 | [[package]] |
| 16 | name = "tree-sitter" |
| 17 | - version = "0.24.7" |
| 18 | + version = "0.25.4" |
| 19 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 20 | - checksum = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75" |
| 21 | + checksum = "69aff09fea9a41fb061ae6b206cb87cac1b8db07df31be3ba271fbc26760f213" |
| 22 | dependencies = [ |
| 23 | "cc", |
| 24 | "regex", |
| 25 | "regex-syntax 0.8.5", |
| 26 | + "serde_json", |
| 27 | "streaming-iterator", |
| 28 | "tree-sitter-language", |
| 29 | ] |
| 30 | |
| 31 | [[package]] |
| 32 | name = "tree-sitter-highlight" |
| 33 | - version = "0.24.7" |
| 34 | + version = "0.25.4" |
| 35 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 36 | - checksum = "6411813e4a9ebc87d391b98b0f3ce65d5361cd80c54de8651d8b85b555ea5d95" |
| 37 | + checksum = "ba3bdc761dfa6b50677cd1bb23b55571d3902c54671c952f7147da2642e15248" |
| 38 | dependencies = [ |
| 39 | - "lazy_static", |
| 40 | "regex", |
| 41 | "streaming-iterator", |
| 42 | - "thiserror 1.0.69", |
| 43 | + "thiserror 2.0.12", |
| 44 | "tree-sitter", |
| 45 | ] |
| 46 | |
| 47 | diff --git a/ayllu/Cargo.toml b/ayllu/Cargo.toml |
| 48 | index 0678a91..6e14742 100644 |
| 49 | --- a/ayllu/Cargo.toml |
| 50 | +++ b/ayllu/Cargo.toml |
| 51 | @@ -29,7 +29,7 @@ tokio-util = { workspace = true } |
| 52 | serde = { version = "1.0", features = ["derive"] } |
| 53 | comrak = { version = "0.29.0", default-features = false } |
| 54 | url = "2.5.4" |
| 55 | - tree-sitter-highlight = "0.24.3" |
| 56 | + tree-sitter-highlight = "0.25.4" |
| 57 | tokei = "12.1.2" |
| 58 | time = "0.3.41" |
| 59 | time-macros = "0.2.22" |
| 60 | @@ -37,7 +37,7 @@ file-mode = "0.1.2" |
| 61 | lazy_static = "1.5.0" |
| 62 | mime_guess = "2.0.5" |
| 63 | serde_json = "1.0.140" |
| 64 | - tree-sitter = "0.24.7" |
| 65 | + tree-sitter = "0.25.4" |
| 66 | plotters = "0.3.7" |
| 67 | tabwriter = "1.4.1" |
| 68 | libloading = "0.8.6" |
| 69 | diff --git a/ayllu/src/highlight.rs b/ayllu/src/highlight.rs |
| 70 | index caf228f..4b7cb89 100644 |
| 71 | --- a/ayllu/src/highlight.rs |
| 72 | +++ b/ayllu/src/highlight.rs |
| 73 | @@ -307,12 +307,10 @@ impl Highlighter { |
| 74 | let mut renderer = HtmlRenderer::new(); |
| 75 | |
| 76 | renderer |
| 77 | - .render(events, code, &move |highlight| { |
| 78 | - let ret = match self.classes.get(highlight.0) { |
| 79 | - Some(name) => name.as_bytes(), |
| 80 | - None => "".as_bytes(), |
| 81 | - }; |
| 82 | - ret |
| 83 | + .render(events, code, &move |highlight, data| { |
| 84 | + if let Some(name) = self.classes.get(highlight.0) { |
| 85 | + data.write_all(name.as_bytes()).unwrap(); |
| 86 | + } |
| 87 | }) |
| 88 | .unwrap(); |
| 89 |