From 7960067cf9f69d83677b88a285dafe694c8bf650 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 26 Apr 2023 15:32:19 -0700
Subject: [PATCH] Fix bug where Text element would wrap at the right glyph in
 the wrong run

---
 crates/gpui/src/elements/text.rs | 13 ++++++++-----
 crates/gpui/src/text_layout.rs   |  7 +++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 357bce9d0d..1d78ded4cd 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -226,17 +226,20 @@ impl<V: View> Element<V> for Text {
                     let mut glyph_origin = origin;
                     let mut prev_position = 0.;
                     let mut wrap_boundaries = wrap_boundaries.iter().copied().peekable();
-                    for (glyph_ix, glyph) in line
-                        .runs()
-                        .iter()
-                        .flat_map(|run| run.glyphs().iter().enumerate())
+                    for (run_ix, glyph_ix, glyph) in
+                        line.runs().iter().enumerate().flat_map(|(run_ix, run)| {
+                            run.glyphs()
+                                .iter()
+                                .enumerate()
+                                .map(move |(ix, glyph)| (run_ix, ix, glyph))
+                        })
                     {
                         glyph_origin.set_x(glyph_origin.x() + glyph.position.x() - prev_position);
                         prev_position = glyph.position.x();
 
                         if wrap_boundaries
                             .peek()
-                            .map_or(false, |b| b.glyph_ix == glyph_ix)
+                            .map_or(false, |b| b.run_ix == run_ix && b.glyph_ix == glyph_ix)
                         {
                             if let Some((mouse_run_ix, mouse_region_start)) = &mut current_mouse_run
                             {
diff --git a/crates/gpui/src/text_layout.rs b/crates/gpui/src/text_layout.rs
index 3f2f7890b8..25b5c3f430 100644
--- a/crates/gpui/src/text_layout.rs
+++ b/crates/gpui/src/text_layout.rs
@@ -407,11 +407,14 @@ impl Line {
 
         let mut glyph_origin = origin;
         let mut prev_position = 0.;
-        for run in &self.layout.runs {
+        for (run_ix, run) in self.layout.runs.iter().enumerate() {
             for (glyph_ix, glyph) in run.glyphs.iter().enumerate() {
                 glyph_origin.set_x(glyph_origin.x() + glyph.position.x() - prev_position);
 
-                if boundaries.peek().map_or(false, |b| b.glyph_ix == glyph_ix) {
+                if boundaries
+                    .peek()
+                    .map_or(false, |b| b.run_ix == run_ix && b.glyph_ix == glyph_ix)
+                {
                     boundaries.next();
                     if let Some((underline_origin, underline_style)) = underline {
                         scene.push_underline(scene::Underline {