aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorJan Hrastnik2021-06-19 12:03:14 +0000
committerJan Hrastnik2021-06-19 12:03:14 +0000
commitecb884db98fbe6ed70743d1080ce7f78e121ba50 (patch)
tree07e14be83b4eda50adb168196cc3aea840dec15d /helix-term/src
parent8bccd6df3054143baf128157d8dcecb10a911956 (diff)
added get_line_ending from pr comment
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/commands.rs12
1 files changed, 5 insertions, 7 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 62faadf9..d894a646 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5,7 +5,7 @@ use helix_core::{
object, pos_at_coords,
regex::{self, Regex},
register::{self, Register, Registers},
- search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice, Selection,
+ search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice, Selection, get_line_ending,
SmallVec, Tendril, Transaction,
};
@@ -183,11 +183,10 @@ pub fn move_line_end(cx: &mut Context) {
let text = doc.text();
let line = text.char_to_line(range.head);
- // Line end is pos at the start of next line - 1
- // subtract another 1 because the line ends with \n
let pos = text
.line_to_char(line + 1)
- .saturating_sub(doc.line_ending().len() + 1);
+ .saturating_sub(get_line_ending(&text.line(line)).map(|le| le.len_chars()).unwrap_or(0));
+
Range::new(pos, pos)
});
@@ -607,11 +606,10 @@ pub fn extend_line_end(cx: &mut Context) {
let text = doc.text();
let line = text.char_to_line(range.head);
- // Line end is pos at the start of next line - 1
- // subtract another 1 because the line ends with \n
let pos = text
.line_to_char(line + 1)
- .saturating_sub(doc.line_ending().len() + 1);
+ .saturating_sub(get_line_ending(&text.line(line)).map(|le| le.len_chars()).unwrap_or(0));
+
Range::new(range.anchor, pos)
});