chemql-python 1.5.2__tar.gz → 1.5.3__tar.gz

{chemql_python-1.5.2 → chemql_python-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chemql-python
-Version: 1.5.2
+Version: 1.5.3
 Summary: A chemistry-focused query language and REPL
 Author-email: Mohammad Rakibul Islam <rakibulofficial1017@gmail.com>
 Requires-Python: >=3.10
@@ -159,6 +159,8 @@ when a supported clipboard command is available), word deletion with
 undo (`Ctrl+Z`), redo (`Ctrl+Y`), save (`Ctrl+S`), and quit (`Ctrl+Q`).
 Namespace declarations are highlighted and auto-indented. Its syntax and UI
 colors are configurable in the packaged `chemql/colors.json` file.
+Use `Ctrl+Up` and `Ctrl+Down` to scroll the viewport while keeping the cursor
+at the same screen position.
 
 Press `Ctrl+F` to search; matches highlight as you type. Press Enter or the
 Down Arrow for the next match, Up Arrow for the previous match, and Escape
@@ -168,6 +170,9 @@ default. Prefix a query with `r:` for a case-sensitive regular expression,
 literal text, or `li:` for case-insensitive literal text. Add `w` to match
 whole words, for example `lwi:cat`.
 
+Use `Ctrl+Up` and `Ctrl+Down` to scroll the viewport while keeping the cursor
+at the same screen position.
+
 ## Query language
 
 A typical query starts with `search`, a source, optional conditions, and

{chemql_python-1.5.2 → chemql_python-1.5.3}/README.md

@@ -146,6 +146,8 @@ when a supported clipboard command is available), word deletion with
 undo (`Ctrl+Z`), redo (`Ctrl+Y`), save (`Ctrl+S`), and quit (`Ctrl+Q`).
 Namespace declarations are highlighted and auto-indented. Its syntax and UI
 colors are configurable in the packaged `chemql/colors.json` file.
+Use `Ctrl+Up` and `Ctrl+Down` to scroll the viewport while keeping the cursor
+at the same screen position.
 
 Press `Ctrl+F` to search; matches highlight as you type. Press Enter or the
 Down Arrow for the next match, Up Arrow for the previous match, and Escape
@@ -155,6 +157,9 @@ default. Prefix a query with `r:` for a case-sensitive regular expression,
 literal text, or `li:` for case-insensitive literal text. Add `w` to match
 whole words, for example `lwi:cat`.
 
+Use `Ctrl+Up` and `Ctrl+Down` to scroll the viewport while keeping the cursor
+at the same screen position.
+
 ## Query language
 
 A typical query starts with `search`, a source, optional conditions, and

{chemql_python-1.5.2 → chemql_python-1.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "chemql-python"
-version = "1.5.2"
+version = "1.5.3"
 authors = [
     { name = "Mohammad Rakibul Islam", email = "rakibulofficial1017@gmail.com" }
 ]

{chemql_python-1.5.2 → chemql_python-1.5.3}/src/chemql/__init__.py

@@ -64,7 +64,7 @@ __all__ = [
     "__version__"
 ]
 
-__version__ = "1.5.2"
+__version__ = "1.5.3"
 
 # Persistent preprocessor/function state for the current ChemQL session.
 DEFINITIONS = {}

{chemql_python-1.5.2 → chemql_python-1.5.3}/src/chemql/codecql.py

@@ -126,7 +126,8 @@ if os.name == 'nt':
         0x4B: "arrow_left", 0x4D: "arrow_right",
         0x47: "arrow_home", 0x4F: "arrow_end",
         0x53: "delete", 0x73: "ctrl+arrow_left",
-        0x74: "ctrl+arrow_right", 0x9B: "alt+arrow_left",
+        0x74: "ctrl+arrow_right", 0x8D: "ctrl+arrow_up",
+        0x91: "ctrl+arrow_down", 0x9B: "alt+arrow_left",
         0x9D: "alt+arrow_right",
     }
 
@@ -556,12 +557,22 @@ class Editor:
             "arrow_up", "arrow_down", "arrow_left", "arrow_right",
             "arrow_home", "arrow_end",
         }:
-            self._move_cursor(base_key, shift=shift, wordwise=wordwise)
+            if "ctrl" in modifiers and base_key in {"arrow_up", "arrow_down"}:
+                self._scroll_view(-1 if base_key == "arrow_up" else 1)
+            else:
+                self._move_cursor(base_key, shift=shift, wordwise=wordwise)
         elif key in ("\x08", "ctrl+backspace"):
-            self._delete_word("left")
+            if os.name == "nt":
+                if not self._delete_selection(): # For some reason on windows it is the opposit
+                    self._backspace()            # I have no idea why just stick to it
+            else:
+                self._delete_word("left")
         elif key in ("\x7f", "backspace"):
-            if not self._delete_selection():
-                self._backspace()
+            if os.name == "nt":
+                self._delete_word("left")        # same here
+            else:
+                if not self._delete_selection():
+                    self._backspace()
         elif key in ("ctrl+delete",):
             self._delete_word("right")
         elif key in ("delete", "\x1b[3~"):
@@ -581,6 +592,18 @@ class Editor:
         self.cursor_x = min(self.cursor_x, len(self.lines[self.cursor_y]))
         return False
 
+    def _scroll_view(self, direction):
+        try:
+            _, rows = os.get_terminal_size()
+        except OSError:
+            rows = 24
+        viewport_height = max(rows, 4) - 2
+        max_scroll = max(0, len(self.lines) - viewport_height)
+        new_scroll_y = max(0, min(max_scroll, self.scroll_y + direction))
+        scroll_delta = new_scroll_y - self.scroll_y
+        self.scroll_y = new_scroll_y
+        self.cursor_y = max(0, min(len(self.lines) - 1, self.cursor_y + scroll_delta))
+
     def _open_search(self):
         self.search_active = True
         self.search_query = ""

{chemql_python-1.5.2 → chemql_python-1.5.3}/src/chemql_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chemql-python
-Version: 1.5.2
+Version: 1.5.3
 Summary: A chemistry-focused query language and REPL
 Author-email: Mohammad Rakibul Islam <rakibulofficial1017@gmail.com>
 Requires-Python: >=3.10
@@ -159,6 +159,8 @@ when a supported clipboard command is available), word deletion with
 undo (`Ctrl+Z`), redo (`Ctrl+Y`), save (`Ctrl+S`), and quit (`Ctrl+Q`).
 Namespace declarations are highlighted and auto-indented. Its syntax and UI
 colors are configurable in the packaged `chemql/colors.json` file.
+Use `Ctrl+Up` and `Ctrl+Down` to scroll the viewport while keeping the cursor
+at the same screen position.
 
 Press `Ctrl+F` to search; matches highlight as you type. Press Enter or the
 Down Arrow for the next match, Up Arrow for the previous match, and Escape
@@ -168,6 +170,9 @@ default. Prefix a query with `r:` for a case-sensitive regular expression,
 literal text, or `li:` for case-insensitive literal text. Add `w` to match
 whole words, for example `lwi:cat`.
 
+Use `Ctrl+Up` and `Ctrl+Down` to scroll the viewport while keeping the cursor
+at the same screen position.
+
 ## Query language
 
 A typical query starts with `search`, a source, optional conditions, and

{chemql_python-1.5.2 → chemql_python-1.5.3}/tests/test_codecql.py

@@ -64,6 +64,42 @@ def test_terminal_arrow_modifiers_are_decoded():
     assert codecql._decode_escape_sequence(b"[1;6B") == "ctrl+shift+arrow_down"
 
 
+def test_ctrl_up_down_scroll_viewport_without_edge_trigger(monkeypatch):
+    editor = codecql.Editor(None)
+    editor.lines = [f"line {index}" for index in range(30)]
+    editor.scroll_y = 10
+    editor.cursor_y = 13
+    editor.cursor_x = 2
+    monkeypatch.setattr(codecql.os, "get_terminal_size", lambda: (80, 10))
+
+    editor.handle_key("ctrl+arrow_up")
+    assert editor.scroll_y == 9
+    assert editor.cursor_y == 12
+    assert editor.cursor_y - editor.scroll_y == 3
+
+    editor.handle_key("ctrl+arrow_down")
+    assert editor.scroll_y == 10
+    assert editor.cursor_y == 13
+    assert editor.cursor_y - editor.scroll_y == 3
+
+
+def test_ctrl_scroll_clamps_at_document_ends(monkeypatch):
+    editor = codecql.Editor(None)
+    editor.lines = [f"line {index}" for index in range(30)]
+    monkeypatch.setattr(codecql.os, "get_terminal_size", lambda: (80, 10))
+    editor.scroll_y = 0
+    editor.cursor_y = 0
+
+    editor.handle_key("ctrl+arrow_up")
+    assert editor.scroll_y == editor.cursor_y == 0
+
+    editor.scroll_y = 22
+    editor.cursor_y = 25
+    editor.handle_key("ctrl+arrow_down")
+    assert editor.scroll_y == 22
+    assert editor.cursor_y == 25
+
+
 def test_ctrl_backspace_and_delete_remove_words():
     editor = codecql.Editor(None)
     editor.lines = ["one two"]