From 2b283e7c530a27ec0665a12fbbed2505e6c7156a Mon Sep 17 00:00:00 2001
From: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Date: Wed, 24 Sep 2025 12:44:39 -0400
Subject: [PATCH] Revert "Fix UTF-8 character boundary panic in DirectWrite
 text ... (#37767)" (#38800)

This reverts commit 9e7302520ec93a96a9b275a817f083b96620148e.

I run into an infinite hang in Zed nightly and used instruments and
activity monitor to sample what was going on. The root cause seemed to
be the unwrap_unchecked introduced in reverted PR.

Release Notes:

- N/A
---
 crates/gpui/src/text_system.rs | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index b0776051d6049e70397912c28435ebe4eb2b8d7a..efa4ad032a66ce92a71cbd82be6ed4a63d527858 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -429,33 +429,7 @@ impl WindowTextSystem {
                     break;
                 };
 
-                let mut run_len_within_line = cmp::min(line_end, run_start + run.len) - run_start;
-
-                // Ensure the run length respects UTF-8 character boundaries
-                if run_len_within_line > 0 {
-                    let text_slice = &line_text[run_start - line_start..];
-                    if run_len_within_line < text_slice.len()
-                        && !text_slice.is_char_boundary(run_len_within_line)
-                    {
-                        // Find the previous character boundary using efficient bit-level checking
-                        // UTF-8 characters are at most 4 bytes, so we only need to check up to 3 bytes back
-                        let lower_bound = run_len_within_line.saturating_sub(3);
-                        let search_range =
-                            &text_slice.as_bytes()[lower_bound..=run_len_within_line];
-
-                        // SAFETY: A valid character boundary must exist in this range because:
-                        // 1. run_len_within_line is a valid position in the string slice
-                        // 2. UTF-8 characters are at most 4 bytes, so some boundary exists in [run_len_within_line-3..=run_len_within_line]
-                        let pos_from_lower = unsafe {
-                            search_range
-                                .iter()
-                                .rposition(|&b| (b as i8) >= -0x40)
-                                .unwrap_unchecked()
-                        };
-
-                        run_len_within_line = lower_bound + pos_from_lower;
-                    }
-                }
+                let run_len_within_line = cmp::min(line_end, run_start + run.len) - run_start;
 
                 if last_font == Some(run.font.clone()) {
                     font_runs.last_mut().unwrap().len += run_len_within_line;