Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include deletion hunks in fold regardless of end

Browse source
This commit is contained in:
Julia 2022-10-13 00:42:53 -04:00
parent e744520d90
commit e75dcc853b
2 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

47
crates/editor/src/element.rs
View file

@ -558,7 +558,7 @@ impl EditorElement {
let offset = gutter_layout.line_height / 2.; let offset = gutter_layout.line_height / 2.;
let start_y = 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 end_y = start_y + gutter_layout.line_height;
let width = diff_style.removed_width_em * gutter_layout.line_height; let width = diff_style.removed_width_em * gutter_layout.line_height;
@ -1045,28 +1045,53 @@ impl EditorElement {
.peekable(); .peekable();
let mut layouts = Vec::new(); 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 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 is_start_of_fold {
if hunk.buffer_range.contains(&buffer_row) { //Consume all hunks within fold
layouts.push(Self::layout_diff_hunk(hunk, rows.start, &mut buffer_rows)); 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(); diff_hunks.next();
} else if hunk.buffer_range.end < buffer_row { consumed_hunks = true;
//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 //And mark fold as modified if there were any
//this will overlay over, but right now that seems fine if consumed_hunks {
let current_visual_row = rows.start + idx as u32 - 1;
layouts.push(DiffHunkLayout { layouts.push(DiffHunkLayout {
visual_range: buffer_row - 1..buffer_row, visual_range: current_visual_row..current_visual_row + 1,
status: DiffHunkStatus::Modified, 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(); diff_hunks.next();
} }
} }
} }
previous_buffer_row = Some(buffer_row);
}
layouts layouts
} }

3
crates/git/src/diff.rs
View file

@ -191,7 +191,6 @@ impl BufferDiff {
} }
if kind == GitDiffLineType::Deletion { if kind == GitDiffLineType::Deletion {
*buffer_row_divergence -= 1;
let end = content_offset + content_len; let end = content_offset + content_len;
match &mut head_byte_range { match &mut head_byte_range {
@ -204,6 +203,8 @@ impl BufferDiff {
let row = old_row as i64 + *buffer_row_divergence; let row = old_row as i64 + *buffer_row_divergence;
first_deletion_buffer_row = Some(row as u32); first_deletion_buffer_row = Some(row as u32);
} }
*buffer_row_divergence -= 1;
} }
} }