just about working under pyside6

Author: plasmax

PythonEditor/ui/editor.py

@@ -399,10 +399,12 @@ def wheelEvent(self, event):
         """Restore focus and, if ctrl held, emit signal
         """
         self.setFocus(Qt.MouseFocusReason)
-        vertical = Qt.Orientation.Vertical
-        is_vertical = (
-            event.orientation() == vertical
-        )
+        # Qt6 removed orientation() - use angleDelta() instead
+        if hasattr(event, 'angleDelta'):
+            is_vertical = event.angleDelta().y() != 0
+        else:
+            # Qt5 fallback
+            is_vertical = event.orientation() == Qt.Orientation.Vertical
         CTRL = Qt.ControlModifier
         ctrl_held = (event.modifiers() == CTRL)
         if ctrl_held and is_vertical:

PythonEditor/ui/features/actions.py

@@ -1731,7 +1731,12 @@ def wheel_zoom(self, event):
         """
         font = self.editor.font()
         size = font.pointSize()
-        d = event.delta()
+        # Qt6 removed delta() - use angleDelta() instead
+        if hasattr(event, 'angleDelta'):
+            d = event.angleDelta().y()
+        else:
+            # Qt5 fallback
+            d = event.delta()
         amount = int(d/10) if d > 1 or d < -1 else d
         new_size = size + amount
         new_size = new_size if new_size > 0 else 1

PythonEditor/ui/features/shortcuts.py

@@ -112,11 +112,11 @@ def eventFilter(self, obj, event):
             # event.Destroy
             return False
 
-        if event.type() in [event.Shortcut, event.ShortcutOverride]: # accept all shortcuts
+        if event.type() in [QEvent.Shortcut, QEvent.ShortcutOverride]:
             event.accept()
             return True
 
-        if event.type() == event.KeyPress:
+        if event.type() == QEvent.KeyPress:
             # only let the editor receive keypress overrides
             if obj == self.editor:
                 return self.handle_keypress(event)

PythonEditor/ui/features/syntaxhighlighter.py

@@ -197,6 +197,35 @@ def format(self, rgb, style=''):
 
         return textFormat
 
+    def _iter_rule_matches(self, expression, text, nth):
+        if hasattr(expression, "indexIn"):
+            index = expression.indexIn(text, 0)
+            while index >= 0:
+                start = expression.pos(nth)
+                length = len(expression.cap(nth))
+                if start >= 0 and length > 0:
+                    yield start, length
+                index = expression.indexIn(text, start + max(length, 1))
+        else:
+            matches = expression.globalMatch(text)
+            while matches.hasNext():
+                match = matches.next()
+                start = match.capturedStart(nth)
+                length = match.capturedLength(nth)
+                if start >= 0 and length > 0:
+                    yield start, length
+
+    def _regex_find(self, expression, text, start=0):
+        if hasattr(expression, "indexIn"):
+            index = expression.indexIn(text, start)
+            if index >= 0:
+                return index, expression.matchedLength()
+            return -1, 0
+        match = expression.match(text, start)
+        if not match.hasMatch():
+            return -1, 0
+        return match.capturedStart(0), match.capturedLength(0)
+
     def highlightBlock(self, text):
         """
         Apply syntax highlighting to the given block of text.
@@ -207,14 +236,12 @@ def highlightBlock(self, text):
 
         # apply rules
         for expression, nth, format in self.rules:
-            index = expression.indexIn(text, 0)
-
-            while index >= 0:
-                # We actually want the index of the nth match
-                index = expression.pos(nth)
-                length = len(expression.cap(nth))
+            for index, length in self._iter_rule_matches(
+                expression,
+                text,
+                nth
+            ):
                 self.setFormat(index, length, format)
-                index = expression.indexIn(text, index + length)
 
         # apply comment rule
         if '#' in text:
@@ -295,17 +322,19 @@ def match_multiline(self, text, delimiter, in_state, style):
             add = 0
         # Otherwise, look for the delimiter on this line
         else:
-            start = delimiter.indexIn(text)
-            # Move past this match
-            add = delimiter.matchedLength()
+            start, add = self._regex_find(delimiter, text, 0)
 
         # As long as there's a delimiter match on this line...
         while start >= 0:
             # Look for the ending delimiter
-            end = delimiter.indexIn(text, start + add)
+            end, end_length = self._regex_find(
+                delimiter,
+                text,
+                start + add
+            )
             # Ending delimiter on this line?
             if end >= add:
-                length = end - start + add + delimiter.matchedLength()
+                length = end - start + add + end_length
                 self.setCurrentBlockState(0)
             # No; multi-line string
             else:
@@ -314,7 +343,11 @@ def match_multiline(self, text, delimiter, in_state, style):
             # Apply formatting
             self.setFormat(start, length, style)
             # Look for the next match
-            start = delimiter.indexIn(text, start + length)
+            start, add = self._regex_find(
+                delimiter,
+                text,
+                start + length
+            )
 
         # Return True if still inside a multi-line string
         return self.currentBlockState() == in_state

tests/test_qt_binding.py

@@ -72,6 +72,50 @@ def test_ide_smoke_event_loop():
         app.quit()
 
 
+@pytest.mark.gui
+def test_launch_steps_subprocess_syntax_highlighter_regexp():
+    created_app = False
+    app = QtWidgets.QApplication.instance()
+    if app is None:
+        app = QtWidgets.QApplication(sys.argv)
+        created_app = True
+
+    from PythonEditor.ui import editor as editor_module
+    from PythonEditor.ui.features import syntaxhighlighter
+
+    editor = editor_module.Editor(init_features=False)
+    highlighter = syntaxhighlighter.Highlight(editor.document(), editor)
+    editor.setPlainText("class Foo:\n    def bar(self):\n        return 1\n")
+    highlighter.rehighlight()
+
+    editor.close()
+    QtWidgets.QApplication.processEvents()
+    if created_app:
+        app.quit()
+
+
+@pytest.mark.gui
+def test_launch_steps_subprocess_shortcut_event_filter():
+    created_app = False
+    app = QtWidgets.QApplication.instance()
+    if app is None:
+        app = QtWidgets.QApplication(sys.argv)
+        created_app = True
+
+    from PythonEditor.ui import editor as editor_module
+    from PythonEditor.ui.features import shortcuts
+
+    editor = editor_module.Editor(init_features=False)
+    handler = shortcuts.ShortcutHandler(editor=editor)
+    paint_event = QtGui.QPaintEvent(QtCore.QRect(0, 0, 1, 1))
+    assert handler.eventFilter(editor, paint_event) is False
+
+    editor.close()
+    QtWidgets.QApplication.processEvents()
+    if created_app:
+        app.quit()
+
+
 @pytest.mark.gui
 def test_launch_steps_subprocess():
     import subprocess