zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use anchors for line movement edits to support multi-buffers

Browse Source 
Because multi-buffers can contain the same content multiple times, we need to use anchors to track our desired insertion and removal locations when moving lines. This is because deleting a line in order to move it might end up deleting *multiple* lines.
This commit is contained in:
Nathan Sobo 2021-12-29 23:47:03 -08:00
parent 7c9e4e513c
commit 984378e12c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/editor/src/editor.rs
View File

@ -1737,8 +1737,13 @@ impl Editor {
.chain(['\n'])
.collect::<String>();
edits.push((insertion_point..insertion_point, text));
edits.push((range_to_move.clone(), String::new()));
edits.push((
buffer.anchor_after(range_to_move.start)
..buffer.anchor_before(range_to_move.end),
String::new(),
));
let insertion_anchor = buffer.anchor_after(insertion_point);
edits.push((insertion_anchor.clone()..insertion_anchor, text));
let row_delta = range_to_move.start.row - insertion_point.row + 1;
@ -1773,7 +1778,7 @@ impl Editor {
self.start_transaction(cx);
self.unfold_ranges(unfold_ranges, cx);
self.buffer.update(cx, |buffer, cx| {
for (range, text) in edits.into_iter().rev() {
for (range, text) in edits {
buffer.edit([range], text, cx);
}
});
@ -1828,8 +1833,13 @@ impl Editor {
let mut text = String::from("\n");
text.extend(buffer.text_for_range(range_to_move.clone()));
text.pop(); // Drop trailing newline
edits.push((range_to_move.clone(), String::new()));
edits.push((insertion_point..insertion_point, text));
edits.push((
buffer.anchor_after(range_to_move.start)
..buffer.anchor_before(range_to_move.end),
String::new(),
));
let insertion_anchor = buffer.anchor_after(insertion_point);
edits.push((insertion_anchor.clone()..insertion_anchor, text));
let row_delta = insertion_point.row - range_to_move.end.row + 1;
@ -1864,7 +1874,7 @@ impl Editor {
self.start_transaction(cx);
self.unfold_ranges(unfold_ranges, cx);
self.buffer.update(cx, |buffer, cx| {
for (range, text) in edits.into_iter().rev() {
for (range, text) in edits {
buffer.edit([range], text, cx);
}
});