Use multiple CommandParser instances

qutebrowser/app.py

@@ -33,7 +33,7 @@ class QuteBrowser(QApplication):
 
         self.mainwindow = MainWindow()
         self.commandparser = cmdutils.CommandParser()
-        self.keyparser = KeyParser(self.mainwindow, self.commandparser)
+        self.keyparser = KeyParser(self.mainwindow)
 
         self.aboutToQuit.connect(self.config.save)
         self.mainwindow.tabs.keypress.connect(self.keyparser.handle)
@@ -43,6 +43,8 @@ class QuteBrowser(QApplication):
         self.mainwindow.status.cmd.got_cmd.connect(
             self.mainwindow.tabs.setFocus)
         self.commandparser.error.connect(self.mainwindow.status.disp_error)
+        self.keyparser.commandparser.error.connect(
+            self.mainwindow.status.disp_error)
         self.keyparser.keystring_updated.connect(
             self.mainwindow.status.txt.set_keystring)
 

qutebrowser/commands/keys.py

@@ -3,7 +3,7 @@ import re
 
 from PyQt5.QtCore import QObject, pyqtSignal
 
-from qutebrowser.commands.utils import ArgumentCountError
+from qutebrowser.commands.utils import CommandParser, ArgumentCountError
 
 class KeyParser(QObject):
     """Parser for vim-like key sequences"""
@@ -14,15 +14,15 @@ class KeyParser(QObject):
     keystring_updated = pyqtSignal(str)
     # Keybindings
     bindings = {}
-    cmdparser = None
+    commandparser = None
 
     MATCH_PARTIAL = 0
     MATCH_DEFINITIVE = 1
     MATCH_NONE = 2
 
-    def __init__(self, mainwindow, commandparser):
+    def __init__(self, mainwindow):
         super().__init__(mainwindow)
-        self.cmdparser = commandparser
+        self.commandparser = CommandParser()
 
     def from_config_sect(self, sect):
         """Loads keybindings from a ConfigParser section, in the config format
@@ -88,15 +88,15 @@ class KeyParser(QObject):
         # If we get a ValueError (invalid cmd) here, something is very wrong,
         # so we don't catch it
 
-        (cmd, args) = self.cmdparser.parse(cmdstr_hay)
+        self.commandparser.parse(cmdstr_hay)
         try:
-            self.cmdparser.check(cmd, args)
+            self.commandparser.check()
         except ArgumentCountError:
             logging.debug('Filling statusbar with partial command {}'.format(
                 cmdstr_hay))
             self.set_cmd_text.emit(':{} '.format(cmdstr_hay))
             return
-        self.cmdparser.run(cmd, args, count=count)
+        self.commandparser.run(count=count)
 
     def _match_key(self, cmdstr_needle):
         """Tries to match a given cmdstr with any defined command"""

qutebrowser/commands/utils.py

@@ -23,16 +23,16 @@ def register_all():
         cmd_dict[obj.name] = obj
 
 class CommandParser(QObject):
-    # FIXME
-    #
-    # this should work differently somehow, e.g. more than one instance, and
-    # remember args/cmd in between.
     """Parser for qutebrowser commandline commands"""
+    text = ''
+    cmd = ''
+    args = []
     error = pyqtSignal(str) # Emitted if there's an error
 
     def parse(self, text):
         """Parses a command and runs its handler"""
-        parts = text.strip().split(maxsplit=1)
+        self.text = text
+        parts = self.text.strip().split(maxsplit=1)
 
         # FIXME maybe we should handle unambigious shorthands for commands
         # here? Or at least we should add :q for :quit.
@@ -49,28 +49,29 @@ class CommandParser(QObject):
             args = shlex.split(parts[1])
         else:
             args = [parts[1]]
-        return (cmd, args)
+        self.cmd = cmd
+        self.args = args
 
-    def check(self, cmd, args):
+    def check(self):
         try:
-            cmd.check(args)
+            self.cmd.check(self.args)
         except ArgumentCountError:
-            self.error.emit("{}: invalid argument count".format(cmd))
+            self.error.emit("{}: invalid argument count".format(self.cmd))
             raise
 
+    def run(self, count=None):
+        if count is not None:
+            self.cmd.run(self.args, count=count)
+        else:
+            self.cmd.run(self.args)
+
     def parse_check_run(self, text, count=None):
         try:
-            (cmd, args) = self.parse(text)
-            self.check(cmd, args)
+            self.parse(text)
+            self.check()
         except (ArgumentCountError, ValueError):
             return
-        self.run(cmd, args)
-
-    def run(self, cmd, args, count=None):
-        if count is not None:
-            cmd.run(args, count=count)
-        else:
-            cmd.run(args)
+        self.run()
 
 class Command(QObject):
     """Base skeleton for a command. See the module help for