From a6910584b61f82873ee18908fdc642ab35455998 Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 12 Oct 2022 00:39:56 -0400 Subject: [PATCH 01/13] Something's happening, nothing correct, but something --- crates/editor/src/element.rs | 135 ++++++++++++++++++++++++----------- 1 file changed, 93 insertions(+), 42 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 587133e9dd..97d29a404a 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -48,6 +48,11 @@ use std::{ }; use theme::DiffStyle; +struct DiffHunkLayout { + visual_range: Range, + status: DiffHunkStatus, +} + struct SelectionLayout { head: DisplayPoint, range: Range, @@ -539,17 +544,17 @@ impl EditorElement { } fn diff_quad( - hunk: &DiffHunk, + hunk: &DiffHunkLayout, gutter_layout: &GutterLayout, diff_style: &DiffStyle, ) -> Quad { - let color = match hunk.status() { + let color = match hunk.status { DiffHunkStatus::Added => diff_style.inserted, DiffHunkStatus::Modified => diff_style.modified, //TODO: This rendering is entirely a horrible hack DiffHunkStatus::Removed => { - let row = hunk.buffer_range.start; + let row = hunk.visual_range.start; let offset = gutter_layout.line_height / 2.; let start_y = @@ -570,8 +575,8 @@ impl EditorElement { } }; - let start_row = hunk.buffer_range.start; - let end_row = hunk.buffer_range.end; + let start_row = hunk.visual_range.start; + let end_row = hunk.visual_range.end; let start_y = start_row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; let end_y = end_row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; @@ -613,7 +618,13 @@ impl EditorElement { GitGutter::TrackedFiles ); - // line is `None` when there's a line wrap + if show_gutter { + for hunk in &layout.hunk_layouts { + let quad = diff_quad(hunk, &gutter_layout, diff_style); + cx.scene.push_quad(quad); + } + } + for (ix, line) in layout.line_number_layouts.iter().enumerate() { if let Some(line) = line { let line_origin = bounds.origin() @@ -624,38 +635,9 @@ impl EditorElement { ); line.paint(line_origin, visible_bounds, gutter_layout.line_height, cx); - - if show_gutter { - //This line starts a buffer line, so let's do the diff calculation - let new_hunk = get_hunk(diff_layout.buffer_row, &layout.diff_hunks); - - let (is_ending, is_starting) = match (diff_layout.last_diff, new_hunk) { - (Some(old_hunk), Some(new_hunk)) if new_hunk == old_hunk => (false, false), - (a, b) => (a.is_some(), b.is_some()), - }; - - if is_ending { - let last_hunk = diff_layout.last_diff.take().unwrap(); - cx.scene - .push_quad(diff_quad(last_hunk, &gutter_layout, diff_style)); - } - - if is_starting { - let new_hunk = new_hunk.unwrap(); - diff_layout.last_diff = Some(new_hunk); - }; - - diff_layout.buffer_row += 1; - } } } - // If we ran out with a diff hunk still being prepped, paint it now - if let Some(last_hunk) = diff_layout.last_diff { - cx.scene - .push_quad(diff_quad(last_hunk, &gutter_layout, diff_style)) - } - if let Some((row, indicator)) = layout.code_actions_indicator.as_mut() { let mut x = bounds.width() - layout.gutter_padding; let mut y = *row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; @@ -1013,6 +995,78 @@ impl EditorElement { .width() } + fn layout_diff_hunk( + hunk: &DiffHunk, + buffer_rows: &mut std::iter::Peekable>>, + ) -> DiffHunkLayout { + //This should start with a row which is contained in the hunk's buffer range + let visual_start = buffer_rows.peek().unwrap().unwrap(); + + let mut visual_count = 0; + while let Some(&buffer_row) = buffer_rows.peek() { + if let Some(buffer_row) = buffer_row { + if buffer_row == hunk.buffer_range.end { + visual_count += 1; + break; + } else if buffer_row > hunk.buffer_range.end { + break; + } + visual_count += 1; + buffer_rows.next(); + } + } + + DiffHunkLayout { + visual_range: visual_start..visual_start + visual_count, + status: hunk.status(), + } + } + + //Folds contained in a hunk are ignored apart from shrinking visual size + //If a fold contains any hunks then that fold line is marked as modified + fn layout_git_gutters( + &self, + rows: Range, + snapshot: &EditorSnapshot, + ) -> Vec { + let mut diff_hunks = snapshot + .buffer_snapshot + .git_diff_hunks_in_range(rows.clone()) + .peekable(); + + //Some number followed by Nones for wrapped lines + //Jump in number for folded lines + let mut buffer_rows = snapshot + .buffer_rows(rows.start) + .take((rows.end - rows.start) as usize) + .peekable(); + + let mut layouts = Vec::new(); + + while let Some(buffer_row) = buffer_rows.next() { + let buffer_row = buffer_row.unwrap(); + + if let Some(hunk) = diff_hunks.peek() { + if hunk.buffer_range.contains(&buffer_row) { + layouts.push(Self::layout_diff_hunk(hunk, &mut buffer_rows)); + diff_hunks.next(); + } else if hunk.buffer_range.end < buffer_row { + //A hunk that was missed due to being entirely contained in a fold + //We can safely assume that the previous visual row is the fold + //TODO: If there is another hunk that ends inside the fold then + //this will overlay over, but right now that seems fine + layouts.push(DiffHunkLayout { + visual_range: buffer_row - 1..buffer_row, + status: DiffHunkStatus::Modified, + }); + diff_hunks.next(); + } + } + } + + layouts + } + fn layout_line_numbers( &self, rows: Range, @@ -1367,7 +1421,7 @@ impl EditorElement { /// Get the hunk that contains buffer_line, starting from start_idx /// Returns none if there is none found, and -fn get_hunk(buffer_line: u32, hunks: &[DiffHunk]) -> Option<&DiffHunk> { +fn get_hunk(hunks: &[DiffHunk], buffer_line: u32) -> Option<&DiffHunk> { for i in 0..hunks.len() { // Safety: Index out of bounds is handled by the check above let hunk = hunks.get(i).unwrap(); @@ -1561,10 +1615,7 @@ impl Element for EditorElement { let line_number_layouts = self.layout_line_numbers(start_row..end_row, &active_rows, &snapshot, cx); - let diff_hunks = snapshot - .buffer_snapshot - .git_diff_hunks_in_range(start_row..end_row) - .collect(); + let hunk_layouts = self.layout_git_gutters(start_row..end_row, &snapshot); let mut max_visible_line_width = 0.0; let line_layouts = self.layout_lines(start_row..end_row, &snapshot, cx); @@ -1714,7 +1765,7 @@ impl Element for EditorElement { highlighted_rows, highlighted_ranges, line_number_layouts, - diff_hunks, + hunk_layouts, blocks, selections, context_menu, @@ -1848,11 +1899,11 @@ pub struct LayoutState { active_rows: BTreeMap, highlighted_rows: Option>, line_number_layouts: Vec>, + hunk_layouts: Vec, blocks: Vec, highlighted_ranges: Vec<(Range, Color)>, selections: Vec<(ReplicaId, Vec)>, context_menu: Option<(DisplayPoint, ElementBox)>, - diff_hunks: Vec>, code_actions_indicator: Option<(u32, ElementBox)>, hover_popovers: Option<(DisplayPoint, Vec)>, } From e744520d90883e0431b869772388808ac00a395f Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 12 Oct 2022 16:40:19 -0400 Subject: [PATCH 02/13] Correctly offset diff hunk layouts --- crates/editor/src/element.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 97d29a404a..b2cf6a19f3 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -997,14 +997,16 @@ impl EditorElement { fn layout_diff_hunk( hunk: &DiffHunk, - buffer_rows: &mut std::iter::Peekable>>, + start_row: u32, + buffer_rows: &mut std::iter::Peekable)>>, ) -> DiffHunkLayout { - //This should start with a row which is contained in the hunk's buffer range - let visual_start = buffer_rows.peek().unwrap().unwrap(); + //`buffer_rows` should start with a row which is contained in the hunk's buffer range + //The `usize` field is 1-index so we have to sub to move it into 0-offset to match actual rows + let visual_start = start_row + buffer_rows.peek().unwrap().0 as u32 - 1; let mut visual_count = 0; while let Some(&buffer_row) = buffer_rows.peek() { - if let Some(buffer_row) = buffer_row { + if let (_, Some(buffer_row)) = buffer_row { if buffer_row == hunk.buffer_range.end { visual_count += 1; break; @@ -1039,16 +1041,17 @@ impl EditorElement { let mut buffer_rows = snapshot .buffer_rows(rows.start) .take((rows.end - rows.start) as usize) + .enumerate() .peekable(); let mut layouts = Vec::new(); - while let Some(buffer_row) = buffer_rows.next() { + while let Some((_, buffer_row)) = buffer_rows.next() { let buffer_row = buffer_row.unwrap(); if let Some(hunk) = diff_hunks.peek() { if hunk.buffer_range.contains(&buffer_row) { - layouts.push(Self::layout_diff_hunk(hunk, &mut buffer_rows)); + layouts.push(Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows)); diff_hunks.next(); } else if hunk.buffer_range.end < buffer_row { //A hunk that was missed due to being entirely contained in a fold @@ -1060,7 +1063,7 @@ impl EditorElement { status: DiffHunkStatus::Modified, }); diff_hunks.next(); - } + } } } From e75dcc853b2327119c7cc0aeefd7c40d7e2295e5 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 13 Oct 2022 00:42:53 -0400 Subject: [PATCH 03/13] Include deletion hunks in fold regardless of end --- crates/editor/src/element.rs | 49 +++++++++++++++++++++++++++--------- crates/git/src/diff.rs | 3 ++- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index b2cf6a19f3..853aeec01a 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -558,7 +558,7 @@ impl EditorElement { let offset = gutter_layout.line_height / 2.; let start_y = - row as f32 * gutter_layout.line_height + offset - gutter_layout.scroll_top; + row as f32 * gutter_layout.line_height - offset - gutter_layout.scroll_top; let end_y = start_y + gutter_layout.line_height; let width = diff_style.removed_width_em * gutter_layout.line_height; @@ -1045,26 +1045,51 @@ impl EditorElement { .peekable(); let mut layouts = Vec::new(); + let mut previous_buffer_row = None; - while let Some((_, buffer_row)) = buffer_rows.next() { + while let Some((idx, buffer_row)) = buffer_rows.next() { let buffer_row = buffer_row.unwrap(); + let is_start_of_fold = previous_buffer_row + .map(|prev| buffer_row > prev + 1) + .unwrap_or(false); - if let Some(hunk) = diff_hunks.peek() { - if hunk.buffer_range.contains(&buffer_row) { - layouts.push(Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows)); + if is_start_of_fold { + //Consume all hunks within fold + let mut consumed_hunks = false; + while let Some(hunk) = diff_hunks.peek() { + let is_past = hunk.buffer_range.start > buffer_row; + let is_removal = hunk.status() == DiffHunkStatus::Removed; + let is_on_next_line = hunk.buffer_range.start == buffer_row + 1; + let is_removal_inside = is_removal && is_on_next_line; + + if is_past && !is_removal_inside { + break; + } diff_hunks.next(); - } else if hunk.buffer_range.end < buffer_row { - //A hunk that was missed due to being entirely contained in a fold - //We can safely assume that the previous visual row is the fold - //TODO: If there is another hunk that ends inside the fold then - //this will overlay over, but right now that seems fine + consumed_hunks = true; + } + + //And mark fold as modified if there were any + if consumed_hunks { + let current_visual_row = rows.start + idx as u32 - 1; layouts.push(DiffHunkLayout { - visual_range: buffer_row - 1..buffer_row, + visual_range: current_visual_row..current_visual_row + 1, status: DiffHunkStatus::Modified, }); - diff_hunks.next(); + } + } else { + //Not the start of a fold + if let Some(hunk) = diff_hunks.peek() { + if hunk.buffer_range.contains(&buffer_row) + || hunk.buffer_range.start == buffer_row + { + layouts.push(Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows)); + diff_hunks.next(); + } } } + + previous_buffer_row = Some(buffer_row); } layouts diff --git a/crates/git/src/diff.rs b/crates/git/src/diff.rs index 4191e5d260..3fcaaa6496 100644 --- a/crates/git/src/diff.rs +++ b/crates/git/src/diff.rs @@ -191,7 +191,6 @@ impl BufferDiff { } if kind == GitDiffLineType::Deletion { - *buffer_row_divergence -= 1; let end = content_offset + content_len; match &mut head_byte_range { @@ -204,6 +203,8 @@ impl BufferDiff { let row = old_row as i64 + *buffer_row_divergence; first_deletion_buffer_row = Some(row as u32); } + + *buffer_row_divergence -= 1; } } From a6a7e85894e569f0a0919c5d30e078c140f22016 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 13 Oct 2022 02:02:29 -0400 Subject: [PATCH 04/13] Misc fixes, still broken soft wrap --- crates/editor/src/element.rs | 50 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 853aeec01a..17dfabe576 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -48,6 +48,7 @@ use std::{ }; use theme::DiffStyle; +#[derive(Debug)] struct DiffHunkLayout { visual_range: Range, status: DiffHunkStatus, @@ -995,18 +996,26 @@ impl EditorElement { .width() } + //-> (layout, buffer row advancement) fn layout_diff_hunk( hunk: &DiffHunk, start_row: u32, buffer_rows: &mut std::iter::Peekable)>>, - ) -> DiffHunkLayout { + ) -> (Option, u32) { //`buffer_rows` should start with a row which is contained in the hunk's buffer range + let first_buffer_rows = match buffer_rows.peek() { + Some(first_buffer_rows) => first_buffer_rows, + None => return (None, 0), + }; + //The `usize` field is 1-index so we have to sub to move it into 0-offset to match actual rows - let visual_start = start_row + buffer_rows.peek().unwrap().0 as u32 - 1; + let visual_start = start_row + first_buffer_rows.0 as u32 - 1; let mut visual_count = 0; + let mut buffer_row_advancement = 0; while let Some(&buffer_row) = buffer_rows.peek() { if let (_, Some(buffer_row)) = buffer_row { + buffer_row_advancement += 1; if buffer_row == hunk.buffer_range.end { visual_count += 1; break; @@ -1014,14 +1023,16 @@ impl EditorElement { break; } visual_count += 1; - buffer_rows.next(); } + + buffer_rows.next(); } - DiffHunkLayout { + let layout = DiffHunkLayout { visual_range: visual_start..visual_start + visual_count, status: hunk.status(), - } + }; + (Some(layout), buffer_row_advancement) } //Folds contained in a hunk are ignored apart from shrinking visual size @@ -1048,10 +1059,15 @@ impl EditorElement { let mut previous_buffer_row = None; while let Some((idx, buffer_row)) = buffer_rows.next() { - let buffer_row = buffer_row.unwrap(); + let buffer_row = match buffer_row { + Some(buffer_row) => buffer_row, + None => continue, + }; + let is_start_of_fold = previous_buffer_row .map(|prev| buffer_row > prev + 1) .unwrap_or(false); + previous_buffer_row = Some(buffer_row); if is_start_of_fold { //Consume all hunks within fold @@ -1077,19 +1093,21 @@ impl EditorElement { status: DiffHunkStatus::Modified, }); } - } else { - //Not the start of a fold - if let Some(hunk) = diff_hunks.peek() { - if hunk.buffer_range.contains(&buffer_row) - || hunk.buffer_range.start == buffer_row - { - layouts.push(Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows)); - diff_hunks.next(); + } else if let Some(hunk) = diff_hunks.peek() { + let row_inside_hunk = hunk.buffer_range.contains(&buffer_row); + let starts_on_row = hunk.buffer_range.start == buffer_row; + if row_inside_hunk || starts_on_row { + let (layout, buffer_row_advancement) = + Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows); + previous_buffer_row = Some(buffer_row + buffer_row_advancement); + + if let Some(layout) = layout { + layouts.push(layout); } + + diff_hunks.next(); } } - - previous_buffer_row = Some(buffer_row); } layouts From 9c47325c25f7b3aa30f33d9decf3d0c5d8d7313e Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 13 Oct 2022 13:52:44 -0400 Subject: [PATCH 05/13] Use correct range to get diff hunks in the presence of wrapped lines --- crates/editor/src/display_map/block_map.rs | 1 + crates/editor/src/display_map/fold_map.rs | 1 + crates/editor/src/display_map/wrap_map.rs | 1 + crates/editor/src/element.rs | 18 +++++++++++++++--- crates/editor/src/multi_buffer.rs | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs index 210daccac2..c60610997f 100644 --- a/crates/editor/src/display_map/block_map.rs +++ b/crates/editor/src/display_map/block_map.rs @@ -157,6 +157,7 @@ pub struct BlockChunks<'a> { max_output_row: u32, } +#[derive(Clone)] pub struct BlockBufferRows<'a> { transforms: sum_tree::Cursor<'a, Transform, (BlockRow, WrapRow)>, input_buffer_rows: wrap_map::WrapBufferRows<'a>, diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs index c17cfa39f2..756fb35950 100644 --- a/crates/editor/src/display_map/fold_map.rs +++ b/crates/editor/src/display_map/fold_map.rs @@ -987,6 +987,7 @@ impl<'a> sum_tree::Dimension<'a, FoldSummary> for usize { } } +#[derive(Clone)] pub struct FoldBufferRows<'a> { cursor: Cursor<'a, Transform, (FoldPoint, Point)>, input_buffer_rows: MultiBufferRows<'a>, diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs index ee6ce2860d..52f26ef258 100644 --- a/crates/editor/src/display_map/wrap_map.rs +++ b/crates/editor/src/display_map/wrap_map.rs @@ -62,6 +62,7 @@ pub struct WrapChunks<'a> { transforms: Cursor<'a, Transform, (WrapPoint, TabPoint)>, } +#[derive(Clone)] pub struct WrapBufferRows<'a> { input_buffer_rows: fold_map::FoldBufferRows<'a>, input_buffer_row: Option, diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 17dfabe576..5b752e0544 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -1042,15 +1042,27 @@ impl EditorElement { rows: Range, snapshot: &EditorSnapshot, ) -> Vec { + let buffer_rows = snapshot.buffer_rows(rows.start); + let start_actual_row = match buffer_rows + .clone() + .take((rows.end - rows.start) as usize) + .find_map(|b| b) + { + Some(start_actual_row) => start_actual_row, + None => return Vec::new(), + }; + + //Get all hunks after our starting actual buffer row + //The loop is in terms of visual buffer rows so we simply + //return before touching any hunks past the end of the view let mut diff_hunks = snapshot .buffer_snapshot - .git_diff_hunks_in_range(rows.clone()) + .git_diff_hunks_in_range(start_actual_row..u32::MAX) .peekable(); //Some number followed by Nones for wrapped lines //Jump in number for folded lines - let mut buffer_rows = snapshot - .buffer_rows(rows.start) + let mut buffer_rows = buffer_rows .take((rows.end - rows.start) as usize) .enumerate() .peekable(); diff --git a/crates/editor/src/multi_buffer.rs b/crates/editor/src/multi_buffer.rs index a0eedb850c..b2635712d9 100644 --- a/crates/editor/src/multi_buffer.rs +++ b/crates/editor/src/multi_buffer.rs @@ -143,6 +143,7 @@ struct ExcerptSummary { text: TextSummary, } +#[derive(Clone)] pub struct MultiBufferRows<'a> { buffer_row_range: Range, excerpts: Cursor<'a, Excerpt, Point>, From 16f854b63613c132f96f82a5c452542b66c46abf Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 13 Oct 2022 14:05:57 -0400 Subject: [PATCH 06/13] Expand diff gutter indicator to cover all of a wrapped line --- crates/editor/src/element.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 5b752e0544..e5367e54f0 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -1023,6 +1023,8 @@ impl EditorElement { break; } visual_count += 1; + } else { + visual_count += 1; } buffer_rows.next(); From 8d609959f1254e217b9cdd636d749f326691f4c5 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 13 Oct 2022 15:23:41 -0400 Subject: [PATCH 07/13] Clean --- crates/editor/src/element.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index e5367e54f0..054c34515d 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -539,11 +539,6 @@ impl EditorElement { bounds: RectF, } - struct DiffLayout<'a> { - buffer_row: u32, - last_diff: Option<&'a DiffHunk>, - } - fn diff_quad( hunk: &DiffHunkLayout, gutter_layout: &GutterLayout, @@ -605,11 +600,6 @@ impl EditorElement { } }; - let mut diff_layout = DiffLayout { - buffer_row: scroll_position.y() as u32, - last_diff: None, - }; - let diff_style = &cx.global::().theme.editor.diff.clone(); let show_gutter = matches!( &cx.global::() From dde3dfdbf6a334331735d9ea2de9dd9f62f0b5c5 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 13 Oct 2022 16:34:34 -0400 Subject: [PATCH 08/13] Quick cut of using display point conversion to layout hunks Co-Authored-By: Max Brunsfeld --- crates/editor/src/element.rs | 211 ++++++++++++++++------------------- 1 file changed, 98 insertions(+), 113 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 054c34515d..e6f876028a 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -35,7 +35,7 @@ use gpui::{ WeakViewHandle, }; use json::json; -use language::{Bias, DiagnosticSeverity, OffsetUtf16, Selection}; +use language::{Bias, DiagnosticSeverity, OffsetUtf16, Point, Selection}; use project::ProjectPath; use settings::{GitGutter, Settings}; use smallvec::SmallVec; @@ -52,6 +52,7 @@ use theme::DiffStyle; struct DiffHunkLayout { visual_range: Range, status: DiffHunkStatus, + is_folded: bool, } struct SelectionLayout { @@ -544,12 +545,12 @@ impl EditorElement { gutter_layout: &GutterLayout, diff_style: &DiffStyle, ) -> Quad { - let color = match hunk.status { - DiffHunkStatus::Added => diff_style.inserted, - DiffHunkStatus::Modified => diff_style.modified, + let color = match (hunk.status, hunk.is_folded) { + (DiffHunkStatus::Added, false) => diff_style.inserted, + (DiffHunkStatus::Modified, false) => diff_style.modified, //TODO: This rendering is entirely a horrible hack - DiffHunkStatus::Removed => { + (DiffHunkStatus::Removed, false) => { let row = hunk.visual_range.start; let offset = gutter_layout.line_height / 2.; @@ -569,6 +570,24 @@ impl EditorElement { corner_radius: 1. * gutter_layout.line_height, }; } + + (_, true) => { + let row = hunk.visual_range.start; + let start_y = row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; + let end_y = start_y + gutter_layout.line_height; + + let width = diff_style.removed_width_em * gutter_layout.line_height; + let highlight_origin = gutter_layout.bounds.origin() + vec2f(-width, start_y); + let highlight_size = vec2f(width * 2., end_y - start_y); + let highlight_bounds = RectF::new(highlight_origin, highlight_size); + + return Quad { + bounds: highlight_bounds, + background: Some(diff_style.modified), + border: Border::new(0., Color::transparent_black()), + corner_radius: 1. * gutter_layout.line_height, + }; + } }; let start_row = hunk.visual_range.start; @@ -986,47 +1005,6 @@ impl EditorElement { .width() } - //-> (layout, buffer row advancement) - fn layout_diff_hunk( - hunk: &DiffHunk, - start_row: u32, - buffer_rows: &mut std::iter::Peekable)>>, - ) -> (Option, u32) { - //`buffer_rows` should start with a row which is contained in the hunk's buffer range - let first_buffer_rows = match buffer_rows.peek() { - Some(first_buffer_rows) => first_buffer_rows, - None => return (None, 0), - }; - - //The `usize` field is 1-index so we have to sub to move it into 0-offset to match actual rows - let visual_start = start_row + first_buffer_rows.0 as u32 - 1; - - let mut visual_count = 0; - let mut buffer_row_advancement = 0; - while let Some(&buffer_row) = buffer_rows.peek() { - if let (_, Some(buffer_row)) = buffer_row { - buffer_row_advancement += 1; - if buffer_row == hunk.buffer_range.end { - visual_count += 1; - break; - } else if buffer_row > hunk.buffer_range.end { - break; - } - visual_count += 1; - } else { - visual_count += 1; - } - - buffer_rows.next(); - } - - let layout = DiffHunkLayout { - visual_range: visual_start..visual_start + visual_count, - status: hunk.status(), - }; - (Some(layout), buffer_row_advancement) - } - //Folds contained in a hunk are ignored apart from shrinking visual size //If a fold contains any hunks then that fold line is marked as modified fn layout_git_gutters( @@ -1034,87 +1012,94 @@ impl EditorElement { rows: Range, snapshot: &EditorSnapshot, ) -> Vec { - let buffer_rows = snapshot.buffer_rows(rows.start); - let start_actual_row = match buffer_rows - .clone() - .take((rows.end - rows.start) as usize) - .find_map(|b| b) - { - Some(start_actual_row) => start_actual_row, - None => return Vec::new(), - }; + let start_row = DisplayPoint::new(rows.start, 0).to_point(snapshot).row; + let end_row = DisplayPoint::new(rows.end, 0).to_point(snapshot).row; - //Get all hunks after our starting actual buffer row - //The loop is in terms of visual buffer rows so we simply - //return before touching any hunks past the end of the view - let mut diff_hunks = snapshot + let mut layouts = Vec::new(); + for hunk in snapshot .buffer_snapshot - .git_diff_hunks_in_range(start_actual_row..u32::MAX) - .peekable(); + .git_diff_hunks_in_range(start_row..end_row) + { + let start = Point::new(hunk.buffer_range.start, 0).to_display_point(snapshot); + let end = Point::new(hunk.buffer_range.end, 0).to_display_point(snapshot); + let is_folded = start == end && snapshot.is_line_folded(start.row()); + + if let Some(hunk) = layouts.last_mut() { + // + } + + layouts.push(DiffHunkLayout { + visual_range: start.row()..end.row(), + status: hunk.status(), + is_folded, + }); + } + + return layouts; //Some number followed by Nones for wrapped lines //Jump in number for folded lines - let mut buffer_rows = buffer_rows - .take((rows.end - rows.start) as usize) - .enumerate() - .peekable(); + // let mut buffer_rows = buffer_rows + // .take((rows.end - rows.start) as usize) + // .enumerate() + // .peekable(); - let mut layouts = Vec::new(); - let mut previous_buffer_row = None; + // let mut layouts = Vec::new(); + // let mut previous_buffer_row = None; - while let Some((idx, buffer_row)) = buffer_rows.next() { - let buffer_row = match buffer_row { - Some(buffer_row) => buffer_row, - None => continue, - }; + // while let Some((idx, buffer_row)) = buffer_rows.next() { + // let buffer_row = match buffer_row { + // Some(buffer_row) => buffer_row, + // None => continue, + // }; - let is_start_of_fold = previous_buffer_row - .map(|prev| buffer_row > prev + 1) - .unwrap_or(false); - previous_buffer_row = Some(buffer_row); + // let is_start_of_fold = previous_buffer_row + // .map(|prev| buffer_row > prev + 1) + // .unwrap_or(false); + // previous_buffer_row = Some(buffer_row); - if is_start_of_fold { - //Consume all hunks within fold - let mut consumed_hunks = false; - while let Some(hunk) = diff_hunks.peek() { - let is_past = hunk.buffer_range.start > buffer_row; - let is_removal = hunk.status() == DiffHunkStatus::Removed; - let is_on_next_line = hunk.buffer_range.start == buffer_row + 1; - let is_removal_inside = is_removal && is_on_next_line; + // if is_start_of_fold { + // //Consume all hunks within fold + // let mut consumed_hunks = false; + // while let Some(hunk) = diff_hunks.peek() { + // let is_past = hunk.buffer_range.start > buffer_row; + // let is_removal = hunk.status() == DiffHunkStatus::Removed; + // let is_on_next_line = hunk.buffer_range.start == buffer_row + 1; + // let is_removal_inside = is_removal && is_on_next_line; - if is_past && !is_removal_inside { - break; - } - diff_hunks.next(); - consumed_hunks = true; - } + // if is_past && !is_removal_inside { + // break; + // } + // diff_hunks.next(); + // consumed_hunks = true; + // } - //And mark fold as modified if there were any - if consumed_hunks { - let current_visual_row = rows.start + idx as u32 - 1; - layouts.push(DiffHunkLayout { - visual_range: current_visual_row..current_visual_row + 1, - status: DiffHunkStatus::Modified, - }); - } - } else if let Some(hunk) = diff_hunks.peek() { - let row_inside_hunk = hunk.buffer_range.contains(&buffer_row); - let starts_on_row = hunk.buffer_range.start == buffer_row; - if row_inside_hunk || starts_on_row { - let (layout, buffer_row_advancement) = - Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows); - previous_buffer_row = Some(buffer_row + buffer_row_advancement); + // //And mark fold as modified if there were any + // if consumed_hunks { + // let current_visual_row = rows.start + idx as u32 - 1; + // layouts.push(DiffHunkLayout { + // visual_range: current_visual_row..current_visual_row + 1, + // status: DiffHunkStatus::Modified, + // }); + // } + // } else if let Some(hunk) = diff_hunks.peek() { + // let row_inside_hunk = hunk.buffer_range.contains(&buffer_row); + // let starts_on_row = hunk.buffer_range.start == buffer_row; + // if row_inside_hunk || starts_on_row { + // let (layout, buffer_row_advancement) = + // Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows); + // previous_buffer_row = Some(buffer_row + buffer_row_advancement); - if let Some(layout) = layout { - layouts.push(layout); - } + // if let Some(layout) = layout { + // layouts.push(layout); + // } - diff_hunks.next(); - } - } - } + // diff_hunks.next(); + // } + // } + // } - layouts + // layouts } fn layout_line_numbers( From b3eb5f7cdf0b2b1875050524895f92048e1bb3e7 Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 14 Oct 2022 17:14:33 -0400 Subject: [PATCH 09/13] WIP Co-Authored-By: Kay Simmons --- crates/editor/src/element.rs | 101 +++++++++-------------------------- 1 file changed, 26 insertions(+), 75 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index e6f876028a..e4b8a762de 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -12,7 +12,7 @@ use crate::{ CmdShiftChanged, GoToFetchedDefinition, GoToFetchedTypeDefinition, UpdateGoToDefinitionLink, }, mouse_context_menu::DeployMouseContextMenu, - EditorStyle, + AnchorRangeExt, EditorStyle, ToOffset, }; use clock::ReplicaId; use collections::{BTreeMap, HashMap}; @@ -1020,86 +1020,37 @@ impl EditorElement { .buffer_snapshot .git_diff_hunks_in_range(start_row..end_row) { - let start = Point::new(hunk.buffer_range.start, 0).to_display_point(snapshot); - let end = Point::new(hunk.buffer_range.end, 0).to_display_point(snapshot); - let is_folded = start == end && snapshot.is_line_folded(start.row()); + let start = Point::new(hunk.buffer_range.start, 0); + let hunk_content_end_row = hunk + .buffer_range + .end + .saturating_sub(1) + .max(hunk.buffer_range.start); + let hunk_content_end = Point::new( + hunk_content_end_row, + snapshot.buffer_snapshot.line_len(hunk_content_end_row), + ); + let end = Point::new(hunk.buffer_range.end, 0); - if let Some(hunk) = layouts.last_mut() { - // - } + let is_folded = snapshot + .folds_in_range(start..end) + .any(|fold_range| { + let fold_point_range = fold_range.to_point(&snapshot.buffer_snapshot); + dbg!(&fold_point_range); + fold_point_range.contains(dbg!(&start)) + && fold_point_range.contains(dbg!(&hunk_content_end)) + || fold_point_range.end == hunk_content_end + }); - layouts.push(DiffHunkLayout { - visual_range: start.row()..end.row(), + layouts.push(dbg!(DiffHunkLayout { + visual_range: start.to_display_point(snapshot).row() + ..end.to_display_point(snapshot).row(), status: hunk.status(), is_folded, - }); + })); } - return layouts; - - //Some number followed by Nones for wrapped lines - //Jump in number for folded lines - // let mut buffer_rows = buffer_rows - // .take((rows.end - rows.start) as usize) - // .enumerate() - // .peekable(); - - // let mut layouts = Vec::new(); - // let mut previous_buffer_row = None; - - // while let Some((idx, buffer_row)) = buffer_rows.next() { - // let buffer_row = match buffer_row { - // Some(buffer_row) => buffer_row, - // None => continue, - // }; - - // let is_start_of_fold = previous_buffer_row - // .map(|prev| buffer_row > prev + 1) - // .unwrap_or(false); - // previous_buffer_row = Some(buffer_row); - - // if is_start_of_fold { - // //Consume all hunks within fold - // let mut consumed_hunks = false; - // while let Some(hunk) = diff_hunks.peek() { - // let is_past = hunk.buffer_range.start > buffer_row; - // let is_removal = hunk.status() == DiffHunkStatus::Removed; - // let is_on_next_line = hunk.buffer_range.start == buffer_row + 1; - // let is_removal_inside = is_removal && is_on_next_line; - - // if is_past && !is_removal_inside { - // break; - // } - // diff_hunks.next(); - // consumed_hunks = true; - // } - - // //And mark fold as modified if there were any - // if consumed_hunks { - // let current_visual_row = rows.start + idx as u32 - 1; - // layouts.push(DiffHunkLayout { - // visual_range: current_visual_row..current_visual_row + 1, - // status: DiffHunkStatus::Modified, - // }); - // } - // } else if let Some(hunk) = diff_hunks.peek() { - // let row_inside_hunk = hunk.buffer_range.contains(&buffer_row); - // let starts_on_row = hunk.buffer_range.start == buffer_row; - // if row_inside_hunk || starts_on_row { - // let (layout, buffer_row_advancement) = - // Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows); - // previous_buffer_row = Some(buffer_row + buffer_row_advancement); - - // if let Some(layout) = layout { - // layouts.push(layout); - // } - - // diff_hunks.next(); - // } - // } - // } - - // layouts + layouts } fn layout_line_numbers( From 50ae3e03f75b25df64879634fe392f7165cc086b Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 17 Oct 2022 12:28:44 -0400 Subject: [PATCH 10/13] More concrete usage of display map to handle diff hunk gutter layout --- crates/editor/src/element.rs | 68 ++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index e4b8a762de..f7d01bdb58 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -1012,42 +1012,48 @@ impl EditorElement { rows: Range, snapshot: &EditorSnapshot, ) -> Vec { - let start_row = DisplayPoint::new(rows.start, 0).to_point(snapshot).row; - let end_row = DisplayPoint::new(rows.end, 0).to_point(snapshot).row; + let buffer_snapshot = &snapshot.buffer_snapshot; + let visual_start = DisplayPoint::new(rows.start, 0).to_point(snapshot).row; + let visual_end = DisplayPoint::new(rows.end, 0).to_point(snapshot).row; + let hunks = buffer_snapshot.git_diff_hunks_in_range(visual_start..visual_end); let mut layouts = Vec::new(); - for hunk in snapshot - .buffer_snapshot - .git_diff_hunks_in_range(start_row..end_row) - { - let start = Point::new(hunk.buffer_range.start, 0); - let hunk_content_end_row = hunk - .buffer_range - .end - .saturating_sub(1) - .max(hunk.buffer_range.start); - let hunk_content_end = Point::new( - hunk_content_end_row, - snapshot.buffer_snapshot.line_len(hunk_content_end_row), - ); - let end = Point::new(hunk.buffer_range.end, 0); - let is_folded = snapshot - .folds_in_range(start..end) - .any(|fold_range| { - let fold_point_range = fold_range.to_point(&snapshot.buffer_snapshot); - dbg!(&fold_point_range); - fold_point_range.contains(dbg!(&start)) - && fold_point_range.contains(dbg!(&hunk_content_end)) - || fold_point_range.end == hunk_content_end - }); + for hunk in hunks { + let hunk_start_point = Point::new(hunk.buffer_range.start, 0); + let hunk_end_point = Point::new(hunk.buffer_range.end, 0); + let hunk_moved_start_point = Point::new(hunk.buffer_range.start.saturating_sub(1), 0); - layouts.push(dbg!(DiffHunkLayout { - visual_range: start.to_display_point(snapshot).row() - ..end.to_display_point(snapshot).row(), + let is_removal = hunk.status() == DiffHunkStatus::Removed; + + let folds_start = Point::new(hunk.buffer_range.start.saturating_sub(1), 0); + let folds_end = Point::new(hunk.buffer_range.end + 1, 0); + let folds_range = folds_start..folds_end; + + let containing_fold = snapshot.folds_in_range(folds_range).find(|fold_range| { + let fold_point_range = fold_range.to_point(buffer_snapshot); + + let folded_start = fold_point_range.contains(&hunk_start_point); + let folded_end = fold_point_range.contains(&hunk_end_point); + let folded_moved_start = fold_point_range.contains(&hunk_moved_start_point); + + (folded_start && folded_end) || (is_removal && folded_moved_start) + }); + + let visual_range = if let Some(fold) = containing_fold { + let row = fold.start.to_display_point(snapshot).row(); + row..row + } else { + let start = hunk_start_point.to_display_point(snapshot).row(); + let end = hunk_end_point.to_display_point(snapshot).row(); + start..end + }; + + layouts.push(DiffHunkLayout { + visual_range, status: hunk.status(), - is_folded, - })); + is_folded: containing_fold.is_some(), + }); } layouts From be34c50c72d0da2bc67f041c84a49e80b38077bb Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 17 Oct 2022 12:41:20 -0400 Subject: [PATCH 11/13] Deduplicate identical hunk layouts --- crates/editor/src/element.rs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index f7d01bdb58..e5a9f8f756 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -1017,7 +1017,7 @@ impl EditorElement { let visual_end = DisplayPoint::new(rows.end, 0).to_point(snapshot).row; let hunks = buffer_snapshot.git_diff_hunks_in_range(visual_start..visual_end); - let mut layouts = Vec::new(); + let mut layouts = Vec::::new(); for hunk in hunks { let hunk_start_point = Point::new(hunk.buffer_range.start, 0); @@ -1049,11 +1049,18 @@ impl EditorElement { start..end }; - layouts.push(DiffHunkLayout { - visual_range, - status: hunk.status(), - is_folded: containing_fold.is_some(), - }); + let has_existing_layout = match layouts.last() { + Some(e) => visual_range == e.visual_range && e.status == hunk.status(), + None => false, + }; + + if !has_existing_layout { + layouts.push(DiffHunkLayout { + visual_range, + status: hunk.status(), + is_folded: containing_fold.is_some(), + }); + } } layouts From 2a5d7ea2dea1eeb7ddfbe343c25d0784678ba6e7 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 17 Oct 2022 13:11:11 -0400 Subject: [PATCH 12/13] Inclusively check for hunk in fold range --- crates/editor/src/element.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index e5a9f8f756..3da4753510 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -1022,7 +1022,14 @@ impl EditorElement { for hunk in hunks { let hunk_start_point = Point::new(hunk.buffer_range.start, 0); let hunk_end_point = Point::new(hunk.buffer_range.end, 0); - let hunk_moved_start_point = Point::new(hunk.buffer_range.start.saturating_sub(1), 0); + let hunk_start_point_sub = Point::new(hunk.buffer_range.start.saturating_sub(1), 0); + let hunk_end_point_sub = Point::new( + hunk.buffer_range + .end + .saturating_sub(1) + .max(hunk.buffer_range.start), + 0, + ); let is_removal = hunk.status() == DiffHunkStatus::Removed; @@ -1032,12 +1039,13 @@ impl EditorElement { let containing_fold = snapshot.folds_in_range(folds_range).find(|fold_range| { let fold_point_range = fold_range.to_point(buffer_snapshot); + let fold_point_range = fold_point_range.start..=fold_point_range.end; let folded_start = fold_point_range.contains(&hunk_start_point); - let folded_end = fold_point_range.contains(&hunk_end_point); - let folded_moved_start = fold_point_range.contains(&hunk_moved_start_point); + let folded_end = fold_point_range.contains(&hunk_end_point_sub); + let folded_start_sub = fold_point_range.contains(&hunk_start_point_sub); - (folded_start && folded_end) || (is_removal && folded_moved_start) + (folded_start && folded_end) || (is_removal && folded_start_sub) }); let visual_range = if let Some(fold) = containing_fold { From 1716aff9697133b9b3a72ab27e71895791a3aa03 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 17 Oct 2022 14:41:16 -0400 Subject: [PATCH 13/13] Cleanup --- crates/editor/src/element.rs | 202 +++++++++++++++-------------------- 1 file changed, 85 insertions(+), 117 deletions(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 3da4753510..3a686fd5bf 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -12,11 +12,11 @@ use crate::{ CmdShiftChanged, GoToFetchedDefinition, GoToFetchedTypeDefinition, UpdateGoToDefinitionLink, }, mouse_context_menu::DeployMouseContextMenu, - AnchorRangeExt, EditorStyle, ToOffset, + AnchorRangeExt, EditorStyle, }; use clock::ReplicaId; use collections::{BTreeMap, HashMap}; -use git::diff::{DiffHunk, DiffHunkStatus}; +use git::diff::DiffHunkStatus; use gpui::{ color::Color, elements::*, @@ -46,7 +46,6 @@ use std::{ ops::Range, sync::Arc, }; -use theme::DiffStyle; #[derive(Debug)] struct DiffHunkLayout { @@ -533,93 +532,11 @@ impl EditorElement { layout: &mut LayoutState, cx: &mut PaintContext, ) { - struct GutterLayout { - line_height: f32, - // scroll_position: Vector2F, - scroll_top: f32, - bounds: RectF, - } - - fn diff_quad( - hunk: &DiffHunkLayout, - gutter_layout: &GutterLayout, - diff_style: &DiffStyle, - ) -> Quad { - let color = match (hunk.status, hunk.is_folded) { - (DiffHunkStatus::Added, false) => diff_style.inserted, - (DiffHunkStatus::Modified, false) => diff_style.modified, - - //TODO: This rendering is entirely a horrible hack - (DiffHunkStatus::Removed, false) => { - let row = hunk.visual_range.start; - - let offset = gutter_layout.line_height / 2.; - let start_y = - row as f32 * gutter_layout.line_height - offset - gutter_layout.scroll_top; - let end_y = start_y + gutter_layout.line_height; - - let width = diff_style.removed_width_em * gutter_layout.line_height; - let highlight_origin = gutter_layout.bounds.origin() + vec2f(-width, start_y); - let highlight_size = vec2f(width * 2., end_y - start_y); - let highlight_bounds = RectF::new(highlight_origin, highlight_size); - - return Quad { - bounds: highlight_bounds, - background: Some(diff_style.deleted), - border: Border::new(0., Color::transparent_black()), - corner_radius: 1. * gutter_layout.line_height, - }; - } - - (_, true) => { - let row = hunk.visual_range.start; - let start_y = row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; - let end_y = start_y + gutter_layout.line_height; - - let width = diff_style.removed_width_em * gutter_layout.line_height; - let highlight_origin = gutter_layout.bounds.origin() + vec2f(-width, start_y); - let highlight_size = vec2f(width * 2., end_y - start_y); - let highlight_bounds = RectF::new(highlight_origin, highlight_size); - - return Quad { - bounds: highlight_bounds, - background: Some(diff_style.modified), - border: Border::new(0., Color::transparent_black()), - corner_radius: 1. * gutter_layout.line_height, - }; - } - }; - - let start_row = hunk.visual_range.start; - let end_row = hunk.visual_range.end; - - let start_y = start_row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; - let end_y = end_row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; - - let width = diff_style.width_em * gutter_layout.line_height; - let highlight_origin = gutter_layout.bounds.origin() + vec2f(-width, start_y); - let highlight_size = vec2f(width * 2., end_y - start_y); - let highlight_bounds = RectF::new(highlight_origin, highlight_size); - - Quad { - bounds: highlight_bounds, - background: Some(color), - border: Border::new(0., Color::transparent_black()), - corner_radius: diff_style.corner_radius * gutter_layout.line_height, - } - } + let line_height = layout.position_map.line_height; let scroll_position = layout.position_map.snapshot.scroll_position(); - let gutter_layout = { - let line_height = layout.position_map.line_height; - GutterLayout { - scroll_top: scroll_position.y() * line_height, - line_height, - bounds, - } - }; + let scroll_top = scroll_position.y() * line_height; - let diff_style = &cx.global::().theme.editor.diff.clone(); let show_gutter = matches!( &cx.global::() .git_overrides @@ -629,10 +546,7 @@ impl EditorElement { ); if show_gutter { - for hunk in &layout.hunk_layouts { - let quad = diff_quad(hunk, &gutter_layout, diff_style); - cx.scene.push_quad(quad); - } + Self::paint_diff_hunks(bounds, layout, cx); } for (ix, line) in layout.line_number_layouts.iter().enumerate() { @@ -640,23 +554,98 @@ impl EditorElement { let line_origin = bounds.origin() + vec2f( bounds.width() - line.width() - layout.gutter_padding, - ix as f32 * gutter_layout.line_height - - (gutter_layout.scroll_top % gutter_layout.line_height), + ix as f32 * line_height - (scroll_top % line_height), ); - line.paint(line_origin, visible_bounds, gutter_layout.line_height, cx); + line.paint(line_origin, visible_bounds, line_height, cx); } } if let Some((row, indicator)) = layout.code_actions_indicator.as_mut() { let mut x = bounds.width() - layout.gutter_padding; - let mut y = *row as f32 * gutter_layout.line_height - gutter_layout.scroll_top; + let mut y = *row as f32 * line_height - scroll_top; x += ((layout.gutter_padding + layout.gutter_margin) - indicator.size().x()) / 2.; - y += (gutter_layout.line_height - indicator.size().y()) / 2.; + y += (line_height - indicator.size().y()) / 2.; indicator.paint(bounds.origin() + vec2f(x, y), visible_bounds, cx); } } + fn paint_diff_hunks(bounds: RectF, layout: &mut LayoutState, cx: &mut PaintContext) { + let diff_style = &cx.global::().theme.editor.diff.clone(); + let line_height = layout.position_map.line_height; + + let scroll_position = layout.position_map.snapshot.scroll_position(); + let scroll_top = scroll_position.y() * line_height; + + for hunk in &layout.hunk_layouts { + let color = match (hunk.status, hunk.is_folded) { + (DiffHunkStatus::Added, false) => diff_style.inserted, + (DiffHunkStatus::Modified, false) => diff_style.modified, + + //TODO: This rendering is entirely a horrible hack + (DiffHunkStatus::Removed, false) => { + let row = hunk.visual_range.start; + + let offset = line_height / 2.; + let start_y = row as f32 * line_height - offset - scroll_top; + let end_y = start_y + line_height; + + let width = diff_style.removed_width_em * line_height; + let highlight_origin = bounds.origin() + vec2f(-width, start_y); + let highlight_size = vec2f(width * 2., end_y - start_y); + let highlight_bounds = RectF::new(highlight_origin, highlight_size); + + cx.scene.push_quad(Quad { + bounds: highlight_bounds, + background: Some(diff_style.deleted), + border: Border::new(0., Color::transparent_black()), + corner_radius: 1. * line_height, + }); + + continue; + } + + (_, true) => { + let row = hunk.visual_range.start; + let start_y = row as f32 * line_height - scroll_top; + let end_y = start_y + line_height; + + let width = diff_style.removed_width_em * line_height; + let highlight_origin = bounds.origin() + vec2f(-width, start_y); + let highlight_size = vec2f(width * 2., end_y - start_y); + let highlight_bounds = RectF::new(highlight_origin, highlight_size); + + cx.scene.push_quad(Quad { + bounds: highlight_bounds, + background: Some(diff_style.modified), + border: Border::new(0., Color::transparent_black()), + corner_radius: 1. * line_height, + }); + + continue; + } + }; + + let start_row = hunk.visual_range.start; + let end_row = hunk.visual_range.end; + + let start_y = start_row as f32 * line_height - scroll_top; + let end_y = end_row as f32 * line_height - scroll_top; + + let width = diff_style.width_em * line_height; + let highlight_origin = bounds.origin() + vec2f(-width, start_y); + let highlight_size = vec2f(width * 2., end_y - start_y); + let highlight_bounds = RectF::new(highlight_origin, highlight_size); + + cx.scene.push_quad(Quad { + bounds: highlight_bounds, + background: Some(color), + border: Border::new(0., Color::transparent_black()), + corner_radius: diff_style.corner_radius * line_height, + }); + } + } + fn paint_text( &mut self, bounds: RectF, @@ -1426,27 +1415,6 @@ impl EditorElement { } } -/// Get the hunk that contains buffer_line, starting from start_idx -/// Returns none if there is none found, and -fn get_hunk(hunks: &[DiffHunk], buffer_line: u32) -> Option<&DiffHunk> { - for i in 0..hunks.len() { - // Safety: Index out of bounds is handled by the check above - let hunk = hunks.get(i).unwrap(); - if hunk.buffer_range.contains(&(buffer_line as u32)) { - return Some(hunk); - } else if hunk.status() == DiffHunkStatus::Removed && buffer_line == hunk.buffer_range.start - { - return Some(hunk); - } else if hunk.buffer_range.start > buffer_line as u32 { - // If we've passed the buffer_line, just stop - return None; - } - } - - // We reached the end of the array without finding a hunk, just return none. - return None; -} - impl Element for EditorElement { type LayoutState = LayoutState; type PaintState = ();