TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Don't try to compose zero-width deletes.

Browse source
This commit is contained in:
Blaž Hrastnik 2020-10-08 14:21:03 +09:00
parent 490e23b645
commit 4a648555ed
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
helix-core/src/transaction.rs
View file

@ -439,7 +439,9 @@ impl Transaction {
} }
acc.push(Operation::Insert(text)); acc.push(Operation::Insert(text));
} }
None => acc.push(Operation::Delete(span)), None if span > 0 => acc.push(Operation::Delete(span)),
// empty delete is useless
None => (),
} }
last = to; last = to;
} }
@ -577,7 +579,8 @@ mod test {
let mut state = State::new("hello world!\ntest 123".into()); let mut state = State::new("hello world!\ntest 123".into());
let transaction = Transaction::change( let transaction = Transaction::change(
&state, &state,
vec![(6, 11, Some("void".into())), (12, 17, None)].into_iter(), // (1, 1, None) is a useless 0-width delete
vec![(6, 11, Some("void".into())), (12, 17, None), (1, 1, None)].into_iter(),
); );
transaction.apply(&mut state); transaction.apply(&mut state);
assert_eq!(state.doc, Rope::from_str("hello void! 123")); assert_eq!(state.doc, Rope::from_str("hello void! 123"));