From 67829976faca1c2fdeb3964c25cb35bc41f0b8df Mon Sep 17 00:00:00 2001
From: VuiMuich <jm.spam@gmx.net>
Date: Tue, 19 Oct 2021 11:37:38 +0200
Subject: [PATCH] Add `C-j` and `C-k` to keybinds for picker (#876)

* Add `C-j` and `C-k` for moving down/up in pickers

* Add new binds to keymap doc
---
 book/src/keymap.md          | 18 +++++++++---------
 helix-term/src/ui/picker.rs |  8 ++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 156b1d99..1e19a4eb 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -242,12 +242,12 @@ commands (including goto) to extend the existing selection instead of replacing
 
 Keys to use within picker. Remapping currently not supported.
 
-| Key                | Description       |
-| -----              | -------------     |
-| `Up`, `Ctrl-p`     | Previous entry    |
-| `Down`, `Ctrl-n`   | Next entry        |
-| `Ctrl-space`       | Filter options    |
-| `Enter`            | Open selected     |
-| `Ctrl-h`           | Open horizontally |
-| `Ctrl-v`           | Open vertically   |
-| `Escape`, `Ctrl-c` | Close picker      |
+| Key                          | Description       |
+| -----                        | -------------     |
+| `Up`, `Ctrl-k`, `Ctrl-p`     | Previous entry    |
+| `Down`, `Ctrl-j`, `Ctrl-n`   | Next entry        |
+| `Ctrl-space`                 | Filter options    |
+| `Enter`                      | Open selected     |
+| `Ctrl-h`                     | Open horizontally |
+| `Ctrl-v`                     | Open vertically   |
+| `Escape`, `Ctrl-c`           | Close picker      |
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 9be2a73e..6f584178 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -336,6 +336,10 @@ impl<T: 'static> Component for Picker<T> {
                 code: KeyCode::BackTab,
                 ..
             }
+            | KeyEvent {
+                code: KeyCode::Char('k'),
+                modifiers: KeyModifiers::CONTROL,
+            }
             | KeyEvent {
                 code: KeyCode::Char('p'),
                 modifiers: KeyModifiers::CONTROL,
@@ -349,6 +353,10 @@ impl<T: 'static> Component for Picker<T> {
             | KeyEvent {
                 code: KeyCode::Tab, ..
             }
+            | KeyEvent {
+                code: KeyCode::Char('j'),
+                modifiers: KeyModifiers::CONTROL,
+            }
             | KeyEvent {
                 code: KeyCode::Char('n'),
                 modifiers: KeyModifiers::CONTROL,