PrEditor 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

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/gui/drag_tab_bar.py

@@ -139,8 +139,11 @@ class DragTabBar(QTabBar):
         """Used by the tab_menu to rename the tab at index `_context_menu_tab`."""
         if self._context_menu_tab != -1:
             current = self.tabText(self._context_menu_tab)
-            msg = 'Rename the {} tab to:'.format(current)
+            msg = 'Rename the {} tab to (new name must be unique):'.format(current)
+
             name, success = QInputDialog.getText(self, 'Rename Tab', msg, text=current)
+            name = self.parent().get_next_available_tab_name(name)
+
             if success:
                 self.setTabText(self._context_menu_tab, name)
 

preditor/gui/group_tab_widget/__init__.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 import os
-import re
 
 from Qt.QtCore import Qt
 from Qt.QtGui import QIcon
@@ -46,6 +45,9 @@ class GroupTabWidget(OneTabWidget):
         self.editor_cls = WorkboxTextEdit
         self.core_name = core_name
         self.setStyleSheet(DEFAULT_STYLE_SHEET)
+
+        self.default_title = 'Group01'
+
         corner = QWidget(self)
         lyt = QHBoxLayout(corner)
         lyt.setSpacing(0)
@@ -69,7 +71,7 @@ class GroupTabWidget(OneTabWidget):
         self.uiCornerBTN = corner
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
-    def add_new_tab(self, group, title="Workbox", group_fmt=None):
+    def add_new_tab(self, group, title=None, prefs=None):
         """Adds a new tab to the requested group, creating the group if the group
         doesn't exist.
 
@@ -80,9 +82,6 @@ class GroupTabWidget(OneTabWidget):
                 If True is passed, then the current group tab is used.
             title (str, optional): The name to give the newly created tab inside
                 the group.
-            group_fmt(str, optional): If None is passed to group, this string is
-                used to search for existing tabs to calculate the last number
-                and generate the new group tab name.
 
         Returns:
             GroupedTabWidget: The tab group for this group.
@@ -90,21 +89,14 @@ class GroupTabWidget(OneTabWidget):
         """
         parent = None
         if not group:
-            if group_fmt is None:
-                group_fmt = r'Group {}'
-            last = 0
-            for i in range(self.count()):
-                match = re.match(group_fmt.format(r'(\d+)'), self.tabText(i))
-                if match:
-                    last = max(last, int(match.group(1)))
-            group = group_fmt.format(last + 1)
+            group = self.get_next_available_tab_name(self.default_title)
         elif group is True:
             group = self.currentIndex()
         if isinstance(group, int):
             group_title = self.tabText(group)
             parent = self.widget(group)
         elif isinstance(group, str):
-            group_title = group
+            group_title = group.replace(" ", "_")
             index = self.index_for_text(group)
             if index != -1:
                 parent = self.widget(index)
@@ -146,7 +138,7 @@ class GroupTabWidget(OneTabWidget):
             self,
             'Close all editors under this tab?',
             'Are you sure you want to close all tabs under the "{}" tab?'.format(
-                self.tabText(self.currentIndex())
+                self.tabText(index)
             ),
             QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
         )
@@ -154,11 +146,11 @@ class GroupTabWidget(OneTabWidget):
             # Clean up all temp files created by this group's editors if they
             # are not using actual saved files.
             tab_widget = self.widget(self.currentIndex())
-            for index in range(tab_widget.count()):
-                editor = tab_widget.widget(index)
+            for editor_index in range(tab_widget.count()):
+                editor = tab_widget.widget(editor_index)
                 editor.__remove_tempfile__()
 
-            super(GroupTabWidget, self).close_tab(self.currentIndex())
+            super(GroupTabWidget, self).close_tab(index)
 
     def current_groups_widget(self):
         """Returns the current widget of the currently selected group or None."""
@@ -166,7 +158,8 @@ class GroupTabWidget(OneTabWidget):
         if editor_tab:
             return editor_tab.currentWidget()
 
