Corrected general highlighting indices

This commit is contained in:
Xithrius 2023-04-21 22:45:50 -07:00
parent 533b4496fe
commit 7f8d58d322
No known key found for this signature in database
GPG Key ID: A867F27CC80B28C1
3 changed files with 4 additions and 3 deletions

1
Cargo.lock generated
View File

@ -1538,6 +1538,7 @@ dependencies = [
"bitflags",
"cassowary",
"crossterm",
"serde",
"unicode-segmentation",
"unicode-width",
]

View File

@ -14,7 +14,7 @@ categories = ["command-line-utilities"]
[dependencies]
crossterm = "0.26.1"
tui = { package = "ratatui", version = "0.20.1", default-features = false, features = [ "crossterm" ] }
tui = { package = "ratatui", version = "0.20.1", default-features = false, features = [ "crossterm", "serde" ] }
tokio = { version = "1.24.1", features = [ "rt", "macros", "rt-multi-thread", "fs" ] }
clap = { version = "4.1.6", features = [ "derive", "cargo" ] }
serde = { version = "1.0.155", features = [ "derive" ] }

View File

@ -114,7 +114,7 @@ impl MessageData {
.chars()
.zip(*start_index..)
.map(|(c, i)| {
if search_highlight.binary_search(&i).is_ok() {
if search_highlight.binary_search(&(i.saturating_sub(1))).is_ok() {
Span::styled(c.to_string(), search_theme)
} else if username_highlight.binary_search(&i).is_ok() {
Span::styled(c.to_string(), username_theme)
@ -148,7 +148,7 @@ impl MessageData {
.map(|name| {
self.payload
.match_indices(name)
.flat_map(move |(index, _)| index..(index + name.len()))
.flat_map(move |(index, _)| index + 1..=(index + name.len()))
.collect::<Vec<usize>>()
})
.unwrap_or_default();