Merge pull request #2228 from zed-industries/make-folds-show-on-active-lines

Mikayla Maki created 2 years ago

Made code fold indicators show up on active line indicators

Change summary

crates/editor/src/editor.rs  | 6 +++++-
crates/editor/src/element.rs | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)

Detailed changes

crates/editor/src/editor.rs

@@ -2702,6 +2702,7 @@ impl Editor {
     pub fn render_fold_indicators(
         &self,
         fold_data: Option<Vec<(u32, FoldStatus)>>,
+        active_rows: &BTreeMap<u32, bool>,
         style: &EditorStyle,
         gutter_hovered: bool,
         line_height: f32,
@@ -2717,7 +2718,10 @@ impl Editor {
                 .iter()
                 .copied()
                 .filter_map(|(fold_location, fold_status)| {
-                    (gutter_hovered || fold_status == FoldStatus::Folded).then(|| {
+                    (gutter_hovered
+                        || fold_status == FoldStatus::Folded
+                        || !*active_rows.get(&fold_location).unwrap_or(&true))
+                    .then(|| {
                         (
                             fold_location,
                             MouseEventHandler::<FoldIndicators>::new(

crates/editor/src/element.rs

@@ -1858,6 +1858,7 @@ impl Element for EditorElement {
 
             view.render_fold_indicators(
                 folds,
+                &active_rows,
                 &style,
                 view.gutter_hovered,
                 line_height,