Fix off by one error in highlight

Xithrius · Aug 3, 2024 · 2aeec9e · 2aeec9e
1 parent f8cfa57
commit 2aeec9e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/handlers/data.rs b/src/handlers/data.rs
@@ -1,4 +1,5 @@
 use chrono::{offset::Local, DateTime};
+use futures::stream::Next;
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
 use log::{error, warn};
 use memchr::memmem;
@@ -396,8 +397,9 @@ impl MessageData {
         static EMOTE_FINDER: Lazy<memmem::Finder> =
             Lazy::new(|| memmem::Finder::new(ZERO_WIDTH_SPACE_STR));
 
+        let line_is_empty = line.is_empty();
         // A line contains emotes if `emotes` is not empty and `line` starts with a unicode placeholder or contains ZWS.
-        if emotes.is_empty()
+        let spans = if emotes.is_empty()
             || (!line.starts_with(PRIVATE_USE_UNICODE)
                 && EMOTE_FINDER.find(line.as_bytes()).is_none())
         {
@@ -407,7 +409,7 @@ impl MessageData {
                 default_style,
                 search_highlight,
                 username_highlight,
-            )
+            );
         } else {
             let mut spans: Vec<Span<'s>> = vec![];
 
@@ -436,7 +438,11 @@ impl MessageData {
 
             *start_index = start_index.saturating_sub(ZERO_WIDTH_SPACE_STR.len());
             spans
+        };
+        if !line_is_empty {
+            *start_index += 1;
         }
+        spans
     }
 
     pub fn to_vec(
@@ -846,7 +852,7 @@ mod tests {
 
         assert_eq!(emotes, EMOTES_ID_PID);
 
-        assert_eq!(start_index, line.len());
+        assert_eq!(start_index - 1, line.len());
 
         assert_eq!(
             spans,
@@ -899,7 +905,7 @@ mod tests {
         );
 
         assert!(emotes.is_empty());
-        assert_eq!(start_index, line.len());
+        assert_eq!(start_index - 1, line.len());
 
         assert_eq!(
             spans,