PrEditor 1.2.0__tar.gz → 1.3.0__tar.gz

{preditor-1.2.0 → preditor-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 1.2.0
+Version: 1.3.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0

{preditor-1.2.0 → preditor-1.3.0}/PrEditor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 1.2.0
+Version: 1.3.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/console.py

@@ -63,6 +63,8 @@ class ConsolePrEdit(QTextEdit):
 
         self._firstShow = True
 
+        self.addSepNewline = False
+
         # When executing code, that takes longer than this seconds, flash the window
         self.flash_time = 1.0
         self.flash_window = None
@@ -817,6 +819,10 @@ class ConsolePrEdit(QTextEdit):
                 hasattr(window, 'uiErrorHyperlinksACT')
                 and window.uiErrorHyperlinksACT.isChecked()
             )
+            sepPreditorTrace = (
+                hasattr(window, 'uiSeparateTracebackACT')
+                and window.uiSeparateTracebackACT.isChecked()
+            )
             self.moveCursor(QTextCursor.MoveOperation.End)
 
             charFormat = QTextCharFormat()
@@ -855,6 +861,17 @@ class ConsolePrEdit(QTextEdit):
             filename = info.get("filename", "") if info else ""
             isConsolePrEdit = '<ConsolePrEdit>' in filename
 
+            # To make it easier to see relevant lines of a traceback, optionally insert
+            # a newline separating internal PrEditor code from the code run by user.
+            if self.addSepNewline:
+                if sepPreditorTrace:
+                    msg += "\n"
+                self.addSepNewline = False
+
+            preditorCalls = ("cmdresult = e", "exec(compiled,")
+            if msg.strip().startswith(preditorCalls):
+                self.addSepNewline = True
+
             if info and doHyperlink and not isConsolePrEdit:
                 fileStart = info.get("fileStart")
                 fileEnd = info.get("fileEnd")

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/group_tab_widget/__init__.py

@@ -323,3 +323,31 @@ class GroupTabWidget(OneTabWidget):
         tab_widget = self.currentWidget()
         tab_widget.setCurrentIndex(editor)
         return tab_widget.currentWidget()
+
+    def set_current_groups_from_workbox(self, workbox):
+        """Make the specified workbox the current widget. If the workbox is not
+        found, the current widget is not changed.
+
+        Args:
+            workbox (WorkboxMixin): The workbox to make current.
+
+        Returns:
+            success (bool): Whether the workbox was found and made the current
+                widget
+        """
+        workbox_infos = self.all_widgets()
+        found_info = None
+        for workbox_info in workbox_infos:
+            if workbox_info[0] == workbox:
+                found_info = workbox_info
+                break
+        if found_info:
+            workbox = workbox_info[0]
+            group_idx = workbox_info[-2]
+            editor_idx = workbox_info[-1]
+
+            self.setCurrentIndex(group_idx)
+            tab_widget = self.currentWidget()
+            tab_widget.setCurrentIndex(editor_idx)
+
+        return bool(found_info)

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/loggerwindow.py

@@ -93,9 +93,7 @@ class LoggerWindow(Window):
         self.name = name if name else get_core_name()
         self._stylesheet = 'Bright'
 
-        # Create timer to autohide status messages
-        self.statusTimer = QTimer()
-        self.statusTimer.setSingleShot(True)
+        self.setupStatusTimer()
 
         # Store the previous time a font-resize wheel event was triggered to prevent
         # rapid-fire WheelEvents. Initialize to the current time.
@@ -815,6 +813,7 @@ class LoggerWindow(Window):
                 'uiStatusLbl_limit': self.uiStatusLBL.limit(),
                 'textEditorPath': self.textEditorPath,
                 'textEditorCmdTempl': self.textEditorCmdTempl,