-    def default_tab(self, title='Group 1'):
+    def default_tab(self, title=None, prefs=None):
+        title = title or self.default_title
         widget = GroupedTabWidget(
             parent=self,
             editor_kwargs=self.editor_kwargs,
@@ -223,6 +216,8 @@ class GroupTabWidget(OneTabWidget):
             group_name = group['name']
             tab_widget = None
 
+            group_name = self.get_next_available_tab_name(group_name)
+
             for tab in group.get('tabs', []):
                 # Only add this tab if, there is data on disk to load. The user can
                 # open multiple instances of PrEditor using the same prefs. The
@@ -323,3 +318,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/gui/group_tab_widget/grouped_tab_widget.py

@@ -27,7 +27,12 @@ class GroupedTabWidget(OneTabWidget):
         self.uiCornerBTN.released.connect(lambda: self.add_new_editor())
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
-    def add_new_editor(self, title="Workbox"):
+        self.default_title = "Workbox01"
+
+    def add_new_editor(self, title=None, prefs=None):
+        title = title or self.default_title
+
+        title = self.get_next_available_tab_name(title)
         editor, title = self.default_tab(title)
         index = self.addTab(editor, title)
         self.setCurrentIndex(index)
@@ -45,11 +50,18 @@ class GroupedTabWidget(OneTabWidget):
                 self, 'Tab can not be closed.', msg, QMessageBox.StandardButton.Ok
             )
             return
+
+        workbox = self.widget(index)
+        name = workbox.__workbox_name__()
+        msg = (
+            f"Would you like to donate the contents of tab\n{name}\nto the "
+            "/dev/null fund for wayward code?"
+        )
+
         ret = QMessageBox.question(
             self,
             'Donate to the cause?',
-            "Would you like to donate this tabs contents to the /dev/null fund "
-            "for wayward code?",
+            msg,
             QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
         )
         if ret == QMessageBox.StandardButton.Yes:
@@ -59,7 +71,8 @@ class GroupedTabWidget(OneTabWidget):
 
             super(GroupedTabWidget, self).close_tab(index)
 
-    def default_tab(self, title='Workbox'):
+    def default_tab(self, title=None, prefs=None):
+        title = title or self.default_title
         kwargs = self.editor_kwargs if self.editor_kwargs else {}
         editor = self.editor_cls(parent=self, core_name=self.core_name, **kwargs)
         return editor, title
@@ -76,5 +89,14 @@ class GroupedTabWidget(OneTabWidget):
         if hasattr(self.window(), "setWorkboxFontBasedOnConsole"):
             self.window().setWorkboxFontBasedOnConsole()
 
+    def tab_widget(self):
+        """Return the tab widget which contains this group tab
+
+        Returns:
+            self._tab_widget (GroupTabWidget): The tab widget which contains
+                this workbox
+        """
+        return self.parent().parent()
+
     def update_closable_tabs(self):
         self.setTabsClosable(self.count() != 1)

preditor/gui/group_tab_widget/one_tab_widget.py

@@ -1,7 +1,11 @@
 from __future__ import absolute_import
 
+import re
+
 from Qt.QtWidgets import QTabWidget
 
+TAB_ITERATION_PATTERN = re.compile(r"(\d+)(?!.*\d)")
+
 
 class OneTabWidget(QTabWidget):
     """A QTabWidget that shows the close button only if there is more than one
@@ -17,6 +21,44 @@ class OneTabWidget(QTabWidget):
         super(OneTabWidget, self).__init__(*args, **kwargs)
         self.tabCloseRequested.connect(self.close_tab)
 
+    def get_next_available_tab_name(self, name):
+        """Get the next available tab name, incrementing an iteration if needed.
+
+        Args:
+            name (str): The desired name
+
+        Returns:
+            name (str): The name, or updated name if needed
+        """
+        name = name.replace(" ", "_")
+
+        existing_names = [self.tabText(i) for i in range(self.count())]
+
+        # Use regex to find the last set of digits. If found, the base name is
+        # a slice of name minus the digits string. Otherwise, the base name is
+        # the full name and iteration is zero.
+        match = TAB_ITERATION_PATTERN.search(name)
+        if match:
+            # We found trailing digits, so slice to get base name, and convert
+            # iteration to int
+            iter_str = match.group()
+            base = name[: -len(iter_str)]
+            iteration = int(iter_str)
+        else:
+            # No trailing digits found, so base name is full name and iteration
+            # is zero.
+            base = name
+            iteration = 0
+
+        if name in existing_names:
+            for _ in range(99):
+                iteration += 1
+                new_iter_str = str(iteration).zfill(2)
+                name = base + new_iter_str
+                if name not in existing_names:
+                    break
+        return name
+
     def addTab(self, *args, **kwargs):  # noqa: N802
         ret = super(OneTabWidget, self).addTab(*args, **kwargs)
         self.update_closable_tabs()

preditor/gui/logger_window_plugin.py

@@ -13,6 +13,9 @@ class LoggerWindowPlugin:
     def __init__(self, parent):
         self.parent = parent
 
+    def updateWindowTitle(self, title):
+        return title
+
     def record_prefs(self, name):
         """Returns any prefs to save with the PrEditor's preferences.
 

