fix(input is now only forwarded in normal mode)

rust-toolchain.toml

@@ -0,0 +1,8 @@
+# https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file
+[toolchain]
+# can be further pinned eg:
+# date: "stable-2020-07-10"
+# version: "nightly-1.0.0"
+channel = "stable"
+components = [ "rustfmt", "rust-src", "clippy", "rust-analysis"]
+# targets = [ ]

src/common/input/actions.rs

@@ -39,6 +39,8 @@ pub enum Action {
     CloseFocus,
     /// Create a new tab.
     NewTab,
+    /// Do nothing.
+    NoOp,
     /// Go to the next tab.
     GoToNextTab,
     /// Go to the previous tab.

src/common/input/handler.rs

@@ -227,6 +227,7 @@ impl InputHandler {
                     .unwrap();
                 self.command_is_executing.wait_until_pane_is_closed();
             }
+            Action::NoOp => {}
         }
 
         should_break

src/common/input/keybinds.rs

@@ -165,15 +165,16 @@ pub fn key_to_actions(
     mode: &InputMode,
     keybinds: &Keybinds,
 ) -> Vec<Action> {
-    if let Some(mode_keybinds) = keybinds.get(mode) {
+    let mode_keybind_or_action = |action: Action| {
-        mode_keybinds
+        keybinds
+            .get(mode)
+            .unwrap_or_else(|| unreachable!("Unrecognized mode: {:?}", mode))
             .get(key)
             .cloned()
-            // FIXME in command mode, unbound keystrokes should probably do nothing instead of
+            .unwrap_or_else(|| vec![action])
-            // writing to the terminal. Will be easier to implement after a big refactor of the
+    };
-            // input system (@categorille)
+    match *mode {
-            .unwrap_or_else(|| vec![Action::Write(input)])
+        InputMode::Normal => mode_keybind_or_action(Action::Write(input)),
-    } else {
+        _ => mode_keybind_or_action(Action::NoOp),
-        unreachable!("Unrecognized mode: {:?}", mode);
     }
 }