From 8926266952948063a666a248f2e4b7bf8edcfde6 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Sat, 29 Jul 2023 23:53:16 -0700
Subject: [PATCH 1/2] Halve opacity on wrap guides

---
 styles/src/style_tree/editor.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/src/style_tree/editor.ts b/styles/src/style_tree/editor.ts
index 832e776264..deab45d4b2 100644
--- a/styles/src/style_tree/editor.ts
+++ b/styles/src/style_tree/editor.ts
@@ -182,8 +182,8 @@ export default function editor(): any {
         line_number: with_opacity(foreground(layer), 0.35),
         line_number_active: foreground(layer),
         rename_fade: 0.6,
-        wrap_guide: with_opacity(foreground(layer), 0.1),
-        active_wrap_guide: with_opacity(foreground(layer), 0.2),
+        wrap_guide: with_opacity(foreground(layer), 0.05),
+        active_wrap_guide: with_opacity(foreground(layer), 0.1),
         unnecessary_code_fade: 0.5,
         selection: theme.players[0],
         whitespace: theme.ramps.neutral(0.5).hex(),

From 88474a60485257814313b4a6ff799642feeafe6a Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 31 Jul 2023 10:54:29 -0700
Subject: [PATCH 2/2] Clip wrap guides from under the scrollbar

---
 crates/editor/src/element.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index cb46e74af0..750beaea13 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -554,7 +554,9 @@ impl EditorElement {
                     (text_bounds.origin_x() + wrap_position + layout.position_map.em_width / 2.)
                         - scroll_left;
 
-                if x < text_bounds.origin_x() {
+                if x < text_bounds.origin_x()
+                    || (layout.show_scrollbars && x > self.scrollbar_left(&bounds))
+                {
                     continue;
                 }
 
@@ -1046,6 +1048,10 @@ impl EditorElement {
         scene.pop_layer();
     }
 
+    fn scrollbar_left(&self, bounds: &RectF) -> f32 {
+        bounds.max_x() - self.style.theme.scrollbar.width
+    }
+
     fn paint_scrollbar(
         &mut self,
         scene: &mut SceneBuilder,
@@ -1064,7 +1070,7 @@ impl EditorElement {
         let top = bounds.min_y();
         let bottom = bounds.max_y();
         let right = bounds.max_x();
-        let left = right - style.width;
+        let left = self.scrollbar_left(&bounds);
         let row_range = &layout.scrollbar_row_range;
         let max_row = layout.max_row as f32 + (row_range.end - row_range.start);