ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-12-01 11:23:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix compose not merging certain changesets correctly.

Browse Source
This commit is contained in:
Blaž Hrastnik 2020-10-14 09:38:52 +09:00
parent 989080afed
commit 94f9603c74
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helix-core/src/selection.rs
View File

@ -371,17 +371,17 @@ mod test {
assert_eq!(
result.ranges(),
&[
Range::new(0, 4),
Range::new(5, 8),
Range::new(10, 12),
Range::new(15, 18),
Range::new(0, 3),
Range::new(5, 7),
Range::new(10, 11),
Range::new(15, 17),
Range::new(19, 19),
]
);
assert_eq!(
result.fragments(&text.slice(..)).collect::<Vec<_>>(),
&["abcd", "efg", "rs", "xyz", ""]
&["abcd", "efg", "rs", "xyz", "1"]
);
}
}

17
helix-core/src/transaction.rs
View File

@ -133,10 +133,9 @@ impl ChangeSet {
Ordering::Greater => {
// figure out the byte index of the truncated string end
let (pos, _) = s.char_indices().nth(j).unwrap();
// calculate the difference
let to_drop = s.len() - pos;
s.pop_back(u32::try_from(to_drop).unwrap());
head_a = Some(Insert(s));
let pos = pos as u32;
changes.push(Insert(s.subtendril(0, pos)));
head_a = Some(Insert(s.subtendril(pos, s.len() as u32 - pos)));
head_b = changes_b.next();
}
}
@ -425,7 +424,7 @@ impl Transaction {
let len = state.doc.len_chars();
let mut acc = Vec::with_capacity(2 * changes.len() + 1);
// TODO: verify ranges are ordered and not overlapping.
// TODO: verify ranges are ordered and not overlapping or change will panic.
let mut last = 0;
for (from, to, tendril) in changes {
@ -445,7 +444,11 @@ impl Transaction {
}
last = to;
}
acc.push(Operation::Retain(len - last));
let span = len - last;
if span > 0 {
acc.push(Operation::Retain(span));
}
Self::from(ChangeSet { changes: acc, len })
}
@ -580,7 +583,7 @@ mod test {
let transaction = Transaction::change(
&state,
// (1, 1, None) is a useless 0-width delete
vec![(6, 11, Some("void".into())), (12, 17, None), (1, 1, None)].into_iter(),
vec![(1, 1, None), (6, 11, Some("void".into())), (12, 17, None)].into_iter(),
);
transaction.apply(&mut state);
assert_eq!(state.doc, Rope::from_str("hello void! 123"));