Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve transpose when cursors are two chars away from each other

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-04 09:59:34 +02:00
parent 95680aa5f2
commit 9a7c07f539
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/editor/src/editor.rs
View file

@ -3411,7 +3411,7 @@ impl Editor {
let transpose_start = display_map
.buffer_snapshot
.clip_offset(transpose_offset.saturating_sub(1), Bias::Left);
if edits.last().map_or(true, |e| e.0.end < transpose_start) {
if edits.last().map_or(true, |e| e.0.end <= transpose_start) {
let transpose_end = display_map
.buffer_snapshot
.clip_offset(transpose_offset + 1, Bias::Right);
@ -3422,6 +3422,11 @@ impl Editor {
}
});
this.buffer.update(cx, |buffer, cx| buffer.edit(edits, cx));
this.update_selections(
this.local_selections::<usize>(cx),
Some(Autoscroll::Fit),
cx,
);
});
}
@ -8316,15 +8321,15 @@ mod tests {
assert_eq!(editor.selected_ranges(cx), [3..3, 4..4, 6..6]);
editor.transpose(&Default::default(), cx);
assert_eq!(editor.text(cx), "bcdae\n");
assert_eq!(editor.selected_ranges(cx), [4..4, 5..5, 6..6]);
assert_eq!(editor.text(cx), "bcda\ne");
assert_eq!(editor.selected_ranges(cx), [4..4, 6..6]);
editor.transpose(&Default::default(), cx);
assert_eq!(editor.text(cx), "bcdea\n");
assert_eq!(editor.selected_ranges(cx), [5..5, 6..6]);
assert_eq!(editor.text(cx), "bcade\n");
assert_eq!(editor.selected_ranges(cx), [4..4, 6..6]);
editor.transpose(&Default::default(), cx);
assert_eq!(editor.text(cx), "bcdae\n");
assert_eq!(editor.text(cx), "bcaed\n");
assert_eq!(editor.selected_ranges(cx), [5..5, 6..6]);
editor