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

Fix delete_line test

Browse source
This commit is contained in:
Antonio Scandurra 2021-04-28 09:53:25 +02:00
parent ccd244bac7
commit cee9509127
1 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
zed/src/editor/buffer_view.rs
View file

@ -544,61 +544,65 @@ impl BufferView {
let app = ctx.as_ref(); let app = ctx.as_ref();
let buffer = self.buffer.read(app); let buffer = self.buffer.read(app);
// Accumulate contiguous regions of rows that we want to delete. let mut new_cursors = Vec::new();
let mut row_ranges: Vec<(u32, Range<u32>)> = Vec::new(); let mut edit_ranges = Vec::new();
for selection in self.selections(app) {
let mut selections = self.selections(app).iter().peekable();
while let Some(selection) = selections.next() {
let start = selection.start.to_point(buffer).unwrap(); let start = selection.start.to_point(buffer).unwrap();
let end = selection.end.to_point(buffer).unwrap(); let mut end = selection.end.to_point(buffer).unwrap();
let goal_column = if selection.reversed { let goal_column = if selection.reversed {
start.column start.column
} else { } else {
end.column end.column
}; };
if let Some((_, last_row_range)) = row_ranges.last_mut() { // Accumulate contiguous regions of rows that we want to delete.
if start.row <= last_row_range.end { while let Some(next_selection) = selections.peek() {
*last_row_range = last_row_range.start..start.row + 1; let next_start = next_selection.start.to_point(buffer).unwrap();
if next_start.row <= end.row + 1 {
end = next_selection.end.to_point(buffer).unwrap();
selections.next().unwrap();
} else { } else {
row_ranges.push((goal_column, start.row..end.row + 1)); break;
} }
} else {
row_ranges.push((goal_column, start.row..end.row + 1));
} }
}
let mut edit_ranges = Vec::new(); let mut edit_start = Point::new(start.row, 0).to_offset(buffer).unwrap();
let mut new_selections = Vec::new(); let edit_end;
for (goal_column, range) in row_ranges {
let mut start = Point::new(range.start, 0).to_offset(buffer).unwrap();
let end;
let mut cursor; let mut cursor;
if let Ok(end_offset) = Point::new(range.end, 0).to_offset(buffer) { if let Ok(end_offset) = Point::new(end.row + 1, 0).to_offset(buffer) {
// If there's a line after the range, delete the \n from the end of the row range // If there's a line after the range, delete the \n from the end of the row range
// and position the cursor on the next line. // and position the cursor on the next line.
end = end_offset; edit_end = end_offset;
cursor = Point::new(range.end, goal_column); cursor = Point::new(end.row + 1, goal_column);
} else { } else {
// If there isn't a line after the range, delete the \n from the line before the // If there isn't a line after the range, delete the \n from the line before the
// start of the row range and position the cursor there. // start of the row range and position the cursor there.
start = start.saturating_sub(1); edit_start = edit_start.saturating_sub(1);
end = buffer.len(); edit_end = buffer.len();
cursor = Point::new(range.start.saturating_sub(1), goal_column); cursor = Point::new(start.row.saturating_sub(1), goal_column);
} }
// We tried to maintain the column of the original cursors but the new lines may be // We tried to maintain the column of the original cursor but the new line may be
// shorter, so clip the new cursor's column. // shorter, so clip the new cursor's column.
cursor.column = cmp::min(cursor.column, buffer.line_len(cursor.row).unwrap()); cursor.column = cmp::min(cursor.column, buffer.line_len(cursor.row).unwrap());
let cursor = buffer.anchor_before(cursor).unwrap();
edit_ranges.push(start..end); new_cursors.push(cursor);
new_selections.push(Selection { edit_ranges.push(edit_start..edit_end);
start: cursor.clone(),
end: cursor,
reversed: false,
goal_column: None,
});
} }
new_cursors.sort_unstable();
let new_selections = new_cursors
.into_iter()
.map(|cursor| buffer.anchor_before(cursor).unwrap())
.map(|anchor| Selection {
start: anchor.clone(),
end: anchor,
reversed: false,
goal_column: None,
})
.collect();
self.update_selections(new_selections, true, ctx); self.update_selections(new_selections, true, ctx);
self.buffer self.buffer
.update(ctx, |buffer, ctx| buffer.edit(edit_ranges, "", Some(ctx))) .update(ctx, |buffer, ctx| buffer.edit(edit_ranges, "", Some(ctx)))
@ -1955,22 +1959,10 @@ mod tests {
assert_eq!( assert_eq!(
view.read(app).selection_ranges(app.as_ref()), view.read(app).selection_ranges(app.as_ref()),
vec![ vec![
DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0),
DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3) DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1)
] ]
); );
// view.undo(&(), ctx);
// view.select_display_ranges(
// &[
// DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1),
// DisplayPoint::new(1, 0)..DisplayPoint::new(1, 1),
// DisplayPoint::new(3, 0)..DisplayPoint::new(3, 0),
// ],
// ctx,
// )
// .unwrap();
// });
}); });
} }