+                'uiSeparateTracebackACT': self.uiSeparateTracebackACT.isChecked(),
                 'currentStyleSheet': self._stylesheet,
                 'flash_time': self.uiConsoleTXT.flash_time,
                 'find_files_regex': self.uiFindInWorkboxesWGT.uiRegexBTN.isChecked(),
@@ -967,6 +966,8 @@ class LoggerWindow(Window):
         self.textEditorPath = pref.get('textEditorPath', defaultExePath)
         self.textEditorCmdTempl = pref.get('textEditorCmdTempl', defaultCmd)
 
+        self.uiSeparateTracebackACT.setChecked(pref.get('uiSeparateTracebackACT', True))
+
         self.uiWordWrapACT.setChecked(pref.get('wordWrap', True))
         self.setWordWrap(self.uiWordWrapACT.isChecked())
         self.uiClearBeforeRunningACT.setChecked(pref.get('clearBeforeRunning', False))
@@ -1041,16 +1042,24 @@ class LoggerWindow(Window):
         self.uiStatusLBL.setText(txt)
         self.uiMenuBar.adjustSize()
 
+    def setupStatusTimer(self):
+        # Create timer to autohide status messages
+        self.statusTimer = QTimer()
+        self.statusTimer.setSingleShot(True)
+        self.statusTimer.setInterval(2000)
+        self.statusTimer.timeout.connect(self.clearStatusText)
+
     def clearStatusText(self):
         """Clear any displayed status text"""
         self.uiStatusLBL.clear()
         self.uiMenuBar.adjustSize()
 
     def autoHideStatusText(self):
-        """Set timer to automatically clear status text"""
-        if self.statusTimer.isActive():
-            self.statusTimer.stop()
-        self.statusTimer.singleShot(2000, self.clearStatusText)
+        """Set timer to automatically clear status text.
+
+        If timer is already running, it will be automatically stopped first (We can't
+        use static method QTimer.singleShot for this)
+        """
         self.statusTimer.start()
 
     def setStyleSheet(self, stylesheet, recordPrefs=True):

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/ui/loggerwindow.ui

@@ -92,7 +92,7 @@
      <x>0</x>
      <y>0</y>
      <width>796</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="uiDebugMENU">
@@ -193,6 +193,8 @@
     <addaction name="uiSetFlashWindowIntervalACT"/>
     <addaction name="separator"/>
     <addaction name="uiErrorHyperlinksACT"/>
+    <addaction name="uiSeparateTracebackACT"/>
+    <addaction name="separator"/>
     <addaction name="uiSetPreferredTextEditorPathACT"/>
     <addaction name="uiSetWorkboxEditorACT"/>
    </widget>
@@ -1003,6 +1005,14 @@ at the indicated line in the specified text editor.
     <string>Highlight Exact Completion</string>
    </property>
   </action>
+  <action name="uiSeparateTracebackACT">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Visually Separate PrEditor Traceback</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/workbox_mixin.py

@@ -84,8 +84,8 @@ class WorkboxMixin(object):
         txt = '\n' * line + txt
 
         # execute the code
-        filename = self.__workbox_filename__(selection=True)
-        ret, was_eval = self.__console__().executeString(txt, filename=filename)
+        title = self.__workbox_trace_title__(selection=True)
+        ret, was_eval = self.__console__().executeString(txt, filename=title)
         if was_eval:
             # If the selected code was a statement print the result of the statement.
             ret = repr(ret)
@@ -145,7 +145,7 @@ class WorkboxMixin(object):
 
         return group, editor
 
-    def __workbox_filename__(self, selection=False):
+    def __workbox_trace_title__(self, selection=False):
         title = "WorkboxSelection" if selection else "Workbox"
         group, editor = self.__group_tab_index__()
         if group == -1 or editor == -1:

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/workbox_text_edit.py

@@ -57,8 +57,8 @@ class WorkboxTextEdit(WorkboxMixin, QTextEdit):
 
     def __exec_all__(self):
         txt = self.__text__().rstrip()
