From 9bddebda161d65c27c74a892bae40afe82972c9f Mon Sep 17 00:00:00 2001
From: Benno Straub <benno.straub@outlook.de>
Date: Sat, 13 Jan 2024 16:41:07 +0100
Subject: [PATCH] Improve search in keyboard shortcuts overview (#2918)

* improve search in keyboard shortcuts overview

* Update CHANGELOG.md
---
 CHANGELOG.md            |  1 +
 lapce-app/src/keymap.rs | 36 ++++++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b35fc6bc..7d236fcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - [#2723](https://github.com/lapce/lapce/pull/2723): Line wrapping based on width (no column-based yet)
 - [#1277](https://github.com/lapce/lapce/pull/1277): Error message prompted on missing git user.email and/or user.name
 - [#2910](https://github.com/lapce/lapce/pull/2910): Files can be compared in the diff editor
+- [#2918](https://github.com/lapce/lapce/pull/2918): Allow searching the shortcuts overview by shortcut (e.g. "Ctrl+P") or when condition (e.g. "list_focus")
 
 ### Bug Fixes
 - [#2779](https://github.com/lapce/lapce/pull/2779): Fix files detection on fresh git/VCS repository
diff --git a/lapce-app/src/keymap.rs b/lapce-app/src/keymap.rs
index c1decdda..90d00037 100644
--- a/lapce-app/src/keymap.rs
+++ b/lapce-app/src/keymap.rs
@@ -57,17 +57,33 @@ pub fn keymap_view(common: Rc<CommonData>) -> impl View {
             .iter()
             .filter_map(|keymap| {
                 let cmd = keypress.commands.get(&keymap.command).cloned()?;
-                let match_pattern =
-                    cmd.kind.str().replace('_', " ").contains(&pattern)
-                        || cmd
-                            .kind
-                            .desc()
-                            .map(|desc| desc.to_lowercase().contains(&pattern))
-                            .unwrap_or(false);
-                if !match_pattern {
-                    return None;
+
+                let cmd_name_contains_pattern =
+                    cmd.kind.str().replace('_', " ").contains(&pattern);
+                let cmd_desc_contains_pattern = cmd
+                    .kind
+                    .desc()
+                    .map(|desc| desc.to_lowercase().contains(&pattern))
+                    .unwrap_or(false);
+                let shortcut_contains_pattern = keymap
+                    .key
+                    .iter()
+                    .any(|k| k.label().trim().to_lowercase().contains(&pattern));
+                let when_contains_pattern = keymap
+                    .when
+                    .as_ref()
+                    .map(|when| when.to_lowercase().contains(&pattern))
+                    .unwrap_or(false);
+
+                if cmd_name_contains_pattern
+                    || cmd_desc_contains_pattern
+                    || shortcut_contains_pattern
+                    || when_contains_pattern
+                {
+                    Some((cmd, Some(keymap.clone())))
+                } else {
+                    None
                 }
-                Some((cmd, Some(keymap.clone())))
             })
             .collect::<im::Vector<(LapceCommand, Option<KeyMap>)>>();
         items.extend(keypress.commands_without_keymap.iter().filter_map(|cmd| {