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

preditor/scintilla/lexers/javascriptlexer.py

@@ -1,11 +1,13 @@
 from __future__ import absolute_import
 
-from PyQt5.Qsci import QsciLexerJavaScript
 from Qt.QtGui import QColor
 
+from .. import Qsci
 
-class JavaScriptLexer(QsciLexerJavaScript):
-    # Items in this list will be highlighted using the color for self.KeywordSet2
+
+class JavaScriptLexer(Qsci.QsciLexerJavaScript):
+    # Items in this list will be highlighted using the color for
+    # `Qsci.QsciLexerJavaScript.KeywordSet2`
     highlightedKeywords = ''
 
     def defaultFont(self, index):
@@ -13,7 +15,7 @@ class JavaScriptLexer(QsciLexerJavaScript):
         return self.font(0)
 
     def defaultPaper(self, style):
-        if style == self.KeywordSet2:
+        if style == Qsci.QsciLexerJavaScript.KeywordSet2:
             # Set the highlight color for this lexer
             return QColor(155, 255, 155)
         return super(JavaScriptLexer, self).defaultPaper(style)

preditor/scintilla/lexers/maxscriptlexer.py

@@ -4,7 +4,8 @@ import re
 from builtins import str as text
 
 from future.utils import iteritems
-from PyQt5.Qsci import QsciLexerCustom, QsciScintilla
+
+from .. import Qsci, QsciScintilla
 
 MS_KEYWORDS = """
 if then else not and or key collect
@@ -17,12 +18,12 @@ filein open close flush include print
 """
 
 
-class MaxscriptLexer(QsciLexerCustom):
+class MaxscriptLexer(Qsci.QsciLexerCustom):
     # Items in this list will be highligheded using the color for self.SmartHighlight
     highlightedKeywords = ''
 
     def __init__(self, parent=None):
