Optionally visually separate internal preditor code in tracebacks

Author: macevhicz

preditor/gui/console.py

@@ -63,6 +63,8 @@ def __init__(self, parent):
 
         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 @@ def write(self, msg, error=False):
                 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 @@ def write(self, msg, error=False):
             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/gui/loggerwindow.py

@@ -813,6 +813,7 @@ def recordPrefs(self, manual=False):
                 '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(),
@@ -965,6 +966,8 @@ def restorePrefs(self):
         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))

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>