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

Improve moving to start or end of soft-wrapped lines

Browse source 
When moving to end, stop at the soft-wrap line boundary first, then move to the end of the hard line. Vice versa when moving to the beginning.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2022-02-04 09:52:50 -07:00
parent aa12eb6b55
commit 90a780a604
1 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/editor/src/movement.rs
View file

@ -1,6 +1,7 @@
use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint}; use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
use crate::{char_kind, CharKind, ToPoint}; use crate::{char_kind, CharKind, ToPoint};
use anyhow::Result; use anyhow::Result;
use language::Point;
use std::ops::Range; use std::ops::Range;
pub fn left(map: &DisplaySnapshot, mut point: DisplayPoint) -> Result<DisplayPoint> { pub fn left(map: &DisplaySnapshot, mut point: DisplayPoint) -> Result<DisplayPoint> {
@ -93,20 +94,37 @@ pub fn down(
pub fn line_beginning( pub fn line_beginning(
map: &DisplaySnapshot, map: &DisplaySnapshot,
point: DisplayPoint, display_point: DisplayPoint,
toggle_indent: bool, toggle_indent: bool,
) -> DisplayPoint { ) -> DisplayPoint {
let (indent, is_blank) = map.line_indent(point.row()); let point = display_point.to_point(map);
if toggle_indent && !is_blank && point.column() != indent { let soft_line_start = map.clip_point(DisplayPoint::new(display_point.row(), 0), Bias::Right);
DisplayPoint::new(point.row(), indent) let indent_start = Point::new(
point.row,
map.buffer_snapshot.indent_column_for_line(point.row),
)
.to_display_point(map);
let line_start = map.prev_line_boundary(point).1;
if display_point != soft_line_start {
soft_line_start
} else if toggle_indent && display_point != indent_start {
indent_start
} else { } else {
DisplayPoint::new(point.row(), 0) line_start
} }
} }
pub fn line_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint { pub fn line_end(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
let line_end = DisplayPoint::new(point.row(), map.line_len(point.row())); let soft_line_end = map.clip_point(
map.clip_point(line_end, Bias::Left) DisplayPoint::new(display_point.row(), map.line_len(display_point.row())),
Bias::Left,
);
if display_point == soft_line_end {
map.next_line_boundary(display_point.to_point(map)).1
} else {
soft_line_end
}
} }
pub fn prev_word_boundary(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint { pub fn prev_word_boundary(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {