Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding

Git gutter meets code folding (and word wrap fixes)
This commit is contained in:
Julia 2022-10-17 14:51:47 -04:00 committed by GitHub
commit 2149c17a0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 174 additions and 143 deletions

View file

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