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

Track buffer row divergence while iterating through diff lines

Browse source 
This allows for offsetting head row index of deleted lines to normalize
into buffer row space
This commit is contained in:
Julia 2022-09-15 17:44:01 -04:00
parent 446bf88655
commit b9d84df127
2 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -552,7 +552,7 @@ impl EditorElement {
//TODO: This rendering is entirely a horrible hack //TODO: This rendering is entirely a horrible hack
DiffHunkStatus::Removed => { DiffHunkStatus::Removed => {
let row = hunk.buffer_range.start as i64 - 1; let row = hunk.buffer_range.start;
let offset = line_height / 2.; let offset = line_height / 2.;
let start_y = row as f32 * line_height + offset - scroll_top; let start_y = row as f32 * line_height + offset - scroll_top;

50
crates/language/src/git.rs
View file

@ -163,8 +163,9 @@ impl BufferDiff {
let patch = Self::diff(&head_text, &buffer_text); let patch = Self::diff(&head_text, &buffer_text);
if let Some(patch) = patch { if let Some(patch) = patch {
let mut divergence = 0;
for hunk_index in 0..patch.num_hunks() { for hunk_index in 0..patch.num_hunks() {
let hunk = Self::process_patch_hunk(&patch, hunk_index, buffer); let hunk = Self::process_patch_hunk(&patch, hunk_index, buffer, &mut divergence);
tree.push(hunk, buffer); tree.push(hunk, buffer);
} }
} }
@ -198,6 +199,7 @@ impl BufferDiff {
patch: &GitPatch<'a>, patch: &GitPatch<'a>,
hunk_index: usize, hunk_index: usize,
buffer: &text::BufferSnapshot, buffer: &text::BufferSnapshot,
buffer_row_divergence: &mut i64,
) -> DiffHunk<Anchor> { ) -> DiffHunk<Anchor> {
let line_item_count = patch.num_lines_in_hunk(hunk_index).unwrap(); let line_item_count = patch.num_lines_in_hunk(hunk_index).unwrap();
assert!(line_item_count > 0); assert!(line_item_count > 0);
@ -212,41 +214,35 @@ impl BufferDiff {
let content_offset = line.content_offset() as isize; let content_offset = line.content_offset() as isize;
let content_len = line.content().len() as isize; let content_len = line.content().len() as isize;
match (kind, &mut buffer_row_range, &mut head_byte_range) { if kind == GitDiffLineType::Addition {
(GitDiffLineType::Addition, None, _) => { *buffer_row_divergence += 1;
//guarenteed to be present for additions
let row = line.new_lineno().unwrap().saturating_sub(1); let row = line.new_lineno().unwrap().saturating_sub(1);
buffer_row_range = Some(row..row + 1);
match &mut buffer_row_range {
Some(buffer_row_range) => buffer_row_range.end = row + 1,
None => buffer_row_range = Some(row..row + 1),
}
} }
(GitDiffLineType::Addition, Some(buffer_byte_range), _) => { if kind == GitDiffLineType::Deletion {
let row = line.new_lineno().unwrap().saturating_sub(1); *buffer_row_divergence -= 1;
buffer_byte_range.end = row + 1;
}
(GitDiffLineType::Deletion, _, None) => {
let end = content_offset + content_len; let end = content_offset + content_len;
head_byte_range = Some(content_offset as usize..end as usize);
match &mut head_byte_range {
Some(head_byte_range) => head_byte_range.end = end as usize,
None => head_byte_range = Some(content_offset as usize..end as usize),
} }
(GitDiffLineType::Deletion, _, Some(head_byte_range)) => { if first_deletion_buffer_row.is_none() {
let end = content_offset + content_len; let old_row = line.old_lineno().unwrap().saturating_sub(1);
head_byte_range.end = end as usize; let row = old_row as i64 + *buffer_row_divergence;
first_deletion_buffer_row = Some(row as u32);
} }
_ => {}
}
if kind == GitDiffLineType::Deletion && first_deletion_buffer_row.is_none() {
//old_lineno is guarenteed to be Some for deletions
//libgit gives us line numbers that are 1-indexed but also returns a 0 for some states
let row = line.old_lineno().unwrap().saturating_sub(1);
first_deletion_buffer_row = Some(row);
} }
} }
//unwrap_or deletion without addition //unwrap_or deletion without addition
let buffer_byte_range = buffer_row_range.unwrap_or_else(|| { let buffer_row_range = buffer_row_range.unwrap_or_else(|| {
//we cannot have an addition-less hunk without deletion(s) or else there would be no hunk //we cannot have an addition-less hunk without deletion(s) or else there would be no hunk
let row = first_deletion_buffer_row.unwrap(); let row = first_deletion_buffer_row.unwrap();
row..row row..row
@ -255,8 +251,8 @@ impl BufferDiff {
//unwrap_or addition without deletion //unwrap_or addition without deletion
let head_byte_range = head_byte_range.unwrap_or(0..0); let head_byte_range = head_byte_range.unwrap_or(0..0);
let start = Point::new(buffer_byte_range.start, 0); let start = Point::new(buffer_row_range.start, 0);
let end = Point::new(buffer_byte_range.end, 0); let end = Point::new(buffer_row_range.end, 0);
let buffer_range = buffer.anchor_before(start)..buffer.anchor_before(end); let buffer_range = buffer.anchor_before(start)..buffer.anchor_before(end);
DiffHunk { DiffHunk {
buffer_range, buffer_range,