From 682ad5455b0cb3301b1573d7211783334bd061aa Mon Sep 17 00:00:00 2001 From: Nimrod Date: Fri, 21 Oct 2022 06:08:37 +0000 Subject: [PATCH] Fix unexpected behavior in delete_word_backward and delete_word_forward (#4392) --- helix-term/src/commands.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index aa76ddb9d9582..31e22998c4a69 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -3245,8 +3245,8 @@ pub mod insert { let text = doc.text().slice(..); let selection = doc.selection(view.id).clone().transform(|range| { - let cursor = Range::point(range.cursor(text)); - let next = movement::move_prev_word_start(text, cursor, count); + let anchor = movement::move_prev_word_start(text, range, count).from(); + let next = Range::new(anchor, range.cursor(text)); exclude_cursor(text, next, range) }); delete_selection_insert_mode(doc, view, &selection); @@ -3259,10 +3259,11 @@ pub mod insert { let (view, doc) = current!(cx.editor); let text = doc.text().slice(..); - let selection = doc - .selection(view.id) - .clone() - .transform(|range| movement::move_next_word_start(text, range, count)); + let selection = doc.selection(view.id).clone().transform(|range| { + let head = movement::move_next_word_end(text, range, count).to(); + Range::new(range.cursor(text), head) + }); + delete_selection_insert_mode(doc, view, &selection); lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);