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

better path completion

Browse source
This commit is contained in:
Nguyen Duc Toan 2024-04-14 12:20:52 +07:00
parent a70374fced
commit debae675dc
No known key found for this signature in database
GPG key ID: B96F4A160C6B3251
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-core/src/completion/commands/trigger.rs
View file

@ -67,7 +67,7 @@ impl Completion {
#[inline] #[inline]
fn split_path(s: &str) -> (String, String) { fn split_path(s: &str) -> (String, String) {
match s.rsplit_once(MAIN_SEPARATOR) { match s.rsplit_once(['/', '\\']) {
Some((p, c)) => (format!("{p}{}", MAIN_SEPARATOR), c.to_owned()), Some((p, c)) => (format!("{p}{}", MAIN_SEPARATOR), c.to_owned()),
None => (".".to_owned(), s.to_owned()), None => (".".to_owned(), s.to_owned()),
} }

12
yazi-core/src/input/commands/complete.rs
View file

@ -1,4 +1,4 @@
use std::path::MAIN_SEPARATOR; use std::path::MAIN_SEPARATOR_STR;
use yazi_shared::{event::Cmd, render}; use yazi_shared::{event::Cmd, render};
@ -26,19 +26,21 @@ impl Input {
} }
let [before, after] = self.partition(); let [before, after] = self.partition();
let new = if let Some((prefix, _)) = before.rsplit_once(MAIN_SEPARATOR) { let new = if let Some((prefix, _)) = before.rsplit_once(['/', '\\']) {
format!("{prefix}/{}{after}", opt.word) format!("{prefix}/{}{after}", opt.word)
} else { } else {
format!("{}{after}", opt.word) format!("{}{after}", opt.word)
}; };
let normalized_new = new.replace(['/', '\\'], MAIN_SEPARATOR_STR);
let snap = self.snaps.current_mut(); let snap = self.snaps.current_mut();
if new == snap.value { if normalized_new == snap.value {
return; return;
} }
let delta = new.chars().count() as isize - snap.value.chars().count() as isize; let delta = normalized_new.chars().count() as isize - snap.value.chars().count() as isize;
snap.value = new; snap.value = normalized_new;
self.move_(delta); self.move_(delta);
self.flush_value(); self.flush_value();