mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 02:20:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Fix selection positions in tab w/ multiple non-empty selections on the same line

Browse source 
Co-authored-by: Julia Risley <floc@unpromptedtirade.com>
This commit is contained in:
Max Brunsfeld 2022-08-02 11:41:51 -07:00
parent c87eb16ad9
commit 2533648419
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2925,8 +2925,8 @@ impl Editor {
for selection in &mut selections {
if selection.start.row != prev_edited_row {
row_delta = 0;
prev_edited_row = selection.end.row;
}
prev_edited_row = selection.end.row;
if selection.is_empty() {
let cursor = selection.head();
@ -2998,10 +2998,10 @@ impl Editor {
if selection.start.row != prev_edited_row {
row_delta = 0;
}
prev_edited_row = selection.end.row;
row_delta =
Self::indent_selection(buffer, &snapshot, selection, &mut edits, row_delta, cx);
prev_edited_row = selection.end.row;
}
self.transact(cx, |this, cx| {
@ -3075,7 +3075,11 @@ impl Editor {
}
}
delta_for_end_row
if selection.start.row == selection.end.row {
delta_for_start_row + delta_for_end_row
} else {
delta_for_end_row
}
}
pub fn outdent(&mut self, _: &Outdent, cx: &mut ViewContext<Self>) {
@ -8001,6 +8005,16 @@ mod tests {
|🏀 |🏀 |efg
d |
"});
cx.set_state(indoc! {"
a
[🏀}🏀[🏀}🏀[🏀}
"});
cx.update_editor(|e, cx| e.tab(&Tab, cx));
cx.assert_editor_state(indoc! {"
a
[🏀}🏀[🏀}🏀[🏀}
"});
}
#[gpui::test]