mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

diff: add helpers for finding index for non-base side

Browse source 
We have some repeated code doing `wrapping_add()`, so let's add
helpers to reduce repetition.
This commit is contained in:
Martin von Zweigbergk 2022-03-10 13:06:12 -08:00 committed by Martin von Zweigbergk
parent 16c68ab821
commit 6fabf89529
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/src/diff.rs
View file

@ -297,8 +297,20 @@ struct UnchangedRange {
offsets: Vec<isize>,
}
/// We only order by the base range's start because we make sure to never have
/// overlapping ranges.
impl UnchangedRange {
fn start(&self, side: usize) -> usize {
self.base_range
.start
.wrapping_add(self.offsets[side] as usize)
}
fn end(&self, side: usize) -> usize {
self.base_range
.end
.wrapping_add(self.offsets[side] as usize)
}
}
impl PartialOrd for UnchangedRange {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
@ -467,12 +479,8 @@ impl<'input> Diff<'input> {
// (`self`).
let mut slices =
vec![&self.base_input[previous.base_range.end..current.base_range.start]];
for (i, offset) in current.offsets.iter().enumerate() {
let changed_range = previous
.base_range
.end
.wrapping_add(previous.offsets[i] as usize)
..current.base_range.start.wrapping_add(*offset as usize);
for i in 0..current.offsets.len() {
let changed_range = previous.end(i)..current.start(i);
slices.push(&self.other_inputs[i][changed_range]);
}
@ -582,16 +590,7 @@ impl<'diff, 'input> Iterator for DiffHunkIterator<'diff, 'input> {
&self.diff.base_input[self.previous.base_range.end..current.base_range.start],
];
for (i, input) in self.diff.other_inputs.iter().enumerate() {
let start = self
.previous
.base_range
.end
.wrapping_add(self.previous.offsets[i] as usize);
let end = current
.base_range
.start
.wrapping_add(current.offsets[i] as usize);
slices.push(&input[start..end]);
slices.push(&input[self.previous.end(i)..current.start(i)]);
}
self.previous = current.clone();
self.unchanged_emitted = false;