-        filename = self.__workbox_filename__()
-        self.__console__().executeString(txt, filename=filename)
+        title = self.__workbox_trace_title__()
+        self.__console__().executeString(txt, filename=title)
 
     def __font__(self):
         return self.font()

{preditor-1.2.0 → preditor-1.3.0}/preditor/gui/workboxwidget.py

@@ -73,8 +73,8 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
 
     def __exec_all__(self):
         txt = self.__unix_end_lines__(self.text()).rstrip()
-        filename = self.__workbox_filename__()
-        self.__console__().executeString(txt, filename=filename)
+        title = self.__workbox_trace_title__()
+        self.__console__().executeString(txt, filename=title)
 
     def __file_monitoring_enabled__(self):
         return self._fileMonitoringActive
@@ -150,7 +150,12 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
 
     def __selected_text__(self, start_of_line=False, selectText=False):
         line, s, end, e = self.getSelection()
-        if line == -1:
+
+        # Sometime self.getSelection returns values that equate to a non-existent
+        # selection, ie start and end are the same, so let's process it as if there is
+        # no selection
+        selectionIsEmpty = line == end and s == e
+        if line == -1 or selectionIsEmpty:
             # Nothing is selected, return the current line of text
             line, index = self.getCursorPosition()
             txt = self.text(line)
@@ -188,7 +193,7 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
         Returns:
             str: The requested text.
         """
-        if line:
+        if line is not None:
             return self.text(line)
         elif (start is None) != (end is None):
             raise ValueError('You must pass start and end if you pass either.')

{preditor-1.2.0 → preditor-1.3.0}/preditor/scintilla/documenteditor.py

@@ -21,7 +21,7 @@ from functools import partial
 
 import Qt as Qt_py
 from Qt.QtCore import Property, QEvent, QPoint, Qt, Signal
-from Qt.QtGui import QColor, QFont, QFontMetrics, QIcon, QKeySequence
+from Qt.QtGui import QColor, QFont, QFontMetrics, QIcon, QKeyEvent, QKeySequence
 from Qt.QtWidgets import (
     QAction,
     QApplication,
@@ -326,7 +326,8 @@ class DocumentEditor(QsciScintilla):
 
         with undo_step(self):
             # lookup the selected text positions
-            cursorLine, cursorIndex = self.expandCursorToLineSelection()
+            origSelection = self.expandCursorToLineSelection()
+            origStartLine, origStartCol, origEndLine, origEndCol = origSelection
             startLine, startCol, endLine, endCol = self.getSelection()
 
             # Collect comments and indents, to determine indentation to use, and whether
@@ -351,11 +352,14 @@ class DocumentEditor(QsciScintilla):
 
             # If all lines are comments, we un-comment. If any aren't
             # comments, we comment.
+            sel_adjust = 0
             if doWhich is None:
                 if all(comments):
                     doWhich = "Uncomment"
+                    sel_adjust = -1 * len(commentSpace)
                 else:
                     doWhich = "Comment"
+                    sel_adjust = len(commentSpace)
 
             for line in range(startLine, endLine + 1):
                 lineText = self.getSelectionCurrentLineText(line)
@@ -367,19 +371,12 @@ class DocumentEditor(QsciScintilla):
                     if doWhich == "Comment":
                         self.setCursorPosition(line, indent)
                         self.insert(commentSpace)
-                        if cursorIndex is not None and cursorIndex >= indent:
-                            cursorIndex += len(commentSpace)
-                        if line == startLine:
-                            startCol -= len(commentSpace)
-                        if line == endLine:
-                            endCol += len(commentSpace)
-
                     elif doWhich == "Uncomment":
                         for curComment in [commentSpace, comment]:
                             foundText = self.getSelectedCommentText(
                                 line, indent, len(curComment)
                             )
-                            startCol, endCol, cursorIndex, removed = self.removeComment(
+                            startCol, endCol, _, removed = self.removeComment(
                                 foundText,
                                 curComment,
                                 line,
@@ -388,16 +385,20 @@ class DocumentEditor(QsciScintilla):
                                 startCol,
                                 endLine,
                                 endCol,
-                                cursorIndex,
+                                origEndCol,
                             )
                             if removed:
                                 break
 
+            # Adjust columns so selection moves in or out with comment. If startCol
+            # began at 0 keep it there.
+            adjustedStartCol = origStartCol + sel_adjust if origStartCol else 0
+            adjustedendCol = origEndCol + sel_adjust
+
             # restore the currently selected text, or cursor position
-            if cursorLine is not None:
-                startLine, endLine = cursorLine, cursorLine
-                startCol, endCol = cursorIndex, cursorIndex
-            self.setSelection(startLine, startCol, endLine, endCol)
+            self.setSelection(
+                origStartLine, adjustedStartCol, origEndLine, adjustedendCol
+            )
 
     def removeComment(
         self,
@@ -460,11 +461,26 @@ class DocumentEditor(QsciScintilla):
         return lineText
 
     def expandCursorToLineSelection(self):
-        line, index = None, None
-        if not self.hasSelectedText():
-            line, index = self.getCursorPosition()
-            self.setSelection(line, 0, line, self.lineLength(line))
-        return line, index
+        start_line = None
+        start_idx = None
+        end_line = None
+        end_idx = None
+        lineLength = None
+
+        if self.hasSelectedText():
+            start_line, start_idx, end_line, end_idx = self.getSelection()
+        else:
+            start_line, start_idx = self.getCursorPosition()
+            end_line = start_line
+            end_idx = start_idx
+
+        if start_line is not None:
+            # Get lineLength this way instead of self.lineLength (QScintilla) because
+            # that gets confused by \r\n  vs \n , so linked files will behave
+            # incorrectly.
+            lineLength = len(self.text(end_line).rstrip())
+            self.setSelection(start_line, 0, end_line, lineLength)
+        return start_line, start_idx, end_line, end_idx
 
     def copy(self):
         """Copies the selected text.
