Move inspector command to components.misccommands

5 files changed, 21 insertions, 20 deletions

diff --git a/qutebrowser/api/apitypes.py b/qutebrowser/api/apitypes.py
index 1019c9132..f3aa969d8 100644
--- a/qutebrowser/api/apitypes.py
+++ b/qutebrowser/api/apitypes.py
@@ -21,6 +21,8 @@
 
 # pylint: disable=unused-import
 from qutebrowser.browser.browsertab import WebTabError, AbstractTab as Tab
+from qutebrowser.browser.inspector import (Position as InspectorPosition,
+                                           Error as InspectorError)
 from qutebrowser.browser.webelem import (Error as WebElemError,
                                          AbstractWebElement as WebElement)
 from qutebrowser.utils.usertypes import ClickTarget, JsWorld
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 1235a4310..2f06a4006 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1240,24 +1240,6 @@ class CommandDispatcher:
             raise cmdutils.CommandError("Bookmark '{}' not found!".format(url))
         message.info("Removed bookmark {}".format(url))
 
-    @cmdutils.register(instance='command-dispatcher', name='inspector',
-                       scope='window')
-    def toggle_inspector(
-            self,
-            position: inspector.Position = None
-    ) -> None:
-        """Toggle the web inspector.
-
-        Args:
-            position: Where to open the inspector
-                      (right/left/top/bottom/window).
-        """
-        tab = self._current_widget()
-        try:
-            tab.private_api.toggle_inspector(position)
-        except inspector.WebInspectorError as e:
-            raise cmdutils.CommandError(e)
-
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def download(self, url=None, *, mhtml_=False, dest=None):
         """Download a given URL, or current page if no URL given.
diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py
index fd9faa407..f19b3a863 100644
--- a/qutebrowser/browser/inspector.py
+++ b/qutebrowser/browser/inspector.py
@@ -33,6 +33,7 @@ from qutebrowser.config import configfiles
 from qutebrowser.utils import log, usertypes
 from qutebrowser.keyinput import modeman
 from qutebrowser.misc import miscwidgets, objects
+from qutebrowser.api import cmdutils
 
 
 def create(*, splitter: 'miscwidgets.InspectorSplitter',
@@ -66,7 +67,7 @@ class Position(enum.Enum):
     window = 5
 
 
-class WebInspectorError(Exception):
+class Error(Exception):
 
     """Raised when the inspector could not be initialized."""
 
diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py
index 053cdfaa6..d85afe4e1 100644
--- a/qutebrowser/browser/webengine/webengineinspector.py
+++ b/qutebrowser/browser/webengine/webengineinspector.py
@@ -69,7 +69,7 @@ class WebEngineInspector(inspector.AbstractWebInspector):
         try:
             port = int(os.environ['QTWEBENGINE_REMOTE_DEBUGGING'])
         except KeyError:
-            raise inspector.WebInspectorError(
+            raise inspector.Error(
                 "QtWebEngine inspector is not enabled. See "
                 "'qutebrowser --help' for details.")
 
diff --git a/qutebrowser/components/misccommands.py b/qutebrowser/components/misccommands.py
index b8c4b98b4..e71d4ddb1 100644
--- a/qutebrowser/components/misccommands.py
+++ b/qutebrowser/components/misccommands.py
@@ -313,3 +313,19 @@ def debug_trace(expr: str = "") -> None:
         eval('hunter.trace({})'.format(expr))
     except Exception as e:
         raise cmdutils.CommandError("{}: {}".format(e.__class__.__name__, e))
+
+
+@cmdutils.register()
+@cmdutils.argument('tab', value=cmdutils.Value.cur_tab)
+def inspector(tab: apitypes.Tab,
+              position: apitypes.InspectorPosition = None) -> None:
+    """Toggle the web inspector.
+
+    Args:
+        position: Where to open the inspector
+                  (right/left/top/bottom/window).
+    """
+    try:
+        tab.private_api.toggle_inspector(position)
+    except apitypes.InspectorError as e:
+        raise cmdutils.CommandError(e)