mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

add anchor to selection fixup info in newline

Browse source
This commit is contained in:
Keith Simmons 2022-04-28 13:10:31 -07:00
parent 4c860dc82f
commit 42b900774e
1 changed files with 60 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1861,11 +1861,12 @@ impl Editor {
pub fn newline(&mut self, _: &Newline, cx: &mut ViewContext<Self>) { pub fn newline(&mut self, _: &Newline, cx: &mut ViewContext<Self>) {
self.transact(cx, |this, cx| { self.transact(cx, |this, cx| {
let mut old_selections = SmallVec::<[_; 32]>::new(); let (edits, selection_fixup_info): (Vec<_>, Vec<_>) = {
{
let selections = this.local_selections::<usize>(cx); let selections = this.local_selections::<usize>(cx);
let buffer = this.buffer.read(cx).snapshot(cx); let buffer = this.buffer.read(cx).snapshot(cx);
for selection in selections.iter() { selections
.iter()
.map(|selection| {
let start_point = selection.start.to_point(&buffer); let start_point = selection.start.to_point(&buffer);
let indent = buffer let indent = buffer
.indent_column_for_line(start_point.row) .indent_column_for_line(start_point.row)
@ -1892,7 +1893,8 @@ impl Editor {
let pair_end = pair.end.trim_start(); let pair_end = pair.end.trim_start();
pair.newline pair.newline
&& buffer.contains_str_at(end + trailing_whitespace_len, pair_end) && buffer
.contains_str_at(end + trailing_whitespace_len, pair_end)
&& buffer.contains_str_at( && buffer.contains_str_at(
(start - leading_whitespace_len) (start - leading_whitespace_len)
.saturating_sub(pair_start.len()), .saturating_sub(pair_start.len()),
@ -1901,29 +1903,21 @@ impl Editor {
}); });
} }
old_selections.push(( let mut new_text = String::with_capacity(1 + indent as usize);
selection.id,
buffer.anchor_after(end),
start..end,
indent,
insert_extra_newline,
));
}
}
this.buffer.update(cx, |buffer, cx| {
let edits =
old_selections
.iter()
.map(|(_, _, range, indent, insert_extra_newline)| {
let mut new_text = String::with_capacity(1 + *indent as usize);
new_text.push('\n'); new_text.push('\n');
new_text.extend(iter::repeat(' ').take(*indent as usize)); new_text.extend(iter::repeat(' ').take(indent as usize));
if *insert_extra_newline { if insert_extra_newline {
new_text = new_text.repeat(2); new_text = new_text.repeat(2);
} }
(range.clone(), new_text) (
}); (start..end, new_text),
(insert_extra_newline, buffer.anchor_after(end)),
)
})
.unzip()
};
this.buffer.update(cx, |buffer, cx| {
buffer.edit_with_autoindent_batched(edits, cx); buffer.edit_with_autoindent_batched(edits, cx);
let buffer = buffer.read(cx); let buffer = buffer.read(cx);
@ -1931,11 +1925,10 @@ impl Editor {
.selections .selections
.iter() .iter()
.cloned() .cloned()
.zip(old_selections) .zip(selection_fixup_info)
.map( .map(|(mut new_selection, (extra_newline_inserted, end))| {
|(mut new_selection, (_, end_anchor, _, _, insert_extra_newline))| { let mut cursor = end.to_point(&buffer);
let mut cursor = end_anchor.to_point(&buffer); if extra_newline_inserted {
if insert_extra_newline {
cursor.row -= 1; cursor.row -= 1;
cursor.column = buffer.line_len(cursor.row); cursor.column = buffer.line_len(cursor.row);
} }
@ -1943,8 +1936,7 @@ impl Editor {
new_selection.start = anchor.clone(); new_selection.start = anchor.clone();
new_selection.end = anchor; new_selection.end = anchor;
new_selection new_selection
}, })
)
.collect(); .collect();
}); });