mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-25 07:55:56 +00:00
Fix outdent not working when cursor is at column 0
This commit is contained in:
parent
8d7bb8b1a3
commit
b1de9a945d
1 changed files with 25 additions and 16 deletions
|
@ -1556,29 +1556,23 @@ impl Editor {
|
||||||
self.start_transaction(cx);
|
self.start_transaction(cx);
|
||||||
let tab_size = (self.build_settings)(cx).tab_size;
|
let tab_size = (self.build_settings)(cx).tab_size;
|
||||||
let selections = self.local_selections::<Point>(cx);
|
let selections = self.local_selections::<Point>(cx);
|
||||||
|
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
|
||||||
let mut deletion_ranges = Vec::new();
|
let mut deletion_ranges = Vec::new();
|
||||||
let mut last_outdent = None;
|
let mut last_outdent = None;
|
||||||
{
|
{
|
||||||
let buffer = self.buffer.read(cx).read(cx);
|
let buffer = self.buffer.read(cx).read(cx);
|
||||||
for selection in &selections {
|
for selection in &selections {
|
||||||
let mut start_row = selection.start.row;
|
let mut rows = selection.spanned_rows(false, &display_map);
|
||||||
let mut end_row = selection.end.row + 1;
|
|
||||||
|
|
||||||
// If a selection ends at the beginning of a line, don't indent
|
|
||||||
// that last line.
|
|
||||||
if selection.end.column == 0 {
|
|
||||||
end_row -= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Avoid re-outdenting a row that has already been outdented by a
|
// Avoid re-outdenting a row that has already been outdented by a
|
||||||
// previous selection.
|
// previous selection.
|
||||||
if let Some(last_row) = last_outdent {
|
if let Some(last_row) = last_outdent {
|
||||||
if last_row == selection.start.row {
|
if last_row == rows.start {
|
||||||
start_row += 1;
|
rows.start += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for row in start_row..end_row {
|
for row in rows {
|
||||||
let column = buffer.indent_column_for_line(row) as usize;
|
let column = buffer.indent_column_for_line(row) as usize;
|
||||||
if column > 0 {
|
if column > 0 {
|
||||||
let mut deletion_len = (column % tab_size) as u32;
|
let mut deletion_len = (column % tab_size) as u32;
|
||||||
|
@ -3832,11 +3826,7 @@ impl<T: ToPoint + ToOffset> SelectionExt for Selection<T> {
|
||||||
) -> Range<u32> {
|
) -> Range<u32> {
|
||||||
let start = self.start.to_point(&map.buffer_snapshot);
|
let start = self.start.to_point(&map.buffer_snapshot);
|
||||||
let mut end = self.end.to_point(&map.buffer_snapshot);
|
let mut end = self.end.to_point(&map.buffer_snapshot);
|
||||||
if !include_end_if_at_line_start
|
if !include_end_if_at_line_start && start.row != end.row && end.column == 0 {
|
||||||
&& end.row != map.buffer_snapshot.max_point().row
|
|
||||||
&& start.row != end.row
|
|
||||||
&& end.column == 0
|
|
||||||
{
|
|
||||||
end.row -= 1;
|
end.row -= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4958,6 +4948,25 @@ mod tests {
|
||||||
view.selected_display_ranges(cx),
|
view.selected_display_ranges(cx),
|
||||||
&[DisplayPoint::new(1, 1)..DisplayPoint::new(2, 0)]
|
&[DisplayPoint::new(1, 1)..DisplayPoint::new(2, 0)]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Ensure that indenting/outdenting works when the cursor is at column 0.
|
||||||
|
view.select_display_ranges(&[DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0)], cx)
|
||||||
|
.unwrap();
|
||||||
|
view.tab(&Tab, cx);
|
||||||
|
assert_eq!(view.text(cx), "one two\n three\n four");
|
||||||
|
assert_eq!(
|
||||||
|
view.selected_display_ranges(cx),
|
||||||
|
&[DisplayPoint::new(1, 4)..DisplayPoint::new(1, 4)]
|
||||||
|
);
|
||||||
|
|
||||||
|
view.select_display_ranges(&[DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0)], cx)
|
||||||
|
.unwrap();
|
||||||
|
view.outdent(&Outdent, cx);
|
||||||
|
assert_eq!(view.text(cx), "one two\nthree\n four");
|
||||||
|
assert_eq!(
|
||||||
|
view.selected_display_ranges(cx),
|
||||||
|
&[DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0)]
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue