TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update replace command to use document line ending setting.

Browse source
This commit is contained in:
Nathan Vegdahl 2021-06-21 11:08:05 -07:00
parent 07e28802f6
commit 23d6188535
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
helix-term/src/commands.rs
View file

@ -1,13 +1,15 @@
use helix_core::{ use helix_core::{
comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent, comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent,
line_ending::{get_line_ending, get_line_ending_of_str, line_end_char_index}, line_ending::{
get_line_ending, get_line_ending_of_str, line_end_char_index, str_is_line_ending,
},
match_brackets, match_brackets,
movement::{self, Direction}, movement::{self, Direction},
object, pos_at_coords, object, pos_at_coords,
regex::{self, Regex}, regex::{self, Regex},
register::{self, Register, Registers}, register::{self, Register, Registers},
search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice, Selection, search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeGraphemes,
SmallVec, Tendril, Transaction, DEFAULT_LINE_ENDING, RopeSlice, Selection, SmallVec, Tendril, Transaction, DEFAULT_LINE_ENDING,
}; };
use helix_view::{ use helix_view::{
@ -577,32 +579,37 @@ fn extend_first_nonwhitespace(cx: &mut Context) {
} }
fn replace(cx: &mut Context) { fn replace(cx: &mut Context) {
let mut buf = [0u8; 4]; // To hold utf8 encoded char.
// need to wait for next key // need to wait for next key
cx.on_next_key(move |cx, event| { cx.on_next_key(move |cx, event| {
let (view, doc) = current!(cx.editor);
let ch = match event { let ch = match event {
KeyEvent { KeyEvent {
code: KeyCode::Char(ch), code: KeyCode::Char(ch),
.. ..
} => Some(ch), } => Some(&ch.encode_utf8(&mut buf[..])[..]),
KeyEvent { KeyEvent {
code: KeyCode::Enter, code: KeyCode::Enter,
.. ..
} => Some('\n'), // TODO: use the document's default line ending. } => Some(doc.line_ending.as_str()),
_ => None, _ => None,
}; };
if let Some(ch) = ch { if let Some(ch) = ch {
let (view, doc) = current!(cx.editor);
let transaction = let transaction =
Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| { Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
let max_to = doc.text().len_chars().saturating_sub(1); let max_to = doc.text().len_chars().saturating_sub(1);
let to = std::cmp::min(max_to, range.to() + 1); let to = std::cmp::min(max_to, range.to() + 1);
let text: String = doc let text: String = RopeGraphemes::new(doc.text().slice(range.from()..to))
.text() .map(|g| {
.slice(range.from()..to) let cow: Cow<str> = g.into();
.chars() if str_is_line_ending(&cow) {
.map(|c| if c == '\n' { '\n' } else { ch }) cow
} else {
ch.into()
}
})
.collect(); .collect();
(range.from(), to, Some(text.into())) (range.from(), to, Some(text.into()))