@@ -861,11 +877,39 @@ class DocumentEditor(QsciScintilla):
 
     def keyPressEvent(self, event):
         key = event.key()
+        modifiers = event.modifiers()
+
+        retPressed = key == Qt.Key.Key_Return
+        altPressed = modifiers == Qt.KeyboardModifier.AltModifier
+        altReturnPressed = altPressed and retPressed
+
         if key == Qt.Key.Key_Backtab:
             self.unindentSelection()
         elif key == Qt.Key.Key_Escape:
             # Using QShortcut for Escape did not seem to work.
             self.showAutoComplete(True)
+        elif altReturnPressed:
+            # If Alt Return pressed, create new unindented line
+
+            # Capture initial autoIndent state, then ensure it's disabled
+            autoIndent = self.autoIndent()
+            self.setAutoIndent(False)
+
+            # Create and send a new KeyEvent, just Return (Cannot just send original
+            # event, it doesn't register.
+            new_event = QKeyEvent(
+                event.type(),
+                Qt.Key.Key_Return,
+                Qt.KeyboardModifier(0),
+                "",
+                event.isAutoRepeat(),
+                event.count(),
+            )
+            QsciScintilla.keyPressEvent(self, new_event)
+
+            # Reset autoIndent property
+            self.setAutoIndent(autoIndent)
+
         else:
             return QsciScintilla.keyPressEvent(self, event)
 

{preditor-1.2.0 → preditor-1.3.0}/preditor/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.2.0'
-__version_tuple__ = version_tuple = (1, 2, 0)
+__version__ = version = '1.3.0'
+__version_tuple__ = version_tuple = (1, 3, 0)
 
-__commit_id__ = commit_id = 'g5a9de95c6'
+__commit_id__ = commit_id = 'gaa3ec1d05'