Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

helix: Change word motions (#33408)

Browse source 
When starting on the newline character at the end of a line the helix
word motions select that character, unlike in helix itself. This makes
it easy to accidentaly join two lines together.
Also, word motions that go backwards should stop at the start of a line.
I added that.

Release Notes:

- helix: Fix edge-cases with word motions and newlines
This commit is contained in:
fantacell 2025-06-26 20:25:47 +02:00 • committed by GitHub
parent 35863c4302
commit 4983b01c89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/vim/src/helix.rs
View file

@ -188,10 +188,10 @@ impl Vim {
self.helix_find_range_forward(times, window, cx, |left, right, classifier| {
let left_kind = classifier.kind_with(left, ignore_punctuation);
let right_kind = classifier.kind_with(right, ignore_punctuation);
let at_newline = right == '\n';
let at_newline = (left == '\n') ^ (right == '\n');
let found =
left_kind != right_kind && right_kind != CharKind::Whitespace || at_newline;
let found = (left_kind != right_kind && right_kind != CharKind::Whitespace)
|| at_newline;
found
})
@ -200,10 +200,10 @@ impl Vim {
self.helix_find_range_forward(times, window, cx, |left, right, classifier| {
let left_kind = classifier.kind_with(left, ignore_punctuation);
let right_kind = classifier.kind_with(right, ignore_punctuation);
let at_newline = right == '\n';
let at_newline = (left == '\n') ^ (right == '\n');
let found = left_kind != right_kind
&& (left_kind != CharKind::Whitespace || at_newline);
let found = (left_kind != right_kind && left_kind != CharKind::Whitespace)
|| at_newline;
found
})
@ -212,10 +212,10 @@ impl Vim {
self.helix_find_range_backward(times, window, cx, |left, right, classifier| {
let left_kind = classifier.kind_with(left, ignore_punctuation);
let right_kind = classifier.kind_with(right, ignore_punctuation);
let at_newline = right == '\n';
let at_newline = (left == '\n') ^ (right == '\n');
let found = left_kind != right_kind
&& (left_kind != CharKind::Whitespace || at_newline);
let found = (left_kind != right_kind && left_kind != CharKind::Whitespace)
|| at_newline;
found
})
@ -224,11 +224,10 @@ impl Vim {
self.helix_find_range_backward(times, window, cx, |left, right, classifier| {
let left_kind = classifier.kind_with(left, ignore_punctuation);
let right_kind = classifier.kind_with(right, ignore_punctuation);
let at_newline = right == '\n';
let at_newline = (left == '\n') ^ (right == '\n');
let found = left_kind != right_kind
&& right_kind != CharKind::Whitespace
&& !at_newline;
let found = (left_kind != right_kind && right_kind != CharKind::Whitespace)
|| at_newline;
found
})