fix selected text is not deleted on paste

rhysd · Nov 14, 2023 · 13ce6aa · 13ce6aa
1 parent 8e3a432
commit 13ce6aa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/textarea.rs b/src/textarea.rs
@@ -1276,6 +1276,7 @@ impl<'a> TextArea<'a> {
     /// assert_eq!(textarea.lines(), [" bbb cccaaa"]);
     /// ```
     pub fn paste(&mut self) -> bool {
+        self.delete_selection(false);
         match self.yank.clone() {
             YankText::Piece(s) => self.insert_piece(s),
             YankText::Chunk(c) => self.insert_chunk(c),

diff --git a/tests/textarea.rs b/tests/textarea.rs
@@ -1432,6 +1432,27 @@ fn test_select_all() {
     assert_undo_redo((2, 3), &["aaa", "bbb", "ccc"], &[""], &mut t, "");
 }
 
+#[test]
+fn test_paste_while_selection() {
+    let mut t = TextArea::from(["ab", "cd"]);
+    t.move_cursor(CursorMove::Jump(0, 1));
+    t.start_selection();
+    t.move_cursor(CursorMove::Jump(1, 1));
+    t.set_yank_text("x\ny");
+    assert!(t.paste());
+    assert_eq!(t.lines(), ["ax", "yd"]);
+    assert_eq!(t.cursor(), (1, 1));
+    assert!(!t.is_selecting());
+
+    let mut t = TextArea::from(["ab", "cd"]);
+    t.select_all();
+    t.set_yank_text("xy\nzw");
+    assert!(t.paste());
+    assert_eq!(t.lines(), ["xy", "zw"]);
+    assert_eq!(t.cursor(), (1, 2));
+    assert!(!t.is_selecting());
+}
+
 struct DeleteTester(&'static [&'static str], fn(&mut TextArea) -> bool);
 impl DeleteTester {
     fn test(&self, before: (usize, usize), after: (usize, usize, &[&str], &str)) {