From 14f8ec8754c0f8bf1718b2ec3258229a3435eac2 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 22 Sep 2016 12:17:25 -0400
Subject: [PATCH] Error on mode/command mismatch with :bind.

Resolves #1964 (:bind should error for mode/command mismatch)
---
 qutebrowser/config/parsers/keyconf.py   | 27 ++++++++++++++++++-------
 tests/end2end/features/keyinput.feature |  4 ++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/config/parsers/keyconf.py b/qutebrowser/config/parsers/keyconf.py
index 7952c32e5..aa1600ae1 100644
--- a/qutebrowser/config/parsers/keyconf.py
+++ b/qutebrowser/config/parsers/keyconf.py
@@ -177,12 +177,13 @@ class KeyConfigParser(QObject):
                                                                      mode))
             return
 
-        mode = self._normalize_sectname(mode)
-        for m in mode.split(','):
+        modenames = self._normalize_sectname(mode).split(',')
+        for m in modenames:
             if m not in configdata.KEY_DATA:
                 raise cmdexc.CommandError("Invalid mode {}!".format(m))
         try:
-            self._validate_command(command)
+            modes = [usertypes.KeyMode[m] for m in modenames]
+            self._validate_command(command, modes)
         except KeyConfigError as e:
             raise cmdexc.CommandError(str(e))
         try:
@@ -192,7 +193,7 @@ class KeyConfigParser(QObject):
                                       "override!".format(str(e.keychain)))
         except KeyConfigError as e:
             raise cmdexc.CommandError(e)
-        for m in mode.split(','):
+        for m in modenames:
             self.changed.emit(m)
             self._mark_config_dirty()
 
@@ -331,8 +332,13 @@ class KeyConfigParser(QObject):
         self.is_dirty = True
         self.config_dirty.emit()
 
-    def _validate_command(self, line):
-        """Check if a given command is valid."""
+    def _validate_command(self, line, modes=None):
+        """Check if a given command is valid.
+
+        Args:
+            line: The commandline to validate.
+            modes: A list of modes to validate the commands for, or None.
+        """
         from qutebrowser.config import config
         if line == self.UNBOUND_COMMAND:
             return
@@ -352,8 +358,15 @@ class KeyConfigParser(QObject):
         commands = [c.split(maxsplit=1)[0].strip() for c in commands]
         for cmd in commands:
             aliases = config.section('aliases')
-            if cmd not in cmdutils.cmd_dict and cmd not in aliases:
+            if cmd in cmdutils.cmd_dict:
+                cmdname = cmd
+            elif cmd in aliases:
+                cmdname = aliases[cmd].split(maxsplit=1)[0].strip()
+            else:
                 raise KeyConfigError("Invalid command '{}'!".format(cmd))
+            cmd_obj = cmdutils.cmd_dict[cmdname]
+            for m in modes or []:
+                cmd_obj.validate_mode(m)
 
     def _read_command(self, line):
         """Read a command from a line."""
diff --git a/tests/end2end/features/keyinput.feature b/tests/end2end/features/keyinput.feature
index 3ae32368b..e02b33d71 100644
--- a/tests/end2end/features/keyinput.feature
+++ b/tests/end2end/features/keyinput.feature
@@ -73,6 +73,10 @@ Feature: Keyboard input
         And I run :bind <test26>
         Then the message "<test26> is bound to 'mib' in normal mode" should be shown
 
+    Scenario: Binding with an unsupported mode
+        When I run :bind --mode=caret test27 rl-unix-filename-rubout
+        Then the error "rl-unix-filename-rubout: This command is only allowed in command/prompt mode, not caret." should be shown
+
     # :unbind
 
     Scenario: Binding and unbinding a keychain