andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

adjusting the best_match function and satisfying the linter

Browse Source
This commit is contained in:
Alice C. Munduruca 2024-09-02 04:11:38 -04:00
parent c9bca100bd
commit e914584478
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
helix-term/src/ui/mod.rs
View File

@ -425,42 +425,32 @@ enum FileMatch {
fn best_match(opt1: &str, opt2: &str, input: &str) -> std::cmp::Ordering {
let min_len = std::cmp::min(std::cmp::min(opt1.len(), opt2.len()), input.len());
let mut opt1vals = (0, false);
let mut opt2vals = (0, false);
for i in 0..min_len {
if opt1vals.1 && opt2vals.1 {
break;
}
if !opt1vals.1 {
if opt1[i..=i] == input[i..=i] {
opt1vals.0 += 1;
let (opt1match, opt2match) = (0..min_len)
.fold(((false, false), (0, 0)), |acc, i| match acc {
((false, b), (n, m)) => {
if opt1[..=i] == input[..=i] {
((false, b), (n + 1, m))
} else {
opt1vals.1 = true;
((true, b), (n, m))
}
}
if !opt2vals.1 {
if opt2[i..=i] == input[i..=i] {
opt2vals.0 += 1;
((b, false), (n, m)) => {
if opt2[..=i] == input[..=i] {
((b, false), (n, m + 1))
} else {
opt2vals.1 = true;
}
}
}
let ord = opt2vals.0.cmp(&opt1vals.0);
if ord == std::cmp::Ordering::Equal {
if opt1.len() < opt2.len() {
return std::cmp::Ordering::Less;
} else if opt1.len() > opt2.len() {
return std::cmp::Ordering::Greater;
((b, true), (n, m))
}
}
ord
v => v,
})
.1;
match opt2match.cmp(&opt1match) {
std::cmp::Ordering::Equal => opt1.len().cmp(&opt2.len()),
ord => ord,
}
}
// TODO: we could return an iter/lazy thing so it can fetch as many as it needs.