mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Extract the logic of comparing two CharKind instances into a method of CharKind

Browse source
This commit is contained in:
sxyazi 2025-01-08 18:24:12 +08:00
parent bcf528d99e
commit a058226576
No known key found for this signature in database
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
yazi-core/src/input/commands/backward.rs
View file

@ -22,13 +22,11 @@ impl Input {
let mut it = snap.value[..idx].chars().rev().enumerate(); let mut it = snap.value[..idx].chars().rev().enumerate();
let mut prev = CharKind::new(it.next().unwrap().1); let mut prev = CharKind::new(it.next().unwrap().1);
for (i, c) in it { for (i, c) in it {
let c = CharKind::new(c); let k = CharKind::new(c);
let new_char_kind = if prev != CharKind::Space && prev.vary(k, opt.far) {
if opt.far { (c == CharKind::Space) != (prev == CharKind::Space) } else { c != prev };
if prev != CharKind::Space && new_char_kind {
return self.move_(-(i as isize)); return self.move_(-(i as isize));
} }
prev = c; prev = k;
} }
if prev != CharKind::Space { if prev != CharKind::Space {

10
yazi-core/src/input/commands/forward.rs
View file

@ -22,20 +22,18 @@ impl Input {
}; };
for (i, c) in it { for (i, c) in it {
let c = CharKind::new(c); let k = CharKind::new(c);
let new_char_kind =
if opt.far { (c == CharKind::Space) != (prev == CharKind::Space) } else { c != prev };
let b = if opt.end_of_word { let b = if opt.end_of_word {
prev != CharKind::Space && new_char_kind && i != 1 prev != CharKind::Space && prev.vary(k, opt.far) && i != 1
} else { } else {
c != CharKind::Space && new_char_kind k != CharKind::Space && k.vary(prev, opt.far)
}; };
if b && !matches!(snap.op, InputOp::None | InputOp::Select(_)) { if b && !matches!(snap.op, InputOp::None | InputOp::Select(_)) {
return self.move_(i as isize); return self.move_(i as isize);
} else if b { } else if b {
return self.move_(if opt.end_of_word { i - 1 } else { i } as isize); return self.move_(if opt.end_of_word { i - 1 } else { i } as isize);
} }
prev = c; prev = k;
} }
self.move_(snap.len() as isize) self.move_(snap.len() as isize)

4
yazi-shared/src/chars.rs
View file

@ -20,6 +20,10 @@ impl CharKind {
Self::Other Self::Other
} }
} }
pub fn vary(self, other: Self, far: bool) -> bool {
if far { (self == Self::Space) != (other == Self::Space) } else { self != other }
}
} }
pub fn strip_trailing_newline(mut s: String) -> String { pub fn strip_trailing_newline(mut s: String) -> String {