Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unify visual line_mode and non line_mode operators

Browse source
This commit is contained in:
Keith Simmons 2022-05-24 13:35:57 -07:00
parent 11569a869a
commit e93c49f4f0
12 changed files with 141 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/editor/src/display_map.rs
View file

@ -279,16 +279,21 @@ impl DisplaySnapshot {
}
}
pub fn expand_to_line(&self, mut range: Range<Point>) -> Range<Point> {
(range.start, _) = self.prev_line_boundary(range.start);
(range.end, _) = self.next_line_boundary(range.end);
pub fn expand_to_line(&self, range: Range<Point>) -> Range<Point> {
let mut new_start = self.prev_line_boundary(range.start).0;
let mut new_end = self.next_line_boundary(range.end).0;
if range.is_empty() && range.start.row > 0 {
range.start.row -= 1;
range.start.column = self.buffer_snapshot.line_len(range.start.row);
if new_start.row == range.start.row && new_end.row == range.end.row {
if new_end.row < self.buffer_snapshot.max_point().row {
new_end.row += 1;
new_end.column = 0;
} else if new_start.row > 0 {
new_start.row -= 1;
new_start.column = self.buffer_snapshot.line_len(new_start.row);
}
}
range
new_start..new_end
}
fn point_to_display_point(&self, point: Point, bias: Bias) -> DisplayPoint {