Rename object explorer to explorer

Author: Maxteabag

sqlit/app.py

@@ -331,7 +331,7 @@ def compose(self) -> ComposeResult:
             with Horizontal(id="content"):
                 with Vertical(id="sidebar"):
                     yield Static(
-                        r"\[e] Object Explorer", classes="section-label", id="label-explorer"
+                        r"\[E] Explorer", classes="section-label", id="label-explorer"
                     )
                     tree = Tree("Servers", id="object-tree")
                     tree.show_root = False

sqlit/state_machine.py

@@ -133,7 +133,7 @@ class HelpEntry:
 
     key: str  # Display key (e.g., "enter", "s")
     description: str  # Help description (e.g., "Select TOP 100")
-    category: str  # Category name (e.g., "Object Explorer")
+    category: str  # Category name (e.g., "Explorer")
 
 
 @dataclass
@@ -383,7 +383,7 @@ class MainScreenState(State):
 
     def _setup_actions(self) -> None:
         # Navigation (shown in Navigation category)
-        self.allows("focus_explorer", help="Focus Object Explorer", help_key="e")
+        self.allows("focus_explorer", help="Focus Explorer", help_key="e")
         self.allows("focus_query", help="Focus Query", help_key="q")
         self.allows("focus_results", help="Focus Results", help_key="r")
         self.allows("toggle_fullscreen", help="Toggle fullscreen", help_key="f")
@@ -453,7 +453,7 @@ def is_active(self, app: SSMSTUI) -> bool:
 class TreeFocusedState(State):
     """Base state when tree has focus."""
 
-    help_category = "Object Explorer"
+    help_category = "Explorer"
 
     def _setup_actions(self) -> None:
         self.allows("new_connection", key="n", label="New", help="New connection")
@@ -467,7 +467,7 @@ def is_active(self, app: SSMSTUI) -> bool:
 class TreeOnConnectionState(State):
     """Tree focused on a connection node."""
 
-    help_category = "Object Explorer"
+    help_category = "Explorer"
 
     def _setup_actions(self) -> None:
         def can_connect(app: SSMSTUI) -> bool:
@@ -559,7 +559,7 @@ def is_active(self, app: SSMSTUI) -> bool:
 class TreeOnTableState(State):
     """Tree focused on table or view node."""
 
-    help_category = "Object Explorer"
+    help_category = "Explorer"
 
     def _setup_actions(self) -> None:
         self.allows("select_table", key="s", label="Select TOP 100", help="Select TOP 100 (table/view)")
@@ -890,7 +890,7 @@ def generate_help_text(self) -> str:
         ]
 
         category_order = [
-            "Object Explorer",
+            "Explorer",
             "Query Editor (Normal)",
             "Query Editor (Insert)",
             "Results",

sqlit/ui/mixins/tree.py

@@ -39,7 +39,7 @@ def _db_type_badge(self, db_type: str) -> str:
         return badge_map.get(db_type, db_type.upper() if db_type else "DB")
 
     def refresh_tree(self) -> None:
-        """Refresh the object explorer tree."""
+        """Refresh the explorer tree."""
         self.object_tree.clear()
         self.object_tree.root.expand()
 
@@ -368,12 +368,12 @@ def on_tree_node_highlighted(self, event: Tree.NodeHighlighted) -> None:
         self._update_footer_bindings()
 
     def action_refresh_tree(self) -> None:
-        """Refresh the object explorer."""
+        """Refresh the explorer."""
         self.refresh_tree()
         self.notify("Refreshed")
 
     def action_collapse_tree(self) -> None:
-        """Collapse all nodes in the object explorer."""
+        """Collapse all nodes in the explorer."""
         def collapse_all(node):
             for child in node.children:
                 collapse_all(child)

sqlit/ui/mixins/ui_navigation.py

@@ -80,7 +80,7 @@ def _update_section_labels(self) -> None:
                 label_results.add_class("active")
 
     def action_focus_explorer(self) -> None:
-        """Focus the Object Explorer pane."""
+        """Focus the Explorer pane."""
         if self._fullscreen_mode != "none":
             self._set_fullscreen_mode("none")
         # Unhide explorer if hidden

tests/ui/keybindings/__init__.py

@@ -0,0 +1 @@
+"""Keybindings tests package."""

tests/ui/keybindings/conftest.py

@@ -0,0 +1,37 @@
+"""Shared fixtures and mocks for keybindings tests."""
+
+from __future__ import annotations
+
+import pytest
+
+from sqlit.keymap import (
+    KeymapProvider,
+    LeaderCommandDef,
+    ActionKeyDef,
+    reset_keymap,
+)
+
+
+class MockKeymapProvider(KeymapProvider):
+    """Mock keymap provider for testing custom keymaps."""
+
+    def __init__(
+        self,
+        leader_commands: list[LeaderCommandDef] | None = None,
+        action_keys: list[ActionKeyDef] | None = None,
+    ):
+        self._leader_commands = leader_commands or []
+        self._action_keys = action_keys or []
+
+    def get_leader_commands(self) -> list[LeaderCommandDef]:
+        return self._leader_commands
+
+    def get_action_keys(self) -> list[ActionKeyDef]:
+        return self._action_keys
+
+
+@pytest.fixture(autouse=True)
+def reset_keymap_after_test():
+    """Reset keymap after each test to avoid cross-test pollution."""
+    yield
+    reset_keymap()

tests/ui/keybindings/test_contextual.py

@@ -0,0 +1,93 @@
+"""Tests for contextual keybindings that only work in specific contexts."""
+
+from __future__ import annotations
+
+from unittest.mock import patch
+
+import pytest
+
+from sqlit.app import SSMSTUI
+from sqlit.keymap import get_keymap
+
+from ..mocks import MockConnectionStore, MockSettingsStore, create_test_connection
+
+
+class TestContextualKeybindings:
+    """Test that keybindings only work in their intended context."""
+
+    @pytest.mark.asyncio
+    async def test_focus_explorer_key_when_query_focused(self):
+        """Focus explorer key should focus explorer when query panel is focused."""
+        keymap = get_keymap()
+        focus_explorer_key = keymap.action("focus_explorer")
+
+        app = SSMSTUI()
+
+        async with app.run_test(size=(100, 35)) as pilot:
+            # Focus query first
+            app.action_focus_query()
+            await pilot.pause()
+            assert app.query_input.has_focus
+
+            # Press focus explorer key
+            await pilot.press(focus_explorer_key)
+            await pilot.pause()
+
+            assert app.object_tree.has_focus
+
+    @pytest.mark.asyncio
+    async def test_focus_query_key_when_explorer_focused(self):
+        """Focus query key should focus query when explorer is focused."""
+        keymap = get_keymap()
+        focus_query_key = keymap.action("focus_query")
+
+        app = SSMSTUI()
+
+        async with app.run_test(size=(100, 35)) as pilot:
+            # Focus explorer first
+            app.action_focus_explorer()
+            await pilot.pause()
+            assert app.object_tree.has_focus
+
+            # Press focus query key
+            await pilot.press(focus_query_key)
+            await pilot.pause()
+
+            assert app.query_input.has_focus
+
+    @pytest.mark.asyncio
+    async def test_edit_connection_blocked_when_query_focused(self):
+        """Edit connection key should NOT trigger edit_connection when query is focused."""
+        keymap = get_keymap()
+        edit_key = keymap.action("edit_connection")
+
+        connections = [create_test_connection("TestDB", "sqlite")]
+        mock_connections = MockConnectionStore(connections)
+        mock_settings = MockSettingsStore({"theme": "tokyo-night"})
+
+        with patch("sqlit.app.load_connections", mock_connections.load_all), \
+             patch("sqlit.app.load_settings", mock_settings.load_all), \
+             patch("sqlit.app.save_settings", mock_settings.save_all):
+
+            app = SSMSTUI()
+
+            async with app.run_test(size=(100, 35)) as pilot:
+                # Focus query
+                app.action_focus_query()
+                await pilot.pause()
+
+                edit_called = False
+                original_edit = app.action_edit_connection
+
+                def mock_edit():
+                    nonlocal edit_called
+                    edit_called = True
+                    original_edit()
+
+                app.action_edit_connection = mock_edit
+
+                # Press edit key - should focus explorer (since e is also focus_explorer), not edit connection
+                await pilot.press(edit_key)
+                await pilot.pause()
+
+                assert not edit_called