helix-editor/helix
1
1
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-09-20 08:05:10 +03:00
Code Issues Projects Releases Wiki Activity

Calculate the line that the range head is on correctly.

Browse Source
This commit is contained in:
Nathan Vegdahl 2021-07-22 11:17:03 -07:00
parent 673338bdb6
commit 5841954f58
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-core/src/selection.rs
View File

@ -73,6 +73,18 @@ pub fn to(&self) -> usize {
std::cmp::max(self.anchor, self.head) std::cmp::max(self.anchor, self.head)
} }
/// The line number that the head is on (using 1-width semantics).
#[inline]
#[must_use]
pub fn head_line(&self, text: RopeSlice) -> usize {
let head = if self.anchor < self.head {
prev_grapheme_boundary(text, self.head)
} else {
self.head
};
text.char_to_line(head)
}
/// The (inclusive) range of lines that the range overlaps. /// The (inclusive) range of lines that the range overlaps.
#[inline] #[inline]
#[must_use] #[must_use]

35
helix-term/src/commands.rs
View File

@ -396,19 +396,14 @@ fn goto_line_end(cx: &mut Context) {
view.id, view.id,
doc.selection(view.id).clone().transform(|range| { doc.selection(view.id).clone().transform(|range| {
let text = doc.text().slice(..); let text = doc.text().slice(..);
let line = range.head_line(text);
let head = if range.anchor < range.head {
graphemes::prev_grapheme_boundary(text, range.head)
} else {
range.head
};
let line = text.char_to_line(head);
let mut pos = line_end_char_index(&text, line); let mut pos = line_end_char_index(&text, line);
if doc.mode != Mode::Select { if doc.mode != Mode::Select {
pos = graphemes::prev_grapheme_boundary(text, pos); pos = graphemes::prev_grapheme_boundary(text, pos);
} }
pos = head.max(pos).max(text.line_to_char(line));
pos = range.head.max(pos).max(text.line_to_char(line));
range.put(text, pos, doc.mode == Mode::Select) range.put(text, pos, doc.mode == Mode::Select)
}), }),
@ -422,13 +417,7 @@ fn goto_line_end_newline(cx: &mut Context) {
view.id, view.id,
doc.selection(view.id).clone().transform(|range| { doc.selection(view.id).clone().transform(|range| {
let text = doc.text().slice(..); let text = doc.text().slice(..);
let line = range.head_line(text);
let head = if range.anchor < range.head {
graphemes::prev_grapheme_boundary(text, range.head)
} else {
range.head
};
let line = text.char_to_line(head);
let mut pos = text.line_to_char((line + 1).min(text.len_lines())); let mut pos = text.line_to_char((line + 1).min(text.len_lines()));
if doc.mode != Mode::Select { if doc.mode != Mode::Select {
@ -445,7 +434,7 @@ fn goto_line_start(cx: &mut Context) {
view.id, view.id,
doc.selection(view.id).clone().transform(|range| { doc.selection(view.id).clone().transform(|range| {
let text = doc.text().slice(..); let text = doc.text().slice(..);
let line = text.char_to_line(range.head); let line = range.head_line(text);
// adjust to start of the line // adjust to start of the line
let pos = text.line_to_char(line); let pos = text.line_to_char(line);
@ -460,10 +449,10 @@ fn goto_first_nonwhitespace(cx: &mut Context) {
view.id, view.id,
doc.selection(view.id).clone().transform(|range| { doc.selection(view.id).clone().transform(|range| {
let text = doc.text().slice(..); let text = doc.text().slice(..);
let line_idx = text.char_to_line(range.head); let line = range.head_line(text);
if let Some(pos) = find_first_non_whitespace_char(text.line(line_idx)) { if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
let pos = pos + text.line_to_char(line_idx); let pos = pos + text.line_to_char(line);
range.put(text, pos, doc.mode == Mode::Select) range.put(text, pos, doc.mode == Mode::Select)
} else { } else {
range range
@ -2212,9 +2201,9 @@ fn append_to_line(cx: &mut Context) {
doc.set_selection( doc.set_selection(
view.id, view.id,
doc.selection(view.id).clone().transform(|range| { doc.selection(view.id).clone().transform(|range| {
let text = &doc.text().slice(..); let text = doc.text().slice(..);
let line = text.char_to_line(range.head); let line = range.head_line(text);
let pos = line_end_char_index(text, line); let pos = line_end_char_index(&text, line);
Range::new(pos, pos) Range::new(pos, pos)
}), }),
); );
@ -2274,7 +2263,7 @@ fn open(cx: &mut Context, open: Open) {
let mut offs = 0; let mut offs = 0;
let mut transaction = Transaction::change_by_selection(contents, selection, |range| { let mut transaction = Transaction::change_by_selection(contents, selection, |range| {
let line = text.char_to_line(range.head); let line = range.head_line(text);
let line = match open { let line = match open {
// adjust position to the end of the line (next line - 1) // adjust position to the end of the line (next line - 1)