mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Handle deletions more robustly and correctly

Browse source
This commit is contained in:
Julia 2022-09-14 12:38:23 -04:00
parent 96917a8007
commit c1249a3d84
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,8 +1,7 @@
use std::ops::Range;
use client::proto::create_buffer_for_peer;
use sum_tree::{Bias, SumTree};
use text::{Anchor, BufferSnapshot, OffsetRangeExt, Point, Rope, ToPoint};
use text::{Anchor, BufferSnapshot, OffsetRangeExt, Point, Rope, ToOffset, ToPoint};
pub use git2 as libgit;
use libgit::{
@ -148,7 +147,7 @@ impl BufferDiffSnapshot {
self.tree.iter().filter_map(move |hunk| {
let range = hunk.buffer_range.to_point(&buffer);
if range.start.row < query_row_range.end && query_row_range.start < range.end.row {
if range.start.row <= query_row_range.end && query_row_range.start <= range.end.row {
let end_row = if range.end.column > 0 {
range.end.row + 1
} else {
@ -186,8 +185,8 @@ impl BufferDiff {
if let Some(patch) = patch {
for hunk_index in 0..patch.num_hunks() {
let patch = Self::process_patch_hunk(&patch, hunk_index, buffer);
tree.push(patch, buffer);
let hunk = Self::process_patch_hunk(&patch, hunk_index, buffer);
tree.push(hunk, buffer);
}
}
}
@ -348,10 +347,14 @@ impl BufferDiff {
hunk_index: usize,
buffer: &text::BufferSnapshot,
) -> DiffHunk<Anchor> {
let line_item_count = patch.num_lines_in_hunk(hunk_index).unwrap();
assert!(line_item_count > 0);
let mut first_deletion_buffer_row: Option<u32> = None;
let mut buffer_byte_range: Option<Range<usize>> = None;
let mut head_byte_range: Option<Range<usize>> = None;
for line_index in 0..patch.num_lines_in_hunk(hunk_index).unwrap() {
for line_index in 0..line_item_count {
let line = patch.line_in_hunk(hunk_index, line_index).unwrap();
let kind = line.origin_value();
let content_offset = line.content_offset() as isize;
@ -380,10 +383,24 @@ impl BufferDiff {
_ => {}
}
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
let buffer_byte_range = buffer_byte_range.unwrap_or(0..0);
let buffer_byte_range = buffer_byte_range.unwrap_or_else(|| {
//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 anchor = buffer.anchor_before(Point::new(row, 0));
let offset = anchor.to_offset(buffer);
offset..offset
});
//unwrap_or addition without deletion
let head_byte_range = head_byte_range.unwrap_or(0..0);