preditor/gui/loggerwindow.py

@@ -48,6 +48,7 @@ from .completer import CompleterMode
 from .level_buttons import LoggingLevelButton
 from .set_text_editor_path_dialog import SetTextEditorPathDialog
 from .status_label import StatusLabel
+from .workbox_mixin import WorkboxName
 
 logger = logging.getLogger(__name__)
 
@@ -59,31 +60,6 @@ class WorkboxPages:
     Workboxes = 1
 
 
-class WorkboxName(str):
-    """The joined name of a workbox `group/workbox` with access to its parts.
-
-    This subclass provides properties for the group and workbox values separately.
-    """
-
-    def __new__(cls, group, workbox):
-        txt = "/".join((group, workbox))
-        ret = super().__new__(cls, txt)
-        # Preserve the imitable nature of str's by using properties without setters.
-        ret._group = group
-        ret._workbox = workbox
-        return ret
-
-    @property
-    def group(self):
-        """The tab name of the group tab that contains the workbox."""
-        return self._group
-
-    @property
-    def workbox(self):
-        """The workbox of the tab for this workbox inside of the group."""
-        return self._workbox
-
-
 class LoggerWindow(Window):
     _instance = None
     styleSheetChanged = Signal(str)
@@ -93,9 +69,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.
@@ -292,10 +266,9 @@ class LoggerWindow(Window):
 
         self.dont_ask_again = []
 
-        # Load any plugins that modify the LoggerWindow
-        self.plugins = {}
-        for name, plugin in plugins.loggerwindow():
-            self.plugins[name] = plugin(self)
+        # Load any plugins, and set window title
+        self.loadPlugins()
+        self.setWindowTitle(self.defineWindowTitle())
 
         self.restorePrefs()
 
@@ -308,17 +281,6 @@ class LoggerWindow(Window):
             action.triggered.connect(partial(self.setStyleSheet, style_name))
 
         self.uiConsoleTOOLBAR.show()
-        loggerName = QApplication.instance().translate(
-            'PrEditorWindow', DEFAULT_CORE_NAME
-        )
-        self.setWindowTitle(
-            '{} - {} - {} {}-bit'.format(
-                loggerName,
-                self.name,
-                '{}.{}.{}'.format(*sys.version_info[:3]),
-                osystem.getPointerSize(),
-            )
-        )
 
         self.setWorkboxFontBasedOnConsole()
         self.setEditorChooserFontBasedOnConsole()
@@ -359,6 +321,29 @@ class LoggerWindow(Window):
 
         self.update_workbox_stack()
 
+    def loadPlugins(self):
+        """Load any plugins that modify the LoggerWindow."""
+        self.plugins = {}
+        for name, plugin in plugins.loggerwindow():
+            if name not in self.plugins:
+                self.plugins[name] = plugin(self)
+
+    def defineWindowTitle(self):
+        """Define the window title, including and info plugins may add."""
+
+        # Define the title
+        loggerName = QApplication.instance().translate(
+            'PrEditorWindow', DEFAULT_CORE_NAME
+        )
+        pyVersion = '{}.{}.{}'.format(*sys.version_info[:3])
+        size = osystem.getPointerSize()
+        title = f"{loggerName} - {self.name} - {pyVersion} {size}-bit"
+
+        # Add any info plugins may add to title
+        for _name, plugin in self.plugins.items():
+            title = plugin.updateWindowTitle(title)
+        return title
+
     def comment_toggle(self):
         self.current_workbox().__comment_toggle__()
 
