From 65c4e7a419122a526b66adb9695d9d924bf921f6 Mon Sep 17 00:00:00 2001 From: WindSoilder Date: Wed, 3 May 2023 03:54:09 +0800 Subject: [PATCH] fix bracketed paste (#577) --- src/edit_mode/emacs.rs | 4 +++- src/edit_mode/vi/mod.rs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/edit_mode/emacs.rs b/src/edit_mode/emacs.rs index ec35384..7609280 100644 --- a/src/edit_mode/emacs.rs +++ b/src/edit_mode/emacs.rs @@ -156,7 +156,9 @@ impl EditMode for Emacs { Event::Resize(width, height) => ReedlineEvent::Resize(width, height), Event::FocusGained => ReedlineEvent::None, Event::FocusLost => ReedlineEvent::None, - Event::Paste(body) => ReedlineEvent::Edit(vec![EditCommand::InsertString(body)]), + Event::Paste(body) => ReedlineEvent::Edit(vec![EditCommand::InsertString( + body.replace("\r\n", "\n").replace('\r', "\n"), + )]), } } diff --git a/src/edit_mode/vi/mod.rs b/src/edit_mode/vi/mod.rs index 2a20155..12d95e6 100644 --- a/src/edit_mode/vi/mod.rs +++ b/src/edit_mode/vi/mod.rs @@ -153,7 +153,9 @@ impl EditMode for Vi { Event::Resize(width, height) => ReedlineEvent::Resize(width, height), Event::FocusGained => ReedlineEvent::None, Event::FocusLost => ReedlineEvent::None, - Event::Paste(body) => ReedlineEvent::Edit(vec![EditCommand::InsertString(body)]), + Event::Paste(body) => ReedlineEvent::Edit(vec![EditCommand::InsertString( + body.replace("\r\n", "\n").replace('\r', "\n"), + )]), } }