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

core: add kill --big-word option

Browse source
This commit is contained in:
XOR-op 2023-12-23 17:47:04 -05:00
parent 74ba02a61b
commit 117c14ec2b
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
yazi-core/src/input/commands/kill.rs
View file

@ -4,13 +4,23 @@ use yazi_shared::{event::Exec, CharKind};
use crate::input::Input; use crate::input::Input;
#[derive(Debug, Copy, Clone)]
enum KillMode {
Default,
BigWord,
}
pub struct Opt<'a> { pub struct Opt<'a> {
kind: &'a str, kind: &'a str,
mode: KillMode,
} }
impl<'a> From<&'a Exec> for Opt<'a> { impl<'a> From<&'a Exec> for Opt<'a> {
fn from(e: &'a Exec) -> Self { fn from(e: &'a Exec) -> Self {
Self { kind: e.args.first().map(|s| s.as_str()).unwrap_or_default() } Self {
kind: e.args.first().map(|s| s.as_str()).unwrap_or_default(),
mode: e.named.get("big-word").map_or(KillMode::Default, |_| KillMode::BigWord),
}
} }
} }
@ -45,7 +55,7 @@ impl Input {
/// ///
/// Otherwise, returns how many characters to move to reach right *AFTER* the /// Otherwise, returns how many characters to move to reach right *AFTER* the
/// word boundary, or the end of the iterator. /// word boundary, or the end of the iterator.
fn find_word_boundary(input: impl Iterator<Item = char> + Clone) -> usize { fn find_word_boundary(input: impl Iterator<Item = char> + Clone, mode: KillMode) -> usize {
fn count_spaces(input: impl Iterator<Item = char>) -> usize { fn count_spaces(input: impl Iterator<Item = char>) -> usize {
// Move until we don't see any more whitespace. // Move until we don't see any more whitespace.
input.take_while(|&c| CharKind::new(c) == CharKind::Space).count() input.take_while(|&c| CharKind::new(c) == CharKind::Space).count()
@ -63,7 +73,7 @@ impl Input {
} }
let space_or_trailing_slash = match input.clone().next() { let space_or_trailing_slash = match input.clone().next() {
Some(std::path::MAIN_SEPARATOR) => 1, Some(std::path::MAIN_SEPARATOR) if matches!(mode, KillMode::BigWord) => 1,
Some(c) if CharKind::new(c) == CharKind::Space => count_spaces(input.clone()), Some(c) if CharKind::new(c) == CharKind::Space => count_spaces(input.clone()),
_ => 0, _ => 0,
}; };
@ -85,12 +95,12 @@ impl Input {
} }
b"backward" => { b"backward" => {
let end = snap.idx(snap.cursor).unwrap_or(snap.len()); let end = snap.idx(snap.cursor).unwrap_or(snap.len());
let start = end - Self::find_word_boundary(snap.value[..end].chars().rev()); let start = end - Self::find_word_boundary(snap.value[..end].chars().rev(), opt.mode);
self.kill_range(start..end) self.kill_range(start..end)
} }
b"forward" => { b"forward" => {
let start = snap.idx(snap.cursor).unwrap_or(snap.len()); let start = snap.idx(snap.cursor).unwrap_or(snap.len());
let end = start + Self::find_word_boundary(snap.value[start..].chars()); let end = start + Self::find_word_boundary(snap.value[start..].chars(), opt.mode);
self.kill_range(start..end) self.kill_range(start..end)
} }
_ => false, _ => false,