grapheme clustering and width correction

This commit is contained in:
ParkerTenBroeck 2026-01-14 15:01:48 -05:00
parent d9e291e0ff
commit 0bc1be8061
3 changed files with 30 additions and 4 deletions

17
Cargo.lock generated
View file

@ -23,6 +23,8 @@ version = "0.1.0"
dependencies = [
"serde",
"serde_with",
"unicode-display-width",
"unicode-segmentation",
]
[[package]]
@ -494,12 +496,27 @@ dependencies = [
"time-core",
]
[[package]]
name = "unicode-display-width"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a43273b656140aa2bb8e65351fe87c255f0eca706b2538a9bd4a590a3490bf3"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "unicode-ident"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
[[package]]
name = "unicode-segmentation"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "wasm-bindgen"
version = "0.2.106"

View file

@ -6,6 +6,8 @@ edition = "2024"
[dependencies]
serde = { version = "1.0", features = ["derive"], optional = true}
serde_with = { version = "3.0", features = ["default"], optional = true}
unicode-display-width = "*"
unicode-segmentation = "*"
[features]
default = []

View file

@ -1,5 +1,8 @@
use std::fmt::Display;
use unicode_display_width::width;
use unicode_segmentation::UnicodeSegmentation;
use crate::loader::Span;
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
@ -226,13 +229,17 @@ impl<'a> Display for LogEntryDisplay<'a> {
for _ in 0..padding + 3 {
write!(f, " ")?;
}
for char in line.chars() {
for grapheme in line.graphemes(true) {
if (span.0..span.1).contains(&index) {
for _ in 0..width(grapheme){
write!(f, "~")?;
}
} else {
for _ in 0..width(grapheme){
write!(f, " ")?;
}
index += char.len_utf8();
}
index += grapheme.len();
}
write!(f, "{RESET}")?;
index += '\n'.len_utf8();