Revert "Fix off by one error in highlight (Xithrius#649)"

This reverts commit 62f53e4.
Nogesma · Aug 13, 2024 · 71fd184 · 71fd184
1 parent 62f53e4
commit 71fd184
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/handlers/data.rs b/src/handlers/data.rs
@@ -395,10 +395,9 @@ impl MessageData {
     ) -> Vec<Span<'s>> {
         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.
-        let spans = if emotes.is_empty()
+        if emotes.is_empty()
             || (!line.starts_with(PRIVATE_USE_UNICODE)
                 && EMOTE_FINDER.find(line.as_bytes()).is_none())
         {
@@ -437,9 +436,7 @@ impl MessageData {
 
             *start_index = start_index.saturating_sub(ZERO_WIDTH_SPACE_STR.len());
             spans
-        };
-        *start_index += usize::from(!line_is_empty);
-        spans
+        }
     }
 
     pub fn to_vec(
@@ -849,7 +846,7 @@ mod tests {
 
         assert_eq!(emotes, EMOTES_ID_PID);
 
-        assert_eq!(start_index - 1, line.len());
+        assert_eq!(start_index, line.len());
 
         assert_eq!(
             spans,
@@ -902,7 +899,7 @@ mod tests {
         );
 
         assert!(emotes.is_empty());
-        assert_eq!(start_index - 1, line.len());
+        assert_eq!(start_index, line.len());
 
         assert_eq!(
             spans,