aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorNathan Vegdahl2021-07-24 14:44:11 +0000
committerNathan Vegdahl2021-07-24 14:44:11 +0000
commitf96b8b769b3c7457935b5c02db870af97036f7b6 (patch)
treea730fd2e970d6349e0f11b450f1e58b2c79d010b /helix-term/src
parent20723495d3ee82047bc7584e9eca1424d1256f4c (diff)
Switch to a cleaner range-head moving abstraction.
Also fix a bunch of bugs related to it.
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/commands.rs101
1 files changed, 73 insertions, 28 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 93867ee1..173d0b7b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -373,15 +373,16 @@ fn goto_line_end(cx: &mut Context) {
let selection = doc.selection(view.id).clone().transform(|range| {
let line = range.head_line(text);
+ let line_start = text.line_to_char(line);
- let mut pos = line_end_char_index(&text, line);
- if doc.mode != Mode::Select {
- pos = graphemes::prev_grapheme_boundary(text, pos);
- }
-
- pos = range.head.max(pos).max(text.line_to_char(line));
+ let pos = graphemes::prev_grapheme_boundary(text, line_end_char_index(&text, line))
+ .max(line_start);
- range.put(text, pos, doc.mode == Mode::Select)
+ if doc.mode == Mode::Select {
+ range.move_head(text, pos, true)
+ } else {
+ Range::point(pos)
+ }
});
doc.set_selection(view.id, selection);
}
@@ -392,12 +393,13 @@ fn goto_line_end_newline(cx: &mut Context) {
let selection = doc.selection(view.id).clone().transform(|range| {
let line = range.head_line(text);
+ let pos = line_end_char_index(&text, line);
- let mut pos = text.line_to_char((line + 1).min(text.len_lines()));
- if doc.mode != Mode::Select {
- pos = graphemes::prev_grapheme_boundary(text, pos);
+ if doc.mode == Mode::Select {
+ range.move_head(text, pos, true)
+ } else {
+ Range::point(pos)
}
- range.put(text, pos, doc.mode == Mode::Select)
});
doc.set_selection(view.id, selection);
}
@@ -411,7 +413,11 @@ fn goto_line_start(cx: &mut Context) {
// adjust to start of the line
let pos = text.line_to_char(line);
- range.put(text, pos, doc.mode == Mode::Select)
+ if doc.mode == Mode::Select {
+ range.move_head(text, pos, true)
+ } else {
+ Range::point(pos)
+ }
});
doc.set_selection(view.id, selection);
}
@@ -425,7 +431,11 @@ fn goto_first_nonwhitespace(cx: &mut Context) {
if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
let pos = pos + text.line_to_char(line);
- range.put(text, pos, doc.mode == Mode::Select)
+ if doc.mode == Mode::Select {
+ range.move_head(text, pos, true)
+ } else {
+ Range::point(pos)
+ }
} else {
range
}
@@ -569,8 +579,8 @@ fn extend_next_word_start(cx: &mut Context) {
.min_width_1(text)
.transform(|range| {
let word = movement::move_next_word_start(text, range, count);
- let pos = word.head;
- range.put(text, pos, true)
+ let pos = graphemes::prev_grapheme_boundary(text, word.head);
+ range.move_head(text, pos, true)
});
doc.set_selection(view.id, selection);
}
@@ -587,7 +597,7 @@ fn extend_prev_word_start(cx: &mut Context) {
.transform(|range| {
let word = movement::move_prev_word_start(text, range, count);
let pos = word.head;
- range.put(text, pos, true)
+ range.move_head(text, pos, true)
});
doc.set_selection(view.id, selection);
}
@@ -603,8 +613,8 @@ fn extend_next_word_end(cx: &mut Context) {
.min_width_1(text)
.transform(|range| {
let word = movement::move_next_word_end(text, range, count);
- let pos = word.head;
- range.put(text, pos, true)
+ let pos = graphemes::prev_grapheme_boundary(text, word.head);
+ range.move_head(text, pos, true)
});
doc.set_selection(view.id, selection);
}
@@ -652,11 +662,17 @@ where
let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| {
+ let range = if range.anchor < range.head {
+ // For 1-width cursor semantics.
+ Range::new(range.anchor, range.head - 1)
+ } else {
+ range
+ };
search_fn(text, ch, range.head, count, inclusive).map_or(range, |pos| {
if extend {
- range.put(text, pos, true)
+ range.move_head(text, pos, true)
} else {
- range.put(text, pos.saturating_sub(1), false)
+ Range::point(pos)
}
})
});
@@ -664,10 +680,39 @@ where
})
}
+fn find_next_char_impl(
+ text: RopeSlice,
+ ch: char,
+ pos: usize,
+ n: usize,
+ inclusive: bool,
+) -> Option<usize> {
+ let pos = (pos + 1).min(text.len_chars());
+ if inclusive {
+ search::find_nth_next(text, ch, pos, n)
+ } else {
+ search::find_nth_next(text, ch, pos, n).map(|n| n.saturating_sub(1))
+ }
+}
+
+fn find_prev_char_impl(
+ text: RopeSlice,
+ ch: char,
+ pos: usize,
+ n: usize,
+ inclusive: bool,
+) -> Option<usize> {
+ if inclusive {
+ search::find_nth_prev(text, ch, pos, n)
+ } else {
+ search::find_nth_prev(text, ch, pos, n).map(|n| (n + 1).min(text.len_chars()))
+ }
+}
+
fn find_till_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_next,
+ find_next_char_impl,
false, /* inclusive */
false, /* extend */
)
@@ -676,7 +721,7 @@ fn find_till_char(cx: &mut Context) {
fn find_next_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_next,
+ find_next_char_impl,
true, /* inclusive */
false, /* extend */
)
@@ -685,7 +730,7 @@ fn find_next_char(cx: &mut Context) {
fn extend_till_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_next,
+ find_next_char_impl,
false, /* inclusive */
true, /* extend */
)
@@ -694,7 +739,7 @@ fn extend_till_char(cx: &mut Context) {
fn extend_next_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_next,
+ find_next_char_impl,
true, /* inclusive */
true, /* extend */
)
@@ -703,7 +748,7 @@ fn extend_next_char(cx: &mut Context) {
fn till_prev_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_prev,
+ find_prev_char_impl,
false, /* inclusive */
false, /* extend */
)
@@ -712,7 +757,7 @@ fn till_prev_char(cx: &mut Context) {
fn find_prev_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_prev,
+ find_prev_char_impl,
true, /* inclusive */
false, /* extend */
)
@@ -721,7 +766,7 @@ fn find_prev_char(cx: &mut Context) {
fn extend_till_prev_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_prev,
+ find_prev_char_impl,
false, /* inclusive */
true, /* extend */
)
@@ -730,7 +775,7 @@ fn extend_till_prev_char(cx: &mut Context) {
fn extend_prev_char(cx: &mut Context) {
find_char_impl(
cx,
- search::find_nth_prev,
+ find_prev_char_impl,
true, /* inclusive */
true, /* extend */
)