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

fix: displaying duplicate command suggestions

Browse source 
Fixes https://github.com/sxyazi/yazi/issues/955
This commit is contained in:
Mika Vilpas 2024-04-29 16:42:46 +03:00
parent 3a09155328
commit 0f02b9e348
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
yazi-core/src/which/commands/show.rs
View file

@ -1,6 +1,6 @@
use std::str::FromStr; use std::{collections::HashSet, str::FromStr};
use yazi_config::{keymap::{Control, Key}, KEYMAP}; use yazi_config::{keymap::{Control, ControlCow, Key}, KEYMAP};
use yazi_shared::{event::Cmd, render, Layer}; use yazi_shared::{event::Cmd, render, Layer};
use crate::which::{Which, WhichSorter}; use crate::which::{Which, WhichSorter};
@ -45,12 +45,7 @@ impl Which {
pub fn show_with(&mut self, key: &Key, layer: Layer) { pub fn show_with(&mut self, key: &Key, layer: Layer) {
self.layer = layer; self.layer = layer;
self.times = 1; self.times = 1;
self.cands = KEYMAP self.cands = keymap_candidates(layer, key);
.get(layer)
.iter()
.filter(|c| c.on.len() > 1 && &c.on[0] == key)
.map(|c| c.into())
.collect();
WhichSorter::default().sort(&mut self.cands); WhichSorter::default().sort(&mut self.cands);
self.visible = true; self.visible = true;
@ -58,3 +53,13 @@ impl Which {
render!(); render!();
} }
} }
fn keymap_candidates(layer: Layer, key: &Key) -> Vec<ControlCow> {
let mut seen = HashSet::new();
let mut matches =
KEYMAP.get(layer).iter().filter(|c| c.on.len() > 1 && &c.on[0] == key).collect::<Vec<_>>();
matches.retain(|c| seen.insert(c.on.clone()));
matches.into_iter().map(|c| c.into()).collect()
}