Remove special-casing of line ending characters in selection replacement

helix-editor · May 18, 2024 · 82cbd7f · 82cbd7f
1 parent 889bbef
commit 82cbd7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
@@ -26,7 +26,7 @@ use helix_core::{
     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,
@@ -1596,14 +1596,7 @@ fn replace(cx: &mut Context) {
                 if !range.is_empty() {
                     let text: String =
                         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(|_| -> Cow<str> { ch.into() })
                             .collect();
 
                     (range.from(), range.to(), Some(text.into()))

diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
@@ -722,5 +722,19 @@ fn foo() {
     ))
     .await?;
 
+    test((
+        indoc! {"\
+            #[a|]#
+            b
+            c
+            d
+            e
+            f
+            "},
+        "4xs\\n<ret>r,",
+        "a#[,|]#b#(,|)#c#(,|)#d#(,|)#e\nf\n",
+    ))
+    .await?;
+
     Ok(())
 }