mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

diff: rely on emptiness of unified hunk lines whether to append "after" context

Browse source 
show_context_after was set once when DiffHunk::Different received, and was
never turned off. This means DiffHunk::Matching is not supposed to repeat.
Under this condition, we can assume that removed/added lines exist if lines
isn't empty.
This commit is contained in:
Yuya Nishihara 2024-06-29 00:18:46 +09:00
parent 318f594291
commit ec709e7f8b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cli/src/diff_util.rs
View file

@ -770,13 +770,13 @@ fn unified_diff_hunks<'content>(
right_line_range: 1..1, right_line_range: 1..1,
lines: vec![], lines: vec![],
}; };
let mut show_context_after = false;
let diff = Diff::for_tokenizer(&[left_content, right_content], diff::find_line_ranges); let diff = Diff::for_tokenizer(&[left_content, right_content], diff::find_line_ranges);
for hunk in diff.hunks() { for hunk in diff.hunks() {
match hunk { match hunk {
DiffHunk::Matching(content) => { DiffHunk::Matching(content) => {
let mut lines = content.split_inclusive(|b| *b == b'\n').fuse(); let mut lines = content.split_inclusive(|b| *b == b'\n').fuse();
if show_context_after { if !current_hunk.lines.is_empty() {
// The previous hunk line should be either removed/added.
current_hunk.extend_context_lines(lines.by_ref().take(num_context_lines)); current_hunk.extend_context_lines(lines.by_ref().take(num_context_lines));
} }
let before_lines = lines.by_ref().rev().take(num_context_lines).collect_vec(); let before_lines = lines.by_ref().rev().take(num_context_lines).collect_vec();
@ -793,10 +793,10 @@ fn unified_diff_hunks<'content>(
lines: vec![], lines: vec![],
}; };
} }
// The next hunk should be of DiffHunk::Different type if any.
current_hunk.extend_context_lines(before_lines.into_iter().rev()); current_hunk.extend_context_lines(before_lines.into_iter().rev());
} }
DiffHunk::Different(content) => { DiffHunk::Different(content) => {
show_context_after = true;
let left_lines = content[0].split_inclusive(|b| *b == b'\n'); let left_lines = content[0].split_inclusive(|b| *b == b'\n');
let right_lines = content[1].split_inclusive(|b| *b == b'\n'); let right_lines = content[1].split_inclusive(|b| *b == b'\n');
current_hunk.extend_removed_lines(left_lines); current_hunk.extend_removed_lines(left_lines);
@ -804,6 +804,7 @@ fn unified_diff_hunks<'content>(
} }
} }
} }
// The last unified hunk might contain redundant "before" context lines.
if !current_hunk if !current_hunk
.lines .lines
.iter() .iter()