2021-07-15 18:48:57 +00:00
|
|
|
|
use super::{Bias, DisplayMapSnapshot, DisplayPoint, SelectionGoal};
|
2021-03-10 04:00:51 +00:00
|
|
|
|
use anyhow::Result;
|
|
|
|
|
|
2021-07-15 18:48:57 +00:00
|
|
|
|
pub fn left(map: &DisplayMapSnapshot, mut point: DisplayPoint) -> Result<DisplayPoint> {
|
2021-03-10 04:00:51 +00:00
|
|
|
|
if point.column() > 0 {
|
|
|
|
|
*point.column_mut() -= 1;
|
|
|
|
|
} else if point.row() > 0 {
|
|
|
|
|
*point.row_mut() -= 1;
|
2021-07-15 18:48:57 +00:00
|
|
|
|
*point.column_mut() = map.line_len(point.row());
|
2021-03-10 04:00:51 +00:00
|
|
|
|
}
|
2021-07-15 18:48:57 +00:00
|
|
|
|
Ok(map.clip_point(point, Bias::Left))
|
2021-03-10 04:00:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2021-07-15 18:48:57 +00:00
|
|
|
|
pub fn right(map: &DisplayMapSnapshot, mut point: DisplayPoint) -> Result<DisplayPoint> {
|
|
|
|
|
let max_column = map.line_len(point.row());
|
2021-03-10 04:00:51 +00:00
|
|
|
|
if point.column() < max_column {
|
2021-05-19 20:45:54 +00:00
|
|
|
|
*point.column_mut() += 1;
|
2021-07-15 18:48:57 +00:00
|
|
|
|
} else if point.row() < map.max_point().row() {
|
2021-03-10 04:00:51 +00:00
|
|
|
|
*point.row_mut() += 1;
|
|
|
|
|
*point.column_mut() = 0;
|
|
|
|
|
}
|
2021-07-15 18:48:57 +00:00
|
|
|
|
Ok(map.clip_point(point, Bias::Right))
|
2021-03-10 04:00:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn up(
|
2021-07-15 18:48:57 +00:00
|
|
|
|
map: &DisplayMapSnapshot,
|
2021-03-10 04:00:51 +00:00
|
|
|
|
mut point: DisplayPoint,
|
2021-05-10 13:06:07 +00:00
|
|
|
|
goal: SelectionGoal,
|
|
|
|
|
) -> Result<(DisplayPoint, SelectionGoal)> {
|
|
|
|
|
let goal_column = if let SelectionGoal::Column(column) = goal {
|
|
|
|
|
column
|
|
|
|
|
} else {
|
2021-05-25 09:51:29 +00:00
|
|
|
|
map.column_to_chars(point.row(), point.column())
|
2021-05-10 13:06:07 +00:00
|
|
|
|
};
|
2021-05-19 05:32:34 +00:00
|
|
|
|
|
2021-03-10 04:00:51 +00:00
|
|
|
|
if point.row() > 0 {
|
|
|
|
|
*point.row_mut() -= 1;
|
2021-05-25 09:51:29 +00:00
|
|
|
|
*point.column_mut() = map.column_from_chars(point.row(), goal_column);
|
2021-03-10 04:00:51 +00:00
|
|
|
|
} else {
|
|
|
|
|
point = DisplayPoint::new(0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-29 17:07:01 +00:00
|
|
|
|
let clip_bias = if point.column() == map.line_len(point.row()) {
|
|
|
|
|
Bias::Left
|
|
|
|
|
} else {
|
|
|
|
|
Bias::Right
|
|
|
|
|
};
|
|
|
|
|
|
2021-07-27 22:50:06 +00:00
|
|
|
|
Ok((
|
2021-07-29 17:07:01 +00:00
|
|
|
|
map.clip_point(point, clip_bias),
|
2021-07-27 22:50:06 +00:00
|
|
|
|
SelectionGoal::Column(goal_column),
|
|
|
|
|
))
|
2021-03-10 04:00:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn down(
|
2021-07-15 18:48:57 +00:00
|
|
|
|
map: &DisplayMapSnapshot,
|
2021-03-10 04:00:51 +00:00
|
|
|
|
mut point: DisplayPoint,
|
2021-05-10 13:06:07 +00:00
|
|
|
|
goal: SelectionGoal,
|
|
|
|
|
) -> Result<(DisplayPoint, SelectionGoal)> {
|
2021-07-15 18:48:57 +00:00
|
|
|
|
let max_point = map.max_point();
|
2021-05-10 13:06:07 +00:00
|
|
|
|
let goal_column = if let SelectionGoal::Column(column) = goal {
|
|
|
|
|
column
|
|
|
|
|
} else {
|
2021-05-25 09:51:29 +00:00
|
|
|
|
map.column_to_chars(point.row(), point.column())
|
2021-05-10 13:06:07 +00:00
|
|
|
|
};
|
2021-05-19 05:32:34 +00:00
|
|
|
|
|
2021-03-10 04:00:51 +00:00
|
|
|
|
if point.row() < max_point.row() {
|
|
|
|
|
*point.row_mut() += 1;
|
2021-05-25 09:51:29 +00:00
|
|
|
|
*point.column_mut() = map.column_from_chars(point.row(), goal_column);
|
2021-03-10 04:00:51 +00:00
|
|
|
|
} else {
|
|
|
|
|
point = max_point;
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-29 17:07:01 +00:00
|
|
|
|
let clip_bias = if point.column() == map.line_len(point.row()) {
|
|
|
|
|
Bias::Left
|
|
|
|
|
} else {
|
|
|
|
|
Bias::Right
|
|
|
|
|
};
|
|
|
|
|
|
2021-07-27 22:50:06 +00:00
|
|
|
|
Ok((
|
2021-07-29 17:07:01 +00:00
|
|
|
|
map.clip_point(point, clip_bias),
|
2021-07-27 22:50:06 +00:00
|
|
|
|
SelectionGoal::Column(goal_column),
|
|
|
|
|
))
|
2021-03-10 04:00:51 +00:00
|
|
|
|
}
|
2021-04-29 07:52:03 +00:00
|
|
|
|
|
|
|
|
|
pub fn line_beginning(
|
2021-07-15 18:48:57 +00:00
|
|
|
|
map: &DisplayMapSnapshot,
|
2021-04-29 07:52:03 +00:00
|
|
|
|
point: DisplayPoint,
|
|
|
|
|
toggle_indent: bool,
|
|
|
|
|
) -> Result<DisplayPoint> {
|
2021-07-15 18:48:57 +00:00
|
|
|
|
let (indent, is_blank) = map.line_indent(point.row());
|
2021-04-29 07:52:03 +00:00
|
|
|
|
if toggle_indent && !is_blank && point.column() != indent {
|
|
|
|
|
Ok(DisplayPoint::new(point.row(), indent))
|
|
|
|
|
} else {
|
|
|
|
|
Ok(DisplayPoint::new(point.row(), 0))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-15 18:48:57 +00:00
|
|
|
|
pub fn line_end(map: &DisplayMapSnapshot, point: DisplayPoint) -> Result<DisplayPoint> {
|
2021-07-27 23:04:26 +00:00
|
|
|
|
let line_end = DisplayPoint::new(point.row(), map.line_len(point.row()));
|
|
|
|
|
Ok(map.clip_point(line_end, Bias::Left))
|
2021-04-29 07:52:03 +00:00
|
|
|
|
}
|
2021-04-29 12:54:50 +00:00
|
|
|
|
|
2021-09-23 00:00:57 +00:00
|
|
|
|
pub fn prev_word_boundary(
|
|
|
|
|
map: &DisplayMapSnapshot,
|
|
|
|
|
mut point: DisplayPoint,
|
|
|
|
|
) -> Result<DisplayPoint> {
|
2021-07-29 20:00:51 +00:00
|
|
|
|
let mut line_start = 0;
|
|
|
|
|
if point.row() > 0 {
|
|
|
|
|
if let Some(indent) = map.soft_wrap_indent(point.row() - 1) {
|
|
|
|
|
line_start = indent;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if point.column() == line_start {
|
2021-04-29 16:52:11 +00:00
|
|
|
|
if point.row() == 0 {
|
2021-09-23 00:00:57 +00:00
|
|
|
|
return Ok(DisplayPoint::new(0, 0));
|
2021-04-29 16:52:11 +00:00
|
|
|
|
} else {
|
|
|
|
|
let row = point.row() - 1;
|
2021-09-23 00:00:57 +00:00
|
|
|
|
point = map.clip_point(DisplayPoint::new(row, map.line_len(row)), Bias::Left);
|
2021-04-29 16:52:11 +00:00
|
|
|
|
}
|
2021-09-23 00:00:57 +00:00
|
|
|
|
}
|
2021-04-29 16:52:11 +00:00
|
|
|
|
|
2021-09-23 00:00:57 +00:00
|
|
|
|
let mut boundary = DisplayPoint::new(point.row(), 0);
|
|
|
|
|
let mut column = 0;
|
|
|
|
|
let mut prev_char_kind = CharKind::Newline;
|
|
|
|
|
for c in map.chars_at(DisplayPoint::new(point.row(), 0)) {
|
|
|
|
|
if column >= point.column() {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-04-29 16:52:11 +00:00
|
|
|
|
|
2021-09-23 00:00:57 +00:00
|
|
|
|
let char_kind = char_kind(c);
|
|
|
|
|
if char_kind != prev_char_kind
|
|
|
|
|
&& char_kind != CharKind::Whitespace
|
|
|
|
|
&& char_kind != CharKind::Newline
|
|
|
|
|
{
|
|
|
|
|
*boundary.column_mut() = column;
|
2021-04-29 16:52:11 +00:00
|
|
|
|
}
|
2021-09-23 00:00:57 +00:00
|
|
|
|
|
|
|
|
|
prev_char_kind = char_kind;
|
|
|
|
|
column += c.len_utf8() as u32;
|
2021-04-29 16:52:11 +00:00
|
|
|
|
}
|
2021-09-23 00:00:57 +00:00
|
|
|
|
Ok(boundary)
|
2021-04-29 12:54:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn next_word_boundary(
|
2021-07-15 18:48:57 +00:00
|
|
|
|
map: &DisplayMapSnapshot,
|
2021-04-29 12:54:50 +00:00
|
|
|
|
mut point: DisplayPoint,
|
|
|
|
|
) -> Result<DisplayPoint> {
|
2021-09-23 00:00:57 +00:00
|
|
|
|
let mut prev_char_kind = None;
|
2021-08-02 12:11:31 +00:00
|
|
|
|
for c in map.chars_at(point) {
|
2021-09-23 00:00:57 +00:00
|
|
|
|
let char_kind = char_kind(c);
|
|
|
|
|
if let Some(prev_char_kind) = prev_char_kind {
|
|
|
|
|
if c == '\n' {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if prev_char_kind != char_kind
|
|
|
|
|
&& prev_char_kind != CharKind::Whitespace
|
|
|
|
|
&& prev_char_kind != CharKind::Newline
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-04-29 12:54:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if c == '\n' {
|
|
|
|
|
*point.row_mut() += 1;
|
|
|
|
|
*point.column_mut() = 0;
|
|
|
|
|
} else {
|
2021-05-18 03:45:14 +00:00
|
|
|
|
*point.column_mut() += c.len_utf8() as u32;
|
2021-04-29 12:54:50 +00:00
|
|
|
|
}
|
2021-09-23 00:00:57 +00:00
|
|
|
|
prev_char_kind = Some(char_kind);
|
2021-04-29 12:54:50 +00:00
|
|
|
|
}
|
|
|
|
|
Ok(point)
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-29 16:52:11 +00:00
|
|
|
|
#[derive(Copy, Clone, Eq, PartialEq)]
|
|
|
|
|
enum CharKind {
|
2021-04-30 08:13:45 +00:00
|
|
|
|
Newline,
|
2021-04-29 16:52:11 +00:00
|
|
|
|
Whitespace,
|
|
|
|
|
Punctuation,
|
|
|
|
|
Word,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn char_kind(c: char) -> CharKind {
|
2021-04-30 08:13:45 +00:00
|
|
|
|
if c == '\n' {
|
|
|
|
|
CharKind::Newline
|
|
|
|
|
} else if c.is_whitespace() {
|
2021-04-29 16:52:11 +00:00
|
|
|
|
CharKind::Whitespace
|
|
|
|
|
} else if c.is_alphanumeric() || c == '_' {
|
|
|
|
|
CharKind::Word
|
|
|
|
|
} else {
|
|
|
|
|
CharKind::Punctuation
|
2021-04-29 12:54:50 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2021-08-02 12:11:31 +00:00
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use super::*;
|
2021-10-04 22:06:12 +00:00
|
|
|
|
use crate::{display_map::DisplayMap, Buffer};
|
2021-08-02 12:11:31 +00:00
|
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
|
fn test_prev_next_word_boundary_multibyte(cx: &mut gpui::MutableAppContext) {
|
2021-09-17 22:39:19 +00:00
|
|
|
|
let tab_size = 4;
|
|
|
|
|
let family_id = cx.font_cache().load_family(&["Helvetica"]).unwrap();
|
|
|
|
|
let font_id = cx
|
|
|
|
|
.font_cache()
|
|
|
|
|
.select_font(family_id, &Default::default())
|
|
|
|
|
.unwrap();
|
|
|
|
|
let font_size = 14.0;
|
|
|
|
|
|
2021-09-23 00:00:57 +00:00
|
|
|
|
let buffer = cx.add_model(|cx| Buffer::new(0, "a bcΔ defγ hi—jk", cx));
|
2021-09-17 22:39:19 +00:00
|
|
|
|
let display_map =
|
|
|
|
|
cx.add_model(|cx| DisplayMap::new(buffer, tab_size, font_id, font_size, None, cx));
|
2021-08-02 12:11:31 +00:00
|
|
|
|
let snapshot = display_map.update(cx, |map, cx| map.snapshot(cx));
|
|
|
|
|
assert_eq!(
|
|
|
|
|
prev_word_boundary(&snapshot, DisplayPoint::new(0, 12)).unwrap(),
|
|
|
|
|
DisplayPoint::new(0, 7)
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
prev_word_boundary(&snapshot, DisplayPoint::new(0, 7)).unwrap(),
|
2021-09-23 00:00:57 +00:00
|
|
|
|
DisplayPoint::new(0, 2)
|
2021-08-02 12:11:31 +00:00
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
prev_word_boundary(&snapshot, DisplayPoint::new(0, 6)).unwrap(),
|
|
|
|
|
DisplayPoint::new(0, 2)
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
prev_word_boundary(&snapshot, DisplayPoint::new(0, 2)).unwrap(),
|
2021-09-23 00:00:57 +00:00
|
|
|
|
DisplayPoint::new(0, 0)
|
2021-08-02 12:11:31 +00:00
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
prev_word_boundary(&snapshot, DisplayPoint::new(0, 1)).unwrap(),
|
|
|
|
|
DisplayPoint::new(0, 0)
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
|
next_word_boundary(&snapshot, DisplayPoint::new(0, 0)).unwrap(),
|
|
|
|
|
DisplayPoint::new(0, 1)
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
next_word_boundary(&snapshot, DisplayPoint::new(0, 1)).unwrap(),
|
2021-09-23 00:00:57 +00:00
|
|
|
|
DisplayPoint::new(0, 6)
|
2021-08-02 12:11:31 +00:00
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
next_word_boundary(&snapshot, DisplayPoint::new(0, 2)).unwrap(),
|
|
|
|
|
DisplayPoint::new(0, 6)
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
next_word_boundary(&snapshot, DisplayPoint::new(0, 6)).unwrap(),
|
2021-09-23 00:00:57 +00:00
|
|
|
|
DisplayPoint::new(0, 12)
|
2021-08-02 12:11:31 +00:00
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
next_word_boundary(&snapshot, DisplayPoint::new(0, 7)).unwrap(),
|
|
|
|
|
DisplayPoint::new(0, 12)
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|