suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle line endings correctly in surround

pull/368/head
Gokul Soumya 2021-06-22 09:06:42 +05:30 committed by Blaž Hrastnik
parent b79b5e66f2
commit b00e9fc227
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3352,7 +3352,15 @@ fn surround_add(cx: &mut Context) {
let mut changes = Vec::new(); let mut changes = Vec::new();
for (i, range) in selection.iter().enumerate() { for (i, range) in selection.iter().enumerate() {
let (from, to) = (range.from(), range.to() + 1); let from = range.from();
let line = text.char_to_line(range.to());
let max_to = doc.text().len_chars().saturating_sub(
get_line_ending(&text.line(line))
.map(|le| le.len_chars())
.unwrap_or(0),
);
let to = std::cmp::min(range.to() + 1, max_to);
changes.push((from, from, Some(Tendril::from_char(open)))); changes.push((from, from, Some(Tendril::from_char(open))));
changes.push((to, to, Some(Tendril::from_char(close)))); changes.push((to, to, Some(Tendril::from_char(close))));
} }

10
helix-term/src/keymap.rs
View File

@ -201,16 +201,6 @@ impl Default for Keymaps {
key!('m') => Command::surround, key!('m') => Command::surround,
// TODO: refactor into
// key!('m') => commands::select_to_matching,
// key!('M') => commands::back_select_to_matching,
// select mode extend equivalents
// key!('.') => commands::repeat_insert,
// repeat_select
// TODO: figure out what key to use
// key!('[') => Command::expand_selection, ??
key!('[') => Command::left_bracket_mode, key!('[') => Command::left_bracket_mode,
key!(']') => Command::right_bracket_mode, key!(']') => Command::right_bracket_mode,