-        QsciLexerCustom.__init__(self, parent)
+        super(MaxscriptLexer, self).__init__(parent)
         self._styles = {
             0: 'Default',
             1: 'Comment',
@@ -48,15 +49,15 @@ class MaxscriptLexer(QsciLexerCustom):
             return QColor(40, 160, 40)
 
         elif style in (self.Keyword, self.Operator):
-            return QColor(Qt.blue)
+            return QColor(Qt.GlobalColor.blue)
 
         elif style == self.Number:
-            return QColor(Qt.red)
+            return QColor(Qt.GlobalColor.red)
 
         elif style == self.String:
             return QColor(180, 140, 30)
 
-        return QsciLexerCustom.defaultColor(self, style)
+        return super(MaxscriptLexer, self).defaultColor(style)
 
     def defaultPaper(self, style):
         if style == self.SmartHighlight:
@@ -77,7 +78,7 @@ class MaxscriptLexer(QsciLexerCustom):
             return MS_KEYWORDS
         if style == self.SmartHighlight:
             return self.highlightedKeywords
-        return QsciLexerCustom.keywords(self, style)
+        return super(MaxscriptLexer, self).keywords(style)
 
     def processChunk(self, chunk, lastState, keywords):
         # process the length of the chunk

preditor/scintilla/lexers/mellexer.py

@@ -2,9 +2,10 @@ from __future__ import absolute_import
 
 import re
 
-from PyQt5.Qsci import QsciLexerCPP
 from Qt.QtGui import QColor
 
+from .. import Qsci
+
 MEL_SYNTAX = """and array as case catch continue do else exit float for from global if
 in int local not of off on or proc random return select string then throw to try vector
 when where while with true false
@@ -310,7 +311,7 @@ xgmWrapXGen xgmr xpmPicker
 """
 
 
-class MelLexer(QsciLexerCPP):
+class MelLexer(Qsci.QsciLexerCPP):
     # Items in this list will be highlighted using the color for self.GlobalClass
     _highlightedKeywords = ''
     # Mel uses $varName for variables, so we have to allow them in words

preditor/scintilla/lexers/mulexer.py

@@ -1,14 +1,15 @@
 from __future__ import absolute_import
 
-from PyQt5.Qsci import QsciLexerCPP
 from Qt.QtGui import QColor
 
+from .. import Qsci
+
 MU_KEYWORDS = """
 method string Color use require module for_each let global function nil void
 """
 
 
-class MuLexer(QsciLexerCPP):
+class MuLexer(Qsci.QsciLexerCPP):
     # Items in this list will be highlighted using the color for self.KeywordSet2
     highlightedKeywords = ''
 

preditor/scintilla/lexers/pythonlexer.py

@@ -1,22 +1,23 @@
 from __future__ import absolute_import
 
-from PyQt5.Qsci import QsciLexerPython
 from Qt.QtGui import QColor
 
+from .. import Qsci
 
-class PythonLexer(QsciLexerPython):
-    # Items in this list will be highlighted using the color for
-    # self.HighlightedIdentifier
+
+class PythonLexer(Qsci.QsciLexerPython):
+    # Items in this list will be highlighted using the color
+    # for Qsci.QsciLexerPython.HighlightedIdentifier.
     highlightedKeywords = ''
 
     def __init__(self, *args):
         super(PythonLexer, self).__init__(*args)
 
         # set the indentation warning
-        self.setIndentationWarning(self.Inconsistent)
+        self.setIndentationWarning(Qsci.QsciLexerPython.IndentationWarning.Inconsistent)
 
     def defaultPaper(self, style):
-        if style == self.HighlightedIdentifier:
+        if style == Qsci.QsciLexerPython.HighlightedIdentifier:
             # Set the highlight color for this lexer
             return QColor(155, 255, 155)
         return super(PythonLexer, self).defaultPaper(style)

preditor/utils/cute.py

@@ -7,19 +7,20 @@ from Qt.QtWidgets import QApplication
 def ensureWindowIsVisible(widget):
     """
     Checks the widget's geometry against all of the system's screens. If it does
-    not intersect it will reposition it to the top left corner of the highest
-    numbered desktop.  Returns a boolean indicating if it had to move the
-    widget.
+    not intersect, it will reposition it to the top left corner of the highest
+    numbered screen. Returns a boolean indicating if it had to move the widget.
     """
-    desktop = QApplication.desktop()
+    screens = QApplication.screens()
     geo = widget.geometry()
-    for screen in range(desktop.screenCount()):
-        monGeo = desktop.screenGeometry(screen)
-        if monGeo.intersects(geo):
+
+    for screen in screens:
+        if screen.geometry().intersects(geo):
             break
     else:
+        monGeo = screens[-1].geometry()  # Use the last screen available
         geo.moveTo(monGeo.x() + 7, monGeo.y() + 30)
-        # setting the geometry may trigger a second check if setGeometry is overridden
+
+        # Setting the geometry may trigger a second check if setGeometry is overridden
         disable = hasattr(widget, 'checkScreenGeo') and widget.checkScreenGeo
         if disable:
             widget.checkScreenGeo = False

preditor/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.1.0'
-__version_tuple__ = version_tuple = (1, 1, 0)
+__version__ = version = '1.2.0'
+__version_tuple__ = version_tuple = (1, 2, 0)
+
+__commit_id__ = commit_id = 'g5a9de95c6'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 1.1.0
+Version: 1.2.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0
@@ -10,7 +10,6 @@ Project-URL: Tracker, https://github.com/blurstudio/PrEditor/issues
 Platform: any
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -19,11 +18,12 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Qt.py
+Requires-Dist: chardet
 Requires-Dist: configparser>=4.0.2
 Requires-Dist: future>=0.18.2
-Requires-Dist: signalslot>=0.1.2
 Requires-Dist: importlib-metadata>=4.8.3
+Requires-Dist: Qt.py>=1.4.4
+Requires-Dist: signalslot>=0.1.2
 Provides-Extra: cli
 Requires-Dist: click>=7.1.2; extra == "cli"
 Requires-Dist: click-default-group; extra == "cli"
@@ -38,6 +38,10 @@ Requires-Dist: Flake8-pyproject; extra == "dev"
 Requires-Dist: pep8-naming; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: tox; extra == "dev"
+Provides-Extra: qsci5
+Requires-Dist: QScintilla; extra == "qsci5"
+Provides-Extra: qsci6
+Requires-Dist: PyQt6-QScintilla; extra == "qsci6"
 Provides-Extra: shortcut
 Requires-Dist: casement>=0.1.0; platform_system == "Windows" and extra == "shortcut"
 Dynamic: license-file
@@ -141,13 +145,13 @@ a better `parent_callback`.
 ## Installing Qt
 
 PrEditor is built on Qt, but uses [Qt.py](https://github.com/mottosso/Qt.py) so
-you can choose to use PySide2 or PyQt5. We have elected to not directly depend
-on either of these packages as if you want to use PrEditor inside of a an existing
-application like Maya or Houdini, they already come with PySide2 installed. If
-you are using it externally, add them to your pip install command.
+you can choose to use PySide6, PySide2, PyQt6 or PyQt5. We have elected to not
+directly depend on either of these packages so that you can use PrEditor inside
+of existing applications like Maya or Houdini that already come with PySide
+installed. If you are using it externally add them to your pip install command.
 
-- PySide2: `pip install preditor PySide2`
-- PyQt5: `pip install preditor PyQt5`
+- PySide6: `pip install preditor PySide6`
+- PyQt6: `pip install preditor PyQt6`
 
 ## Cli
 
@@ -169,35 +173,68 @@ this is only useful for windows.
 ## QScintilla workbox
 
 The more mature QScintilla workbox requires a few extra dependencies that must
-be passed manually. It hasn't been added to `extras_require` because we plan to
-split it into its own pip module due to it requiring PyQt5 which is a little hard
-to get working inside of DCC's that ship with PySide2 by default. Here is the
-python 3 pip install command.
+be passed manually. We have added it as pip `optional-dependencies`. QScintilla
+only works with PyQt5/6 and it is a little hard to get PyQt working inside of
+DCC's that ship with PySide2/6 by default. Here is the python 3 pip install command.
 
-- `pip install preditor PyQt5, QScintilla>=2.11.4 aspell-python-py3`
+- PyQt6: `pip install preditor[qsci6] PyQt6, aspell-python-py3`
+- PyQt5: `pip install preditor[qsci5] PyQt5, aspell-python-py3`
 
 The aspell-python-py3 requirement is optional to enable spell check.
 
+You may need to set the `QT_PREFERRED_BINDING` or `QT_PREFERRED_BINDING_JSON`
+[environment variable](https://github.com/mottosso/Qt.py?tab=readme-ov-file#override-preferred-choice) to ensure that PrEditor can use PyQt5/PyQt6.
 
 # DCC Integration
 
-## Maya
-
-PrEditor is pre-setup to use as a Maya module. To use it, create a virtualenv
-with the same python as maya, or install it using mayapy.
-
-```
-virtualenv venv_preditor
-venv_preditor\Scripts\activate
-pip install PrEditor
-set MAYA_MODULE_PATH=c:\path\to\venv_preditor\Lib\site-packages\preditor\dccs
-```
-Note: Due to how maya .mod files works if you are using development installs you
-can't use pip editable installs. This is due to the relative path used
-`PYTHONPATH +:= ../..` in `PrEditor_maya.mod`. You can modify that to use a hard
-coded file path for testing, or add a second .mod file to add the virtualenv's
-`site-packages` file path as a hard coded file path.
-
+Here are several example integrations for DCC's included in PrEditor. These
+require some setup to manage installing all pip requirements. These will require
+you to follow the [Setup](#setup) instructions below.
+
+- [Maya](/preditor/dccs/maya/README.md)
+- [3ds Max](/preditor/dccs/studiomax/README.md)
+
+If you are using hab, you can simply add the path to the [preditor](/preditor) folder to your site's `distro_paths`. [See .hab.json](/preditor/dccs/.hab.json)
+
+## Setup
+
+PrEditor has many python pip requirements. The easiest way to get access to all
+of them inside an DCC is to create a virtualenv and pip install the requirements.
+You can possibly use the python included with DCC(mayapy), but this guide covers
+using a system install of python.
+
+1. Identify the minor version of python that the dcc is using. Running `sys.version_info[:2]` in the DCC returns the major and minor version of python.
+2. Download and install the required version of python. Note, you likely only need to match the major and minor version of python(3.11 not 3.11.12). It's recommended that you don't use the windows store to install python as it has had issues when used to create virtualenvs.
+3. Create a virtualenv using that version of python. On windows you can use `py.exe -3.11` or call the correct python.exe file. Change `-3.11` to match the major and minor version returned by step 1. Note that you should create separate venvs for a given python minor version and potentially for minor versions of Qt if you are using PyQt.
+    ```batch
+    cd c:\path\to\venv\parent
+    py -3.11 -m virtualenv preditor_311
+    ```
+4. Use the newly created pip exe to install PrEditor and its dependencies.
+    * This example shows using PySide and the simple TextEdit workbox in a minimal configuration.
+        ```batch
+        c:\path\to\venv\parent\preditor_311\Scripts\pip install PrEditor
+        ```
+    * This example shows using QScintilla in PyQt6 for a better editing experience. Note that you need to match the PyQt version used by the DCC, This may require matching the exact version of PyQt.
+        ```batch
+        c:\path\to\venv\parent\preditor_311\Scripts\pip install PrEditor[qsci6] PyQt6==6.5.3
+        ```
+
+### Editable install
+
+You should skip this section unless you want to develop PrEditor's code from an git repo using python's editable pip install.
+
+Due to how editable installs work you will need to set an environment variable
+specifying the site-packages directory of the virtualenv you created in the
+previous step. On windows this should be the `lib\site-packages` folder inside
+of the venv you just created. Store this in the `PREDITOR_SITE`, this can be done
+permanently or temporarily(via `set "PREDITOR_SITE=c:\path\to\venv\parent\preditor_311\lib\site-packages"`).
+
+This is required because you are going to use the path to your git repo's preditor
+folder in the module/plugin loading methods for the the DCC you are using, but
+there is no way to automatically find the virtualenv that your random git repo
+is installed in. In fact, you may have have your git repo installed into multiple
+virtualenvs at once.
 
 # Plugins
 

{preditor-1.1.0.dist-info → preditor-1.2.0.dist-info}/RECORD

@@ -1,54 +1,61 @@
-preditor/__init__.py,sha256=OJO0Gsh74_OA6lS_q3tgIh2zLS8lr7fzTk0kyCqnz2k,12163
+preditor/__init__.py,sha256=5_8lpwEYbDRsfvTQ3otpseNVCHlJRAR10e2N9rQhAIo,12209
 preditor/__main__.py,sha256=boRVSmxX6eF8EkzbePtCZbzdcaPseqVae4RPPLp3U1A,449
-preditor/about_module.py,sha256=rz1B3vL93AfJsAk_dnqSsDXcBYZJUf4lAdwUYAfwMwU,5085
+preditor/about_module.py,sha256=_jhd2vaWArnnw2qvsZtOSQvntec9PG_PCiSFbcS1j_I,5347
 preditor/cli.py,sha256=kyVr0V43KYSMLIEWXH54CA0ByFmPcpbFF-8cli6PVow,5300
 preditor/config.py,sha256=DTDqJ8cVnbvAE8IytAREMV7HJS2b3DLH1jtFIkdTo8c,11883
 preditor/contexts.py,sha256=xxRbOFORsvlG___EuSiKuT1aiKJvnkFojFZFZE0HPNk,5147
-preditor/debug.py,sha256=lXSdjWjThAuie8WC-B6wZHppDxsBeftJs-LaAMr5l48,4535
+preditor/debug.py,sha256=uhgJdCV7UI25lYP0E6jXaDl_hjHTOhDQ9_qWJmOv3tk,4613
 preditor/enum.py,sha256=snG5V259dH9SI1kwBqZeZdhat36F1iAmIjYErosnDUg,23489
-preditor/excepthooks.py,sha256=DUolMjQxOIqX9czYQfQ4WqSjMIH5VP9ZcaFoI0LRky4,5126
-preditor/logging_config.py,sha256=aCqBhnHhcTigpR7neVEPbx4Vc_3ADpiqaBQ7uOd4qRQ,1462
+preditor/excepthooks.py,sha256=UZ2PsxUo8hA_PBabAXsQkiwKgTLgY_3lueFymIb0V50,5127
+preditor/logging_config.py,sha256=bGRCaSq6ugPG2L5keTpw5CNiQwi9PFDxDMDhx_VLHsg,1583
 preditor/osystem.py,sha256=vRr-WaIzYEO38tJeyHMOlAyrvGaWGBuiyaPx0X9JfZ4,13682
 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=UNO7UaKPam6Zugzw6NMt_RQBnRzrv9GVeKUjWt-tl6I,511
+preditor/version.py,sha256=zHRWUFacu0mfM24GYuT-vIcPzFr12VT8INArUatU4D0,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
-preditor/dccs/maya/PrEditor_maya.mod,sha256=XTZsiqpSj7AjiB0SOZJct06mk1cLivV7sWIZmg1HoFo,46
-preditor/dccs/maya/plug-ins/PrEditor_maya.py,sha256=_ybVuvJ3PGTn35VVQXZmjINifYjqPOV3MHBC1WQKvls,3955
+preditor/dccs/.hab.json,sha256=9_x-QXUhqrDJDPXXJF4hS3KZh9S27m6egeS5xYbJrtI,236
+preditor/dccs/maya/PrEditor_maya.mod,sha256=uY9moRGjwKDYt6RdKxw_8oCHSQwZ0cmYRSAknUs7eKo,25
+preditor/dccs/maya/README.md,sha256=b-W0MmhII_y4_NSIPlbjBbPNxciGVAwW4plsLNiDhtc,1155
+preditor/dccs/maya/plug-ins/PrEditor_maya.py,sha256=NI0ysu84GZ8dRMQpesEvSHY2YGra0jiP7N5qxR0ih0A,5102
+preditor/dccs/studiomax/PackageContents.xml,sha256=063SW-C9bje7_ZlJgQnT6ehoV7-42eHaSbZaIsMArQk,1647
+preditor/dccs/studiomax/PrEditor-PrEditor_Show.mcr,sha256=Cju39XiwGHP5AtfgVqxkts9GjFVlZmTK_VUDUO_jegE,164
+preditor/dccs/studiomax/README.md,sha256=grDwWRsCVut8ncEKNHIGFwVGeSJRYDs6oukd-SYM1qc,814
+preditor/dccs/studiomax/preditor.ms,sha256=GeX2taJgSsqJBB8_cCdVMV6-G75xjCWyh1G_8atVR6Y,558
+preditor/dccs/studiomax/preditor_menu.mnx,sha256=AjUOFC9vz4f3qxYYMGo0-wmlYzCo5D6N5hP5Fv0RHc8,684
 preditor/delayable_engine/__init__.py,sha256=imy_fMPiBQUKkN4CvPcSy_mYvWEpphaTMYZbMPPgjZw,11214
 preditor/delayable_engine/delayables.py,sha256=GWxv4iTcqFeo7703SMrtotKx4cfq1ujJMNdpmtawPqc,2708
 preditor/gui/__init__.py,sha256=DeOH5K4_M0YLNx1i7NRvwCgwjyjkre4vVwlr5OEMx9Q,3423
-preditor/gui/app.py,sha256=13-K8RKrBhFrnr8IhyWx0phv3U1denqBogYEDZ_1zos,5837
-preditor/gui/codehighlighter.py,sha256=3JxXZpZqN3KVZbQgSmO-JldSlf4zFQ0PojWwucTsy5U,7171
-preditor/gui/completer.py,sha256=T6fl_4xGVjVtGNuR6ajD1ngjEhrKR6tZ9zPJDYoKn8E,7379
-preditor/gui/console.py,sha256=cifASpAbSbVvszLoReY9PMUdFj1qc9PHMJbSGaaHNnU,34830
-preditor/gui/dialog.py,sha256=l16G4mHmEhE2ximk-gl7KJJQrJLWUqFwi2ex65e7U7k,6413
-preditor/gui/drag_tab_bar.py,sha256=5J-BSKQzS6_WuYxxGqmnUJr6AriTAvwfVK7Q3p7knrM,7933
+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/dialog.py,sha256=fasmBDhN-B6uretbSQ3x1SxImsQLSKIMw4PC9B8BimI,6535
+preditor/gui/drag_tab_bar.py,sha256=_TFLRyodO5e16R8DNGQjPAwrGk2SBnqtj4Bn8mxr0HI,8018
 preditor/gui/editor_chooser.py,sha256=lv1eY0UJOulX1l-P-ZQEoneYz6BNX2VkXEbg3GUu1ag,1991
-preditor/gui/errordialog.py,sha256=e5VGL8iwSkGreBOg3gZhjVvkrZ7fKbKQ1D91z3EKpr0,2045
-preditor/gui/find_files.py,sha256=8_b0oQgL6u8U2FqpR2RzMChME9eYdJq3c3bgXXDeceY,4241
-preditor/gui/level_buttons.py,sha256=YVvdpXItbFAGl_vYTBcYvOKNQmmEaHRY63pX30WHBbk,11728
+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=kiADRLw8yzr5qyFpHfFbC2uEFu2Zz5YHnB8Yf7p-gj0,53886
+preditor/gui/loggerwindow.py,sha256=gGntieiZ2GdNY99CXNrldrv5abYzfSWYk-HdIVb3sYM,54378
 preditor/gui/newtabwidget.py,sha256=5aCWn9xAl5h1oZACqVuEsOAbzKTS2RegrLI41gROC8A,1971
-preditor/gui/set_text_editor_path_dialog.py,sha256=wzWAUgzGrsWbhcxeHjGlctuFVPXtYyxwnigAeUeeb5o,2247
+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=VS6ENhbAM991HvbLWp9Ys9DIvRgI-RcuKkr8BbPiaEE,5840
-preditor/gui/workbox_mixin.py,sha256=kUVHtK-flyux3PZ9GkOYnjCJMLRcZESFJXipsgNgI0U,13851
-preditor/gui/workbox_text_edit.py,sha256=B_xObwwobKzpMuTmwkczTGW9cOem2oF8pZDezCqwPCo,4385
-preditor/gui/workboxwidget.py,sha256=BDmV3tu5HaZPTpc_h8UtiAag-w7pEKUBNSkqAIz_7IU,10056
+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/fuzzy_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-preditor/gui/fuzzy_search/fuzzy_search.py,sha256=6npanW6aLmG_ezdHmpsKN7p2zwck_Qq6YUy9duCNN8Q,3595
-preditor/gui/group_tab_widget/__init__.py,sha256=PQ7yqhbkR5X_zilBJliyepVgYb26G3P6MyzBU6Jkt10,12965
+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/grouped_tab_menu.py,sha256=lopd3mjHJIE_5xLdlZL0ghuBzsYo36vO1OZE6L6tqbI,1288
-preditor/gui/group_tab_widget/grouped_tab_models.py,sha256=zlmbcv3JAC5BzjKpm4CM7Hobibm1T_3GjaPoWIQbXiQ,3970
-preditor/gui/group_tab_widget/grouped_tab_widget.py,sha256=Z08LE8-ABakpM5Lk8cnntfjtdsmoR_T2ycgSEor7iY0,2928
+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/ui/editor_chooser.ui,sha256=cYSVHK0A4-zst6JyDkrBZK9qcAontbhV4Mmnw5ps72E,2736
 preditor/gui/ui/errordialog.ui,sha256=i7cVc28FPxA_b4Xa58W_xmRJ_1GFb5rgtUhR_gZcf4E,1831
@@ -108,14 +115,14 @@ preditor/resource/img/warning-big.png,sha256=z5QKX3DNLo_UDRKdjwtELbXL_JLf2zOwhkM
 preditor/resource/lang/python.json,sha256=CXiQh0jcgd-OCrM-s9IF7s4o-g5WRA4vDaAyTRAxAQo,316
 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=AoUc-fcp2D3F10FDFsp_ZzUr4zioDH0mvdubSF7sRG0,523
-preditor/scintilla/documenteditor.py,sha256=g9spQ-y5JBxFvwx7OHXVXQhPql4juzQFLfZNTvIwQeA,77895
-preditor/scintilla/finddialog.py,sha256=vcYPj74LbCy4KXdh0eJyOb8i31pJKgOZitKpgW4zhBM,2346
+preditor/scintilla/__init__.py,sha256=IDndbcS8KW1TMcQTA1Vd-LzcdsNtOUfyldnjkKae0yw,956
+preditor/scintilla/documenteditor.py,sha256=j9ZAAyYZwPZbI0hW5ou76aIpaFzvzukAT9l8KLY9s1o,79927
+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=JRwGp-pVwx75zJ5NoJ8UuBg4-jK4eQfgD4eM4ZfDbGI,3502
-preditor/scintilla/delayables/spell_check.py,sha256=56XQp5rB_W6PaHkV-p6kYrlBcD0WIdenn287i95lnwE,6901
+preditor/scintilla/delayables/smart_highlight.py,sha256=5emI4StsQCIYizoFsib1rdw0gnUarV9TQ6CwxmzXXpU,3623
+preditor/scintilla/delayables/spell_check.py,sha256=eHia6y-nOlQ-bhcfOm_EbgdREItVFNvIjkX8UIbv6ks,6936
 preditor/scintilla/lang/__init__.py,sha256=db0L84UKwXoiv_5PR3wFcywzbBo5a7SuZIz04S17nIM,1705
-preditor/scintilla/lang/language.py,sha256=GC8ASEcvRuo6pwTwe8usN5p_gA1UJ9RUsgmN9bOjh8I,6919
+preditor/scintilla/lang/language.py,sha256=okngeGkVANP4e-GJT3NnCowlVxhs13wQZPNy87wp60I,6916
 preditor/scintilla/lang/config/bash.ini,sha256=dtvJOl5HKQo4JMpqoZ3ZcujAyk0qYa61hWYVpp6uzZw,152
 preditor/scintilla/lang/config/batch.ini,sha256=n0gQR47Zs5L9Hb1lkdJ7s2_4bqR7LwXcuCc2uOX4wpA,154
 preditor/scintilla/lang/config/cpp.ini,sha256=un8AiviOrYDrrPJYDSlBjjctWVr4OkSFjLZ5A43DYKU,263
@@ -136,23 +143,25 @@ preditor/scintilla/lang/config/sql.ini,sha256=TrRCliEmJvAlBXyKniJQdtKjfdPnBV-ywq
 preditor/scintilla/lang/config/xml.ini,sha256=xEhjIazrQhlEb19fff-mgkftK8cJW9DGcFnZwzTfbjA,469
 preditor/scintilla/lang/config/yaml.ini,sha256=rdFvgxQ7_L3kxqd5TwCAG4YFA75hBi8buVLGDZLaKwg,222
 preditor/scintilla/lexers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-preditor/scintilla/lexers/cpplexer.py,sha256=5tVNlwVwAFZNmx8ri4WvJgkAyVvTCInNqZgfKXUKyfE,702
-preditor/scintilla/lexers/javascriptlexer.py,sha256=eyeT3FD_8q3hiVfyQ-uv56M0uWe76Ws-qDS32CGO6ug,853
-preditor/scintilla/lexers/maxscriptlexer.py,sha256=bS0-A7X09MbTJ-oAXZRDS3MdAa6kG94aEBIZIj6rjSs,8456
-preditor/scintilla/lexers/mellexer.py,sha256=Jp8i7UOBqQR0VQ88jZFtgwGM0KX0NxTbr3vYLeBWfkk,26506
-preditor/scintilla/lexers/mulexer.py,sha256=Y2FVp6ZJ9CgLIuIvItOzXMMRemuToID66dpBn1qqTwA,976
-preditor/scintilla/lexers/pythonlexer.py,sha256=WgL74RQGvGgsdAL-l2ioOMybqRw7M0GG-SxmzXsW4xw,1682
+preditor/scintilla/lexers/cpplexer.py,sha256=xbFEFdadSrSnJJuq5hb0lwVrx_lZsUYovfCkvcyaa7M,692
+preditor/scintilla/lexers/javascriptlexer.py,sha256=QSh2kGSmhEwQOLd5WjqespY5iMbE-zarZUUxRDU7myI,884
+preditor/scintilla/lexers/maxscriptlexer.py,sha256=0z7I_jhDmyVHFSxXB29rO85nb37Rl2Hg77VPgknbvkw,8485
+preditor/scintilla/lexers/mellexer.py,sha256=egQfRZJ49aJLUObCw-Ya7zdR8APpj4_IpOlwHxA9GJk,26496
+preditor/scintilla/lexers/mulexer.py,sha256=tlyiKYBDRpmxcrH9FGi-Ogz2alHPhyqNaqVrWBvAx6I,966
+preditor/scintilla/lexers/pythonlexer.py,sha256=dh_wSBhhYIIV1hUF_0cWbZCdMBMsOB6EY6x8valWo1s,1737
 preditor/scintilla/ui/finddialog.ui,sha256=CEXouVKqVCDOfMBciK-89OmsGe2Kr6XdMbSPiffp0PA,4048
 preditor/stream/__init__.py,sha256=SxILA3U3W8aNfVBd_oJ4-WXkA214cl1zGLSCelFx5QU,2682
 preditor/stream/director.py,sha256=Gklbl6jwTmB0BtyR6MZxRytdlufaz5MoiW9Le9WFTmo,2733
 preditor/stream/manager.py,sha256=NP4lf6hd5L_Ui-9Ws66gVEk6ZL8YqF7BxOzUsdrh3v0,2811
 preditor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-preditor/utils/cute.py,sha256=LfF8gXMAkkQAdo4mm6J9aVkDLwWZbE6prQ0moDbtCys,1045
+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.1.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-preditor-1.1.0.dist-info/METADATA,sha256=maaheBBs8muvTMHa_8vUvYtGwS9uSmNvPET40yphdOU,9948
-preditor-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-preditor-1.1.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
-preditor-1.1.0.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
-preditor-1.1.0.dist-info/RECORD,,
+preditor-1.2.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.2.0.dist-info/top_level.txt

@@ -0,0 +1,3 @@
+dist
+preditor
+tests

tests/find_files/test_find_files.py

@@ -0,0 +1,74 @@
+import os
+
+import pytest
+
+from preditor.utils.text_search import RegexTextSearch, SimpleTextSearch
+
+
+def text_for_test(filename):
+    dirname = os.path.dirname(__file__)
+    filename = os.path.join(dirname, filename)
+    with open(filename) as fle:
+        return fle.read()
+
+
+@pytest.mark.parametrize(
+    "check_type,search_text,is_cs,context,is_re",
+    (
+        # Simple text search testing context and case
+        ("simple", "search term", False, 0, False),
+        ("simple", "search term", False, 1, False),
+        ("simple", "search term", False, 2, False),
+        ("simple", "search term", False, 3, False),
+        ("simple", "search term", True, 2, False),
+        # Regex search testing context and case
+        ("re_simple", "search term", False, 0, True),
+        ("re_simple", "search term", False, 2, True),
+        ("re_simple", "search term", False, 3, True),
+        ("re_simple", "search term", True, 2, True),
+        # Complex regex with a greedy search term
+        ("re_greedy", "search.+term", False, 0, True),
+        ("re_greedy", "search.+term", False, 2, True),
+        ("re_greedy", "search.+term", True, 2, True),
+        ("re_greedy_upper", "Search.+term", True, 2, True),
+    ),
+)
+def test_find_files(capsys, check_type, search_text, is_cs, context, is_re):
+    workbox_id = "1,2"
+    path = 'First Group/First Tab'
+    text = text_for_test("tab_text.txt")
+
+    if is_re:
+        TextSearch = RegexTextSearch
+    else:
+        TextSearch = SimpleTextSearch
+
+    search = TextSearch(search_text, case_sensitive=is_cs, context=context)
+    # Add the title to the printed output so title is tested when checking
+    # `captured.out` later.
+    print(search.title())
+
+    # Generate the search text and print it to `captured.out` so we can check
+    search.search_text(text, path, workbox_id)
+
+    captured = capsys.readouterr()
+    check_filename = "{}_{}_{}_{}.md".format(check_type, is_cs, context, is_re)
+    check = text_for_test(check_filename)
+
+    # To update tests, print text and save over top of the md. Then verify
+    # that it is actually rendered properly. You will need to add one trailing
+    # space after dot lines, two spaces after blank lines, and ensue the end of
+    # file newline is present. The default print callbacks use markdown links,
+    # but don't really render valid markdown. If you want to render to html,
+    # use regular markdown not github flavored.
+    # print(check_filename)
+    # print(captured.out)
+
+    # print('*' * 50)
+    # for line in check.rstrip().splitlines(keepends=True):
+    #     print([line])
+    # print('*' * 50)
+    # for line in captured.out.splitlines(keepends=True):
+    #     print([line])
+
+    assert captured.out == check