andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Remove special handling of line ending characters in selection replacement (#10786)

Browse Source 
* Remove special-casing of line ending characters in selection replacement

* Refactor line ending handling and integration test to address code review comments
This commit is contained in:
Chris Pyles 2024-06-10 08:07:43 -07:00 committed by GitHub
parent aa1630a41a
commit 03813bbc2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
history::UndoKind,
increment, indent,
indent::IndentStyle,
line_ending::{get_line_ending_of_str, line_end_char_index, str_is_line_ending},
line_ending::{get_line_ending_of_str, line_end_char_index},
match_brackets,
movement::{self, move_vertically_visual, Direction},
object, pos_at_coords,
@ -1605,19 +1605,11 @@ fn replace(cx: &mut Context) {
if let Some(ch) = ch {
let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
if !range.is_empty() {
let text: String =
let text: Tendril =
RopeGraphemes::new(doc.text().slice(range.from()..range.to()))
.map(|g| {
let cow: Cow<str> = g.into();
if str_is_line_ending(&cow) {
cow
} else {
ch.into()
}
})
.map(|_g| ch)
.collect();
(range.from(), range.to(), Some(text.into()))
(range.from(), range.to(), Some(text))
} else {
// No change.
(range.from(), range.to(), None)

14
helix-term/tests/test/commands.rs
View File

@ -722,5 +722,19 @@ fn foo() {
))
.await?;
test((
indoc! {"\
#[a
b
c
d
e|]#
f
"},
"s\\n<ret>r,",
"a#[,|]#b#(,|)#c#(,|)#d#(,|)#e\nf\n",
))
.await?;
Ok(())
}