@@ -815,6 +800,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 +953,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 +1029,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/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/gui/workbox_mixin.py

@@ -12,6 +12,44 @@ from Qt.QtWidgets import QStackedWidget
 from ..prefs import prefs_path
 
 
+class WorkboxName(str):
+    """The joined name of a workbox `group/workbox` with access to its parts.
+
+    You may pass the group, workbox, or the fully formed workbox name:
+        examples:
+            workboxName = WorkboxName("Group01", "Workbox05")
+            workboxName = WorkboxName("Group01/Workbox05")
+    This subclass provides properties for the group and workbox values separately.
+    """
+
+    def __new__(cls, name, sub_name=None):
+        if sub_name is not None:
+            txt = "/".join((name, sub_name))
+        else:
+            txt = name
+            try:
+                name, sub_name = txt.split("/")
+            except ValueError:
+                msg = "A fully formed name, or a group and name, must be passed in."
+                raise ValueError(msg) from None
+
+        ret = super().__new__(cls, txt)
+        # Preserve the imitable nature of str's by using properties without setters.
+        ret._group = name
+        ret._workbox = sub_name
+        return ret
+
+    @property
+    def group(self):
+        """The tab name of the group tab that contains the workbox."""
+        return self._group
+
+    @property
+    def workbox(self):
+        """The workbox of the tab for this workbox inside of the group."""
+        return self._workbox
+
+
 class WorkboxMixin(object):
     _warning_text = None
     """When a user is picking this Workbox class, show a warning with this text."""
@@ -26,6 +64,16 @@ class WorkboxMixin(object):
         self._tempfile = tempfile
         self.core_name = core_name
 
+        self._tab_widget = parent
+
+    def __tab_widget__(self):
+        """Return the tab widget which contains this workbox
+
+        Returns:
+            GroupedTabWidget: The tab widget which contains this workbox
+        """
+        return self._tab_widget
+
     def __auto_complete_enabled__(self):
         raise NotImplementedError("Mixin method not overridden.")
 
@@ -84,8 +132,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,13 +193,63 @@ 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:
             return '<{}>'.format(title)
         else:
-            return '<{}>:{},{}'.format(title, group, editor)
+            name = self.__workbox_name__()
+            return '<{}>:{}'.format(title, name)
+
+    def __workbox_name__(self, workbox=None):
+        """Returns the name for this workbox or a given workbox.
+        The name is the group tab text and the workbox tab text joined by a `/`"""
+        workboxTAB = self.window().uiWorkboxTAB
+        group_name = None
+        workbox_name = None
+
+        if workbox:
+            grouped_tab_widget = workbox.__tab_widget__()
+            for group_idx in range(workboxTAB.count()):
+                # If a previous iteration determine workbox_name, bust out
+                if workbox_name:
+                    break
+                # Check if current group is the workboxes parent group
+                cur_group_widget = workboxTAB.widget(group_idx)
+                if cur_group_widget == grouped_tab_widget:
+                    group_name = workboxTAB.tabText(group_idx)
+
+                    # Found the group, now find workbox
+                    for workbox_idx in range(cur_group_widget.count()):
+                        cur_workbox_widget = cur_group_widget.widget(workbox_idx)
+                        if cur_workbox_widget == workbox:
+                            workbox_name = cur_group_widget.tabText(workbox_idx)
+                            break
+        else:
+            grouped = self.__tab_widget__()
+            groupedTabBar = grouped.tabBar()
+
+            idx = -1
+            for idx in range(grouped.count()):
+                if grouped.widget(idx) == self:
+                    break
+            workbox_name = groupedTabBar.tabText(idx)
+
+            group = grouped.tab_widget()
+            groupTabBar = group.tabBar()
+            idx = -1
+            for idx in range(group.count()):
+                if group.widget(idx) == grouped:
+                    break
+            group_name = groupTabBar.tabText(idx)
+
+        # If both found, construct workbox name
+        if group_name and workbox_name:
+            name = WorkboxName(group_name, workbox_name)
+        else:
+            name = WorkboxName("", "")
+        return name
 
     def __goto_line__(self, line):
         raise NotImplementedError("Mixin method not overridden.")

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/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/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/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.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)
 
-__commit_id__ = commit_id = 'g5a9de95c6'
+__commit_id__ = commit_id = 'g79cb36c80'

