Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Potential fix to unexpected behavior in delete_word_backward and delete_word_forward #4392

Merged
merged 3 commits into from
Oct 21, 2022
Merged

Potential fix to unexpected behavior in delete_word_backward and delete_word_forward #4392

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
488638f
Fix unexpected behavior in delete_word_backward and delete_word_forward
nimr0d Oct 20, 2022
d454821
Merge branch 'master' of https://github.com/helix-editor/helix into f…
nimr0d Oct 20, 2022
5287ee6
Merge branch 'master' of https://github.com/helix-editor/helix into f…
nimr0d Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3238,8 +3238,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);
Expand All @@ -3252,10 +3252,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);
Expand Down