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

WIP: Start moving toward a simpler interface for detecting prev/next line boundaries

Browse source
This commit is contained in:
Nathan Sobo 2021-12-27 22:11:05 -08:00
parent 89bbfb8154
commit 7f786ca8a6
3 changed files with 125 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,6 +226,19 @@ impl DisplaySnapshot {
}
}
pub fn prev_line_boundary(&self, mut point: Point) -> Point {
loop {
point.column = 0;
let mut display_point = self.point_to_display_point(point, Bias::Left);
*display_point.column_mut() = 0;
let next_point = self.display_point_to_point(display_point, Bias::Left);
if next_point == point {
return point;
}
point = next_point;
}
}
pub fn next_line_boundary(&self, mut point: Point) -> Point {
loop {
point.column = self.buffer_snapshot.line_len(point.row);
@ -247,16 +260,6 @@ impl DisplaySnapshot {
DisplayPoint(block_point)
}
fn point_to_display_point_with_clipping(&self, point: Point, bias: Bias) -> DisplayPoint {
let fold_point = point.to_fold_point(&self.folds_snapshot, bias);
let tab_point = self.tabs_snapshot.to_tab_point(fold_point);
let wrap_point = self
.wraps_snapshot
.from_tab_point_with_clipping(tab_point, bias);
let block_point = self.blocks_snapshot.to_block_point(wrap_point);
DisplayPoint(block_point)
}
fn display_point_to_point(&self, point: DisplayPoint, bias: Bias) -> Point {
let block_point = point.0;
let wrap_point = self.blocks_snapshot.to_wrap_point(block_point);