{preditor-1.2.0.dist-info → preditor-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 1.2.0
+Version: 1.4.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.dist-info → preditor-1.4.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ preditor/plugins.py,sha256=RAeyvdZxQsZY313ae5aAhahqpjuhaXJzDxPyLcR-09U,4401
 preditor/prefs.py,sha256=BPtSsdv2yuiRpIaqEml9fxlVYKHNfqQ77hp5YIQRDBg,2172
 preditor/settings.py,sha256=DV9_DbJorEnhdIvW15E7h7PswlQUsy0UlA8bXUYN0og,2206
 preditor/streamhandler_helper.py,sha256=kiU6T9WqJ3JKTTKCa7IUU8brwK7zO5UUpEzLhEfKe44,1788
-preditor/version.py,sha256=zHRWUFacu0mfM24GYuT-vIcPzFr12VT8INArUatU4D0,712
+preditor/version.py,sha256=6vbYTZLusVDz8j8nBu2-Zv-MBvhlzKtADFBJuoWUprg,712
 preditor/weakref.py,sha256=b--KomFAHcMWr3DEAIN2j3XxRhjDWKw0WABXyn1nxDg,12177
 preditor/cores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/cores/core.py,sha256=mdVXlEPDh8kIdOpMDqi8P1VaqfVvyu5cXBq_toONcaM,586
@@ -32,35 +32,35 @@ preditor/gui/__init__.py,sha256=DeOH5K4_M0YLNx1i7NRvwCgwjyjkre4vVwlr5OEMx9Q,3423
 preditor/gui/app.py,sha256=EhVsVMr5C5WSKNDlxGawzg-3lbTJxDMLi2fPomECacM,5869
 preditor/gui/codehighlighter.py,sha256=wUOgLDhcAQf72DSS65r9_RYdv6PVJwWFXTdOPvvps_A,6790
 preditor/gui/completer.py,sha256=U2FBJA_ceFq_viGqPogncH-6vhrtTcpxAF61SUnaOJ8,7813
-preditor/gui/console.py,sha256=S4JZz5rkjLKhA5YYXXs6bx_C56BBlVENccnW2DnTeL0,35791
+preditor/gui/console.py,sha256=BEvEU7yjjn1kz1BF9T7JlqXpLCP7pI5nP6Rbdh2P-os,36476
 preditor/gui/dialog.py,sha256=fasmBDhN-B6uretbSQ3x1SxImsQLSKIMw4PC9B8BimI,6535
-preditor/gui/drag_tab_bar.py,sha256=_TFLRyodO5e16R8DNGQjPAwrGk2SBnqtj4Bn8mxr0HI,8018
+preditor/gui/drag_tab_bar.py,sha256=EgEXdV4odNj_1_YiGP2kmpGKUaBPe75JTwudU8Xj-Gw,8113
 preditor/gui/editor_chooser.py,sha256=lv1eY0UJOulX1l-P-ZQEoneYz6BNX2VkXEbg3GUu1ag,1991
 preditor/gui/errordialog.py,sha256=cRtQ-l40kvQ9awRDqAjetwT8S4oD1iztPbEEly7GYBU,2075
 preditor/gui/find_files.py,sha256=TtsjHXKWvwKrxHYZryB_NPANoFpMRlAxWJp1hA6Ny2I,4360
 preditor/gui/level_buttons.py,sha256=h0pMMzp-ElwcN_qfR4EBQtXn1C666KVcnR9dMoixD3E,12597
 preditor/gui/logger_window_handler.py,sha256=43-DxzuNJq6UV6Ofc4TKRt179Sf5AxDkVDGrtq_Knok,1571
-preditor/gui/logger_window_plugin.py,sha256=x6mTuS6gmeMZtV0UIXHXIif1_B5oKVbJhuIBaW0BFVs,1210
-preditor/gui/loggerwindow.py,sha256=gGntieiZ2GdNY99CXNrldrv5abYzfSWYk-HdIVb3sYM,54378
+preditor/gui/logger_window_plugin.py,sha256=Lj9Q8L82GjzZ21ZI5W0FCHhrPHNALIunT_C9ua15l2w,1272
+preditor/gui/loggerwindow.py,sha256=u0FLCfS5NM8r31PJE0D-iLiq5j40hw46q8elIqnDDOM,54458
 preditor/gui/newtabwidget.py,sha256=5aCWn9xAl5h1oZACqVuEsOAbzKTS2RegrLI41gROC8A,1971
 preditor/gui/set_text_editor_path_dialog.py,sha256=bn8IeQHXPSU4PLYXQmSxKB1V8iuJaI1PA5aDJNgxXks,2292
 preditor/gui/status_label.py,sha256=SlNRmPc28S4E2OFVmErv0DmZstk4011Q_7uLp43SF0A,3320
 preditor/gui/suggest_path_quotes_dialog.py,sha256=QUJf_9hs8wOO6bFOr8_Z2xnNhSA8TfKFMOzheUqUDnY,1822
 preditor/gui/window.py,sha256=6Ztjqb0Xfh8DsI7hBF4Rg-4-gWPZKTV4GRJiz3V8O6Q,5904
-preditor/gui/workbox_mixin.py,sha256=uvLqbcdPOAL23kCz3Bnm1zOZ5PjXEUR9WEr-yE5iaTA,14990
-preditor/gui/workbox_text_edit.py,sha256=shOeQSo3OdDnxig0xLiGZOcwwiR6fUkKLPlx2PejH40,4475
-preditor/gui/workboxwidget.py,sha256=Dp81l3sFFUhmm8NZj-RTNbp4Up9fjTXb8arH0WWtjs4,10316
+preditor/gui/workbox_mixin.py,sha256=s_JTCmR-_ZXcAuQ-jKsw_DQh08IAFr3SJONYE5bQRP8,18556
+preditor/gui/workbox_text_edit.py,sha256=wrJcGqIJ2-5BqEcP_qVKNlWUD8Geo8IxrIXncnDG6yw,4472
+preditor/gui/workboxwidget.py,sha256=7m2QzuOfoTuB2H9mODnwZ1npX0zI_1bjeQp3_Lh990s,10588
 preditor/gui/fuzzy_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/gui/fuzzy_search/fuzzy_search.py,sha256=zohr6oAE99FZFlLjqKZajBrdyJIYLW96rcCOy5Bn1i0,3714
-preditor/gui/group_tab_widget/__init__.py,sha256=3C2wAdD8XrXYGetjOL9lIoNhcQf5AP-QfXgMAvqRJMg,13037
+preditor/gui/group_tab_widget/__init__.py,sha256=EalGlpDcinbI6WdwmG7BK94519rUHfzxA0qez-o4m6k,13637
 preditor/gui/group_tab_widget/grouped_tab_menu.py,sha256=lopd3mjHJIE_5xLdlZL0ghuBzsYo36vO1OZE6L6tqbI,1288
 preditor/gui/group_tab_widget/grouped_tab_models.py,sha256=duwEdtbvsJ1nPKFakrnY8QuCoBx4M7mOpB0_0Nrm6_Y,4027
-preditor/gui/group_tab_widget/grouped_tab_widget.py,sha256=Z8SXWN3-Ukl7cwambNwX4Gb2uKBDsVM-EG9Z6W7ICts,3025
-preditor/gui/group_tab_widget/one_tab_widget.py,sha256=PdZAXjmV9oTHakh8aFYRlLnfwcoT459vQWVKgpZZx4Y,1971
+preditor/gui/group_tab_widget/grouped_tab_widget.py,sha256=zIKr2oh_TgGokWmAFDIeyw6touH6vRo3N1MCnOyJQRM,3624
+preditor/gui/group_tab_widget/one_tab_widget.py,sha256=XHIgZwO4g0jtY6rJExB7389vhuLJeKg9HwZnDM1V66k,3383
 preditor/gui/ui/editor_chooser.ui,sha256=cYSVHK0A4-zst6JyDkrBZK9qcAontbhV4Mmnw5ps72E,2736
 preditor/gui/ui/errordialog.ui,sha256=i7cVc28FPxA_b4Xa58W_xmRJ_1GFb5rgtUhR_gZcf4E,1831
 preditor/gui/ui/find_files.ui,sha256=8mdD3Vg3ofRMChdKntxiDHO3JXHQSKjjY6OLY_1W5lc,3328
-preditor/gui/ui/loggerwindow.ui,sha256=r3L46h3YNLiQ1dPvWY24D5Zqrd2X2x5Zs6jMjDTDDyg,31279
+preditor/gui/ui/loggerwindow.ui,sha256=dkfn2qY9nZeX7-7p9CMZh5W2Y83Tirn1ZeFAXjisquU,31580
 preditor/gui/ui/set_text_editor_path_dialog.ui,sha256=VLBpTvGneXAi9RX1dRd6oPwKoZhQ_m5HO1j1qXPhTxc,5201
 preditor/gui/ui/suggest_path_quotes_dialog.ui,sha256=0hcr7kEFmmMVEp7vv18mDpvWZ0zOrojlkTLhIWCFKww,5923
 preditor/resource/environment_variables.html,sha256=-uWicgOkour-sxtY-crrjMiLMyJzAzshwUXKqSm6TmI,3134
@@ -116,7 +116,7 @@ preditor/resource/lang/python.json,sha256=CXiQh0jcgd-OCrM-s9IF7s4o-g5WRA4vDaAyTR
 preditor/resource/stylesheet/Bright.css,sha256=SfnPRBqfqEL4IF8RGt9PpLX_cSiGpfG9Q2hE1F9uTsk,2480
 preditor/resource/stylesheet/Dark.css,sha256=Sige7beBhRyfav9_mXvn-LhksxbX0_WEgpZSKhmPavc,5384
 preditor/scintilla/__init__.py,sha256=IDndbcS8KW1TMcQTA1Vd-LzcdsNtOUfyldnjkKae0yw,956
-preditor/scintilla/documenteditor.py,sha256=j9ZAAyYZwPZbI0hW5ou76aIpaFzvzukAT9l8KLY9s1o,79927
+preditor/scintilla/documenteditor.py,sha256=9DyZBNPD59W1x8CGFHhxlgf9WTHi6ni7EIlyL7aMnIM,81477
 preditor/scintilla/finddialog.py,sha256=WxNVvkCfXrw_8E3-7tS1DIS9H1-ioLASDgIbniDxz3g,2376
 preditor/scintilla/delayables/__init__.py,sha256=lj9tMc3IL2QeaN858Ixt_n7clJngbKqG2sk66vIcFcQ,275
 preditor/scintilla/delayables/smart_highlight.py,sha256=5emI4StsQCIYizoFsib1rdw0gnUarV9TQ6CwxmzXXpU,3623
@@ -157,11 +157,11 @@ preditor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/utils/cute.py,sha256=tLTChQ1-zMzHHaKpG85u4FbtJl_2R1E8-uckpOQbEEM,1057
 preditor/utils/stylesheets.py,sha256=EVWZNq3WnaRiyUPoYMKQo_dLEwbRyKu26b03I1JDA-s,1622
 preditor/utils/text_search.py,sha256=21kuSDTpLIPUcriB81WP1kWfzuDBuP13ZtHUtypP5jE,14218
-preditor-1.2.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+preditor-1.4.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 tests/find_files/test_find_files.py,sha256=ETVe1tC666uTc_5pPhjzPCaMrMkYUB8iKGXDfW9usgI,2722
 tests/ide/test_delayable_engine.py,sha256=Nv6SQXpwIdfgRbEOsEcR-7jhjZ6E0THPdwDoPvAM6y4,5948
-preditor-1.2.0.dist-info/METADATA,sha256=mrSA7IThDujGF3AhzzJ0OluiwMayoDbvO9qRgfjHll0,12744
-preditor-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-preditor-1.2.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
-preditor-1.2.0.dist-info/top_level.txt,sha256=dZSBDecBQovRyqbFdvwk1AvMon636dJ14vr9ov1LSPs,20
-preditor-1.2.0.dist-info/RECORD,,
+preditor-1.4.0.dist-info/METADATA,sha256=zA-ZtzJ0KNl6-ufO_quM7e2eyxPAF0xkaUaWRpQHoio,12744
+preditor-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+preditor-1.4.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
+preditor-1.4.0.dist-info/top_level.txt,sha256=dZSBDecBQovRyqbFdvwk1AvMon636dJ14vr9ov1LSPs,20
+preditor-1.4.0.dist-info/RECORD,,