fix: add count support for gg and reorder commands

Author: Maxteabag

sqlit/domains/query/ui/mixins/query_editing_cursor.py

@@ -38,9 +38,17 @@ def action_g_leader_key(self: QueryMixinHost) -> None:
         self._start_leader_pending("g")
 
     def action_g_first_line(self: QueryMixinHost) -> None:
-        """Go to first line (gg)."""
+        """Go to first line (gg), or to line N with count prefix (e.g., 3gg)."""
         self._clear_leader_pending()
-        self.query_input.cursor_location = (0, 0)
+        count = self._get_and_clear_count()
+        if count is not None:
+            lines = self.query_input.text.split("\n")
+            num_lines = len(lines)
+            target_row = min(count - 1, num_lines - 1)
+            target_row = max(0, target_row)
+            self.query_input.cursor_location = (target_row, 0)
+        else:
+            self.query_input.cursor_location = (0, 0)
 
     def action_g_word_end_back(self: QueryMixinHost) -> None:
         """Go to end of previous word (ge)."""

sqlit/domains/shell/app/main.py

@@ -748,6 +748,22 @@ def _show_command_list(self) -> None:
             ("Appearance", ":theme", "Open theme selection", ""),
             ("Query", ":run, :r", "Execute query", ""),
             ("Query", ":run!, :r!", "Execute query (stay in INSERT)", ""),
+            (
+                "Navigation",
+                ":<number>",
+                "Go to line number",
+                "Jump to specified line in query editor (e.g., :25 goes to line 25).",
+            ),
+            (
+                "Navigation",
+                "<count>G",
+                "Go to line with count prefix",
+                "In NORMAL mode, type a number then G to go to that line (e.g., 25G).",
+            ),
+            ("Editor", ":set number, :set nu", "Show line numbers", ""),
+            ("Editor", ":set nonumber, :set nonu", "Hide line numbers", ""),
+            ("Editor", ":set relativenumber, :set rnu", "Show relative line numbers", ""),
+            ("Editor", ":set norelativenumber, :set nornu", "Show absolute line numbers", ""),
             (
                 "Worker",
                 ":process-worker, :worker",
@@ -760,6 +776,9 @@ def _show_command_list(self) -> None:
                 "Show process worker status",
                 "Displays worker mode, active state, and last activity.",
             ),
+            ("Settings", ":set process_worker_warm on|off", "Warm worker on idle", ""),
+            ("Settings", ":set process_worker_lazy on|off", "Lazy worker start", ""),
+            ("Settings", ":set process_worker_auto_shutdown <seconds>", "Auto-shutdown worker", ""),
             (
                 "Watchdog",
                 ":wd <ms|off>",
@@ -777,25 +796,6 @@ def _show_command_list(self) -> None:
             ("Debug", ":debug", "Show debug status", ""),
             ("Debug", ":debug list", "Show debug events", ""),
             ("Debug", ":debug clear", "Clear debug event log", ""),
-            ("Settings", ":set process_worker_warm on|off", "Warm worker on idle", ""),
-            ("Settings", ":set process_worker_lazy on|off", "Lazy worker start", ""),
-            ("Settings", ":set process_worker_auto_shutdown <seconds>", "Auto-shutdown worker", ""),
-            ("Editor", ":set number, :set nu", "Show line numbers", ""),
-            ("Editor", ":set nonumber, :set nonu", "Hide line numbers", ""),
-            ("Editor", ":set relativenumber, :set rnu", "Show relative line numbers", ""),
-            ("Editor", ":set norelativenumber, :set nornu", "Show absolute line numbers", ""),
-            (
-                "Navigation",
-                ":<number>",
-                "Go to line number",
-                "Jump to specified line in query editor (e.g., :25 goes to line 25).",
-            ),
-            (
-                "Navigation",
-                "<count>G",
-                "Go to line with count prefix",
-                "In NORMAL mode, type a number then G to go to that line (e.g., 25G).",
-            ),
         ]
         if hasattr(self, "_replace_results_table"):
             self._replace_results_table(columns, rows)

tests/ui/keybindings/test_vim_motions.py

@@ -513,6 +513,26 @@ async def test_25G_goes_to_line_25(self) -> None:
             # 25G goes to line 25 (0-indexed: row 24)
             assert app.query_input.cursor_location[0] == 24, f"Expected row 24, got {app.query_input.cursor_location[0]}"
 
+    @pytest.mark.asyncio
+    async def test_3gg_goes_to_line_3(self) -> None:
+        """3gg should go to line 3 (0-indexed: row 2)."""
+        app = _make_app()
+
+        async with app.run_test(size=(100, 35)) as pilot:
+            app.action_focus_query()
+            await pilot.pause()
+
+            # Create 10 lines
+            lines = [f"line{i+1}" for i in range(10)]
+            app.query_input.text = "\n".join(lines)
+            app.query_input.cursor_location = (7, 0)
+            await pilot.pause()
+
+            await pilot.press("3", "g", "g")
+            await pilot.pause()
+
+            assert app.query_input.cursor_location[0] == 2, f"Expected row 2, got {app.query_input.cursor_location[0]}"
+
     @pytest.mark.asyncio
     async def test_colon_25_goes_to_line_25(self) -> None:
         """:25 command should go to line 25."""