sxyazi/yazi
1
1
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2024-12-18 22:31:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: prefix matching should have higher priority in completion (#352)

Browse Source
This commit is contained in:
XOR-op 2023-11-10 12:48:34 -05:00 committed by GitHub
parent 34d4be4071
commit 521c8b6bfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
yazi-core/src/completion/commands/show.rs
View File

@ -4,6 +4,8 @@ use yazi_config::keymap::Exec;
use crate::completion::Completion;
const LIMIT: usize = 30;
pub struct Opt<'a> {
cache: &'a Vec<String>,
cache_name: &'a str,
@ -23,6 +25,35 @@ impl<'a> From<&'a Exec> for Opt<'a> {
}
impl Completion {
fn match_candidates(word: &str, cache: &Vec<String>) -> Vec<String> {
let flow = cache.iter().try_fold(
(Vec::with_capacity(LIMIT), Vec::with_capacity(LIMIT)),
|(mut prefixed, mut fuzzy), s| {
if s.starts_with(word) {
if s != word {
prefixed.push(s);
if prefixed.len() >= LIMIT {
return ControlFlow::Break((prefixed, fuzzy));
}
}
} else if fuzzy.len() < LIMIT - prefixed.len() && s.contains(word) {
// here we don't break the control flow, since we want more exact matching.
fuzzy.push(s)
}
ControlFlow::Continue((prefixed, fuzzy))
},
);
let (mut prefixed, fuzzy) = match flow {
ControlFlow::Continue(v) => v,
ControlFlow::Break(v) => v,
};
if prefixed.len() < LIMIT {
prefixed.extend(fuzzy.into_iter().take(LIMIT - prefixed.len()))
}
prefixed.into_iter().map(ToOwned::to_owned).collect()
}
pub fn show<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
let opt = opt.into() as Opt;
if self.ticket != opt.ticket {
@ -36,21 +67,8 @@ impl Completion {
return false;
};
let flow = cache.iter().try_fold(Vec::with_capacity(30), |mut v, s| {
if s.contains(opt.word) && s != opt.word {
v.push(s.to_owned());
if v.len() >= 30 {
return ControlFlow::Break(v);
}
}
ControlFlow::Continue(v)
});
self.ticket = opt.ticket;
self.cands = match flow {
ControlFlow::Continue(v) => v,
ControlFlow::Break(v) => v,
};
self.cands = Self::match_candidates(opt.word, cache);
if self.cands.is_empty() {
return mem::replace(&mut self.visible, false);
}