pyqt-code-editor 0.0.52__tar.gz → 0.0.53__tar.gz

{pyqt_code_editor-0.0.52 → pyqt_code_editor-0.0.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqt_code_editor
-Version: 0.0.52
+Version: 0.0.53
 Summary: Fully featured code-editor widgets for PyQt
 Keywords: code editor,pyqt,ide
 Author-email: Sebastiaan Mathôt <s.mathot@cogsci.nl>

{pyqt_code_editor-0.0.52 → pyqt_code_editor-0.0.53}/pyqt_code_editor/__init__.py

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.52'
+__version__ = '0.0.53'

pyqt_code_editor-0.0.53/pyqt_code_editor/mixins/merge_undo_actions.py

@@ -0,0 +1,54 @@
+from qtpy.QtCore import Qt
+from qtpy.QtGui import QTextCursor
+
+
+class MergeUndoActions:
+    """Ensures that all changes made as part of a key press result in a 
+    single edit block for undo purposes. This class should be the first
+    mixin of the list.
+    """
+    def keyPressEvent(self, event):
+        # Navigation keys that should NOT be wrapped in edit blocks. This 
+        # avoids cursor glitches when navigating vertically/horizontally.
+        navigation_keys = {
+            Qt.Key.Key_Up, Qt.Key.Key_Down, 
+            Qt.Key.Key_Left, Qt.Key.Key_Right,
+            Qt.Key.Key_Home, Qt.Key.Key_End,
+            Qt.Key.Key_PageUp, Qt.Key.Key_PageDown,
+        }
+
+        key = event.key()
+        modifiers = event.modifiers()
+
+        is_navigation = (
+            key in navigation_keys
+            and not (modifiers & Qt.KeyboardModifier.ShiftModifier)
+        )
+
+        # Treat platform "command" modifier as well (Control on Windows/Linux, Meta on macOS)
+        ctrl_or_meta = Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.MetaModifier
+        has_ctrl_or_meta = bool(modifiers & ctrl_or_meta)
+        has_shift = bool(modifiers & Qt.KeyboardModifier.ShiftModifier)
+
+        # Common Undo/Redo shortcuts:
+        # - Undo:  Ctrl+Z / Cmd+Z
+        # - Redo:  Ctrl+Shift+Z / Cmd+Shift+Z / Ctrl+Y / Cmd+Y
+        is_undo = has_ctrl_or_meta and key == Qt.Key.Key_Z and not has_shift
+        is_redo = has_ctrl_or_meta and (
+            (key == Qt.Key.Key_Z and has_shift) or
+            key == Qt.Key.Key_Y
+        )
+
+        if is_navigation or is_undo or is_redo:
+            # Do not wrap these in an edit block
+            super().keyPressEvent(event)
+            return
+
+        # For editing keys, wrap the operation in a single edit block.
+        # Use the widget's actual text cursor, not a fresh document cursor.
+        cursor = self.textCursor()
+        cursor.beginEditBlock()
+        try:
+            super().keyPressEvent(event)
+        finally:
+            cursor.endEditBlock()

pyqt_code_editor-0.0.52/pyqt_code_editor/mixins/merge_undo_actions.py

@@ -1,32 +0,0 @@
-from qtpy.QtCore import Qt
-from qtpy.QtGui import QTextCursor
-
-
-class MergeUndoActions:
-    """Ensures that all changes made as part of a key press result in a 
-    single edit block for undo purposes. This class should be the first
-    mixin of the list.
-    """
-    def keyPressEvent(self, event):
-        # Navigation keys that should NOT be wrapped in edit blocks. This 
-        # causes a specific issue with the cursor jumping to the start of a 
-        # line when navigating vertically.
-        navigation_keys = {
-            Qt.Key.Key_Up, Qt.Key.Key_Down, 
-            Qt.Key.Key_Left, Qt.Key.Key_Right,
-            Qt.Key.Key_Home, Qt.Key.Key_End,
-            Qt.Key.Key_PageUp, Qt.Key.Key_PageDown
-        }
-        is_navigation = (event.key() in navigation_keys and 
-                         not (event.modifiers() & Qt.KeyboardModifier.ShiftModifier))        
-        if is_navigation:            
-            super().keyPressEvent(event)
-            return
-        # Wrap all other keys (editing operations) in a single edit block to
-        # unify changes into a single undo action
-        cursor = QTextCursor(self.document())
-        cursor.beginEditBlock()
-        try:
-            super().keyPressEvent(event)
-        finally:
-            cursor.endEditBlock()