je-editor 0.0.184__py3-none-any.whl → 0.0.187__py3-none-any.whl

je_editor/__init__.py

@@ -2,7 +2,7 @@ from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.code.code_process.code_exec import ExecManager
 from je_editor.pyside_ui.code.shell_process.shell_exec import ShellManager
 from je_editor.pyside_ui.code.syntax.python_syntax import PythonHighlighter
-from je_editor.pyside_ui.code.syntax.syntax_setting import syntax_word_setting_dict, syntax_rule_setting_dict
+from je_editor.pyside_ui.code.syntax.syntax_setting import syntax_extend_setting_dict, syntax_rule_setting_dict
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget
 from je_editor.pyside_ui.main_ui.editor.editor_widget_dock import FullEditorWidget
 from je_editor.pyside_ui.main_ui.main_editor import EDITOR_EXTEND_TAB
@@ -26,7 +26,7 @@ __all__ = [
     "start_editor", "EditorMain", "EDITOR_EXTEND_TAB",
     "JEditorException", "JEditorExecException", "FullEditorWidget",
     "JEditorRunOnShellException", "JEditorSaveFileException", "syntax_rule_setting_dict",
-    "JEditorOpenFileException", "JEditorContentFileException", "syntax_word_setting_dict",
+    "JEditorOpenFileException", "JEditorContentFileException", "syntax_extend_setting_dict",
     "JEditorCantFindLanguageException", "JEditorJsonException", "PythonHighlighter",
     "user_setting_dict", "user_setting_color_dict", "EditorWidget", "BrowserWidget",
     "ExecManager", "ShellManager", "traditional_chinese_word_dict", "english_word_dict",

je_editor/__main__.py

@@ -2,7 +2,7 @@ if __name__ == "__main__":
     # argparse
     import argparse
 
-    from je_editor.tkinter_ui.editor_main_ui.tkinter_editor import start_editor
+    from je_editor.start_editor import start_editor
 
     argparse_event_dict = {
         "start": start_editor,

je_editor/pyside_ui/code/plaintext_code_edit/code_edit_plaintext.py

@@ -43,6 +43,7 @@ class CodeEditor(QPlainTextEdit):
         self.check_env()
         # Self main window (parent)
         self.main_window = main_window
+        self.current_file = main_window.current_file
 
         self.skip_popup_behavior_list = [
             Qt.Key.Key_Enter, Qt.Key.Key_Return, Qt.Key.Key_Up, Qt.Key.Key_Down,
@@ -64,7 +65,7 @@ class CodeEditor(QPlainTextEdit):
         self.setTabStopDistance(
             QtGui.QFontMetricsF(self.font()).horizontalAdvance("        ")
         )
-        self.highlighter = PythonHighlighter(self.document())
+        self.highlighter = PythonHighlighter(self.document(), main_window=self)
         self.highlight_current_line()
         self.setLineWrapMode(self.LineWrapMode.NoWrap)
         # Search Text
@@ -79,6 +80,10 @@ class CodeEditor(QPlainTextEdit):
         self.completer: Union[None, QCompleter] = None
         self.set_complete([])
 
+    def reset_highlighter(self):
+        self.highlighter = PythonHighlighter(self.document(), main_window=self)
+        self.highlight_current_line()
+
     def check_env(self):
         jeditor_logger.info("CodeEditor check_env")
         path = venv_check()

je_editor/pyside_ui/code/syntax/python_syntax.py

@@ -1,34 +1,57 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from je_editor.pyside_ui.code.plaintext_code_edit.code_edit_plaintext import CodeEditor
+
 from PySide6.QtCore import QRegularExpression
 from PySide6.QtGui import QSyntaxHighlighter
 from PySide6.QtGui import QTextCharFormat
 
-from je_editor.pyside_ui.code.syntax.syntax_setting import syntax_word_setting_dict, syntax_rule_setting_dict
+from je_editor.pyside_ui.code.syntax.syntax_setting import syntax_word_setting_dict, syntax_rule_setting_dict, \
+    syntax_extend_setting_dict
 from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 
 class PythonHighlighter(QSyntaxHighlighter):
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, main_window: CodeEditor = None):
         jeditor_logger.info(f"Init PythonHighlighter parent: {parent}")
         super().__init__(parent)
 
         self.highlight_rules = []
-
-        # Highlight
-        for rule_variable_dict in syntax_word_setting_dict.values():
-            color = rule_variable_dict.get("color")
-            text_char_format = QTextCharFormat()
-            text_char_format.setForeground(color)
-            for word in rule_variable_dict.get("words"):
-                pattern = QRegularExpression(rf"\b{word}\b")
-                self.highlight_rules.append((pattern, text_char_format))
-
-        for rule_variable_dict in syntax_rule_setting_dict.values():
-            color = rule_variable_dict.get("color")
-            text_char_format = QTextCharFormat()
-            text_char_format.setForeground(color)
-            for rule in rule_variable_dict.get("rules"):
-                pattern = QRegularExpression(rule)
-                self.highlight_rules.append((pattern, text_char_format))
+        if main_window.current_file is not None:
+            current_file_suffix = Path(main_window.current_file).suffix
+        else:
+            current_file_suffix = ".py"
+        if current_file_suffix == ".py":
+            # Highlight
+            for rule_variable_dict in syntax_word_setting_dict.values():
+                color = rule_variable_dict.get("color")
+                text_char_format = QTextCharFormat()
+                text_char_format.setForeground(color)
+                for word in rule_variable_dict.get("words"):
+                    pattern = QRegularExpression(rf"\b{word}\b")
+                    self.highlight_rules.append((pattern, text_char_format))
+            for rule_variable_dict in syntax_rule_setting_dict.values():
+                color = rule_variable_dict.get("color")
+                text_char_format = QTextCharFormat()
+                text_char_format.setForeground(color)
+                for rule in rule_variable_dict.get("rules"):
+                    pattern = QRegularExpression(rule)
+                    self.highlight_rules.append((pattern, text_char_format))
+        else:
+            if syntax_extend_setting_dict.get(current_file_suffix):
+                for rule_variable_dict in syntax_extend_setting_dict.get("current_file_suffix").values():
+                    color = rule_variable_dict.get("color")
+                    text_char_format = QTextCharFormat()
+                    text_char_format.setForeground(color)
+                    for word in rule_variable_dict.get("words"):
+                        pattern = QRegularExpression(rf"\b{word}\b")
+                        self.highlight_rules.append((pattern, text_char_format))
+            else:
+                pass
 
     def highlightBlock(self, text) -> None:
         jeditor_logger.info(f"PythonHighlighter highlightBlock text: {text}")

je_editor/pyside_ui/code/syntax/syntax_setting.py

@@ -61,5 +61,7 @@ syntax_word_setting_dict: dict = {
         "words": ("self",),
         "color": QColor(204, 0, 204)
     }
+}
 
+syntax_extend_setting_dict: dict = {
 }

je_editor/pyside_ui/main_ui/main_editor.py

@@ -12,6 +12,7 @@ from frontengine import FrontEngineMainUI
 from frontengine import RedirectManager
 from qt_material import QtStyleTools
 
+from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.code.auto_save.auto_save_manager import init_new_auto_save_thread, file_is_open_manager_dict
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget
@@ -22,7 +23,6 @@ from je_editor.pyside_ui.main_ui.save_settings.user_setting_file import user_set
     write_user_setting
 from je_editor.pyside_ui.main_ui.system_tray.extend_system_tray import ExtendSystemTray
 from je_editor.utils.file.open.open_file import read_file
-from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
 from je_editor.utils.redirect_manager.redirect_manager_class import redirect_manager_instance
 
@@ -97,7 +97,7 @@ class EditorMain(QMainWindow, QtStyleTools):
                 self.system_tray.show()
                 self.system_tray.setToolTip(language_wrapper.language_word_dict.get("application_name"))
         # Put Redirect on last to trace exception
-        RedirectManager.restore_std()
+        redirect_manager_instance.restore_std()
         redirect_manager_instance.set_redirect()
         # Timer to redirect error or message
         self.redirect_timer = QTimer(self)
@@ -181,6 +181,7 @@ class EditorMain(QMainWindow, QtStyleTools):
                     if last_file_path.is_file() and last_file_path.exists() and widget.code_save_thread is None:
                         init_new_auto_save_thread(str(last_file_path), widget)
                         widget.code_edit.setPlainText(read_file(widget.current_file)[1])
+                        widget.code_edit.reset_highlighter()
                         file_is_open_manager_dict.update({str(last_file_path): str(last_file_path.name)})
                         widget.rename_self_tab()
 
@@ -204,7 +205,7 @@ class EditorMain(QMainWindow, QtStyleTools):
             self.tab_widget.setCurrentWidget(widget)
 
     def closeEvent(self, event) -> None:
-        jeditor_logger.info(f"EditorMain closeEvent")
+        jeditor_logger.info("EditorMain closeEvent")
         write_user_setting()
         write_user_color_setting()
         super().closeEvent(event)

je_editor/utils/logging/loggin_instance.py

@@ -5,9 +5,23 @@ logging.root.setLevel(logging.DEBUG)
 jeditor_logger = logging.getLogger("JEditor")
 formatter = logging.Formatter('%(asctime)s | %(name)s | %(levelname)s | %(message)s')
 
-# Rotating File Handler
-rotating_file_handler = RotatingFileHandler(filename="JEditor.log", mode="w",maxBytes=1073741824)
-rotating_file_handler.setFormatter(formatter)
-jeditor_logger.addHandler(rotating_file_handler)
+
+class JEditorLoggingHandler(RotatingFileHandler):
+
+    # redirect logging stderr output to queue
+
+    def __init__(self, filename: str = "JEditor.log", mode="w",
+                 maxBytes:int=1073741824, backupCount:int=0):
+        super().__init__(filename=filename, mode=mode, maxBytes=maxBytes, backupCount=backupCount)
+        self.formatter = formatter
+        self.setLevel(logging.DEBUG)
+
+    def emit(self, record: logging.LogRecord) -> None:
+        super().emit(record)
+
+
+# File handler
+file_handler = JEditorLoggingHandler()
+jeditor_logger.addHandler(file_handler)
 
 

je_editor/utils/redirect_manager/redirect_manager_class.py

@@ -10,15 +10,12 @@ class RedirectStdOut(logging.Handler):
     # redirect logging std output to queue
 
     def __init__(self):
-        jeditor_logger.info("Init RedirectStdOut")
         super().__init__()
 
     def write(self, content_to_write) -> None:
-        jeditor_logger.info(f"RedirectStdOut write content_to_write: {content_to_write}")
         redirect_manager_instance.std_out_queue.put(content_to_write)
 
     def emit(self, record: logging.LogRecord) -> None:
-        jeditor_logger.info(f"RedirectStdOut emit record: {record}")
         redirect_manager_instance.std_out_queue.put(self.format(record))
 
 
@@ -27,15 +24,12 @@ class RedirectStdErr(logging.Handler):
     # redirect logging stderr output to queue
 
     def __init__(self):
-        jeditor_logger.info("Init RedirectStdErr")
         super().__init__()
 
     def write(self, content_to_write) -> None:
-        jeditor_logger.info(f"RedirectStdErr write content_to_write: {content_to_write}")
         redirect_manager_instance.std_err_queue.put(content_to_write)
 
     def emit(self, record: logging.LogRecord) -> None:
-        jeditor_logger.info(f"RedirectStdErr emit record: {record}")
         redirect_manager_instance.std_err_queue.put(self.format(record))
 
 
@@ -58,8 +52,9 @@ class RedirectManager(object):
         sys.stderr = redirect_err
         default_logger = logging.getLogger("RedirectManager")
         default_logger.addHandler(redirect_err)
+        skip_logger_list = ["JEditor", "FrontEngine", "AutomationIDE"]
         for name in logging.root.manager.loggerDict.keys():
-            if name == "JEditor":
+            if name in skip_logger_list:
                 continue
             else:
                 logging.getLogger(name).addHandler(redirect_err)

{je_editor-0.0.184.dist-info → je_editor-0.0.187.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: je_editor
-Version: 0.0.184
+Version: 0.0.187
 Summary: JEditor is basic but powerful editor include GPT
 Author-email: JE-Chen <jechenmailman@gmail.com>
 License: MIT

{je_editor-0.0.184.dist-info → je_editor-0.0.187.dist-info}/RECORD

@@ -1,5 +1,5 @@
-je_editor/__init__.py,sha256=HEF6txDvxMvUCZJL86ukqqHBZjDe84V2fNZ38qABGy8,2401
-je_editor/__main__.py,sha256=tv19PbVG_8bg4HhRWINNYL_Zu6VtkJR00U_0v56GsK8,598
+je_editor/__init__.py,sha256=IZm-mUID0W7-smb9SYEtwcWrpr8mz6OyF4e5akHGrFU,2405
+je_editor/__main__.py,sha256=2ymm4ESRcqP4K1YQyeaDbGhuK-0C1IausIiEOpbm6Ds,570
 je_editor/start_editor.py,sha256=hW7JFOjBkcW7hdC7q-9JsaVTeSNCep1GsqxLmbMU4wg,543
 je_editor/pyside_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/pyside_ui/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,12 +17,12 @@ je_editor/pyside_ui/code/code_format/pep8_format.py,sha256=zrCkUdz2SG4bnMSkXfccv
 je_editor/pyside_ui/code/code_process/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/pyside_ui/code/code_process/code_exec.py,sha256=p_Qs0ROAc2qzaqJgz5yPB6mSfnCnHl5R69cYrzmyZ78,9839
 je_editor/pyside_ui/code/plaintext_code_edit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-je_editor/pyside_ui/code/plaintext_code_edit/code_edit_plaintext.py,sha256=uiJ115eeRZ2hOdtTwA2I6DY7Ww3UauoHzAgGJ747f_8,13875
+je_editor/pyside_ui/code/plaintext_code_edit/code_edit_plaintext.py,sha256=_17cH9dsSYDxZx09LzHL_lFclqMXWs9rz5a91b_244g,14103
 je_editor/pyside_ui/code/shell_process/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/pyside_ui/code/shell_process/shell_exec.py,sha256=JpEpq1rXdEAtPyjOmUT7Ib_-fRnWl-c6h46gExau-po,8729
 je_editor/pyside_ui/code/syntax/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-je_editor/pyside_ui/code/syntax/python_syntax.py,sha256=Go-AjzbQbocYdYvtlT4vXx3sbd8zJtqdP1FObc2dgLQ,1831
-je_editor/pyside_ui/code/syntax/syntax_setting.py,sha256=5mx0bnCJBvdAH6LixV_k6KoQyEdnTnC5sV3ieq06XBw,2243
+je_editor/pyside_ui/code/syntax/python_syntax.py,sha256=FH3YI_aixnkjId98YPGM5QMhU0_AimWaFuKpoFBG0yA,3017
+je_editor/pyside_ui/code/syntax/syntax_setting.py,sha256=oaLRF_83Oa6bcAorf7AlZG0Mrt4FmsK7b4aA-LS_bRo,2284
 je_editor/pyside_ui/code/textedit_code_result/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/pyside_ui/code/textedit_code_result/code_record.py,sha256=pT-CmcADEaXLZ0ih6D6rpe1XywgszrEpcJxtJYgopJE,2162
 je_editor/pyside_ui/dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,7 +34,7 @@ je_editor/pyside_ui/dialog/search_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 je_editor/pyside_ui/dialog/search_ui/search_error_box.py,sha256=GzMXMnIL1k8ZwG3A2a_oMgiUiXXqd7HKW45YlVlL_eo,1168
 je_editor/pyside_ui/dialog/search_ui/search_text_box.py,sha256=H2MbC-RGpKg9TzjV4MZj7Bw7qs9a9E4cjA4GI5zsv4U,1154
 je_editor/pyside_ui/main_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-je_editor/pyside_ui/main_ui/main_editor.py,sha256=c2mniaNh-ngyNzA38Wsx8xZJqAc07aUTg2XN4P6IDJ4,10953
+je_editor/pyside_ui/main_ui/main_editor.py,sha256=Avk2aBXN7bgGAZB4b92WtV9vZQd6QMWUyLDvfsu59gk,11024
 je_editor/pyside_ui/main_ui/dock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/pyside_ui/main_ui/dock/destroy_dock.py,sha256=MTN45BykNm6FA4gMW7gI4Kr9orTdcxVTm7mch3DUhaw,604
 je_editor/pyside_ui/main_ui/editor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,17 +92,17 @@ je_editor/utils/json/json_file.py,sha256=zTzQp-VFlaXg7puxC3EgEECURuuDmfJ8I9emX0E
 je_editor/utils/json_format/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 je_editor/utils/json_format/json_process.py,sha256=tszo48OnVivVkuuPrl-FtGaaq-1YOJLKT2o2A3qQi3M,1250
 je_editor/utils/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-je_editor/utils/logging/loggin_instance.py,sha256=yZMkHMvStMtkI-IqhwPnDXnh8uvBmhDpr-HMkLVxsCI,467
+je_editor/utils/logging/loggin_instance.py,sha256=OFdWgra201B4f1vDM35M9L-47DK-8j-5HQEAq_ySSKM,841
 je_editor/utils/multi_language/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/utils/multi_language/english.py,sha256=Wbku1oGVoxDRpUb3JKy1Qlj8BByDNB60PvH4TEQwGgw,5778
 je_editor/utils/multi_language/multi_language_wrapper.py,sha256=_MtYrE51poQ1p_iWvT2eg_604uj6IsiBgGpifWpYLGc,1050
 je_editor/utils/multi_language/traditional_chinese.py,sha256=tWs9_yhuNoehpYFCv37a6eVYphkzN9Jb_9Pbj267Mcc,5812
 je_editor/utils/redirect_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-je_editor/utils/redirect_manager/redirect_manager_class.py,sha256=QtuK9z3auc2lnBdTVxS-ENpBMt5pRsEuKVVOmRkd-Kw,2521
+je_editor/utils/redirect_manager/redirect_manager_class.py,sha256=RsLRbhBy_YyiwTN5g0YkoobI-BvSdZgX0Ot53nrHm7g,2174
 je_editor/utils/venv_check/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 je_editor/utils/venv_check/check_venv.py,sha256=oCrMdue4NYUUGrVifh_iHFwIgxVx9azYN4jz3Xiulgg,999
-je_editor-0.0.184.dist-info/LICENSE,sha256=KMhUHh6pnIUvmXDW-49L_Sz63bqkOlPDqsecaqKiitU,1091
-je_editor-0.0.184.dist-info/METADATA,sha256=4sWldT_Gn7Erq3OIbIPZ-fsoUR70sTBgE-KpUOPjbgk,3338
-je_editor-0.0.184.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-je_editor-0.0.184.dist-info/top_level.txt,sha256=_9YA7BgxpkmdLs-5V_UQILxClcMRgPyG1a3qaE-Bkcs,10
-je_editor-0.0.184.dist-info/RECORD,,
+je_editor-0.0.187.dist-info/LICENSE,sha256=KMhUHh6pnIUvmXDW-49L_Sz63bqkOlPDqsecaqKiitU,1091
+je_editor-0.0.187.dist-info/METADATA,sha256=geYXWDYks3fxMsA1VHJVEcynQn3BsFlhXMbp2OIDUtg,3338
+je_editor-0.0.187.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+je_editor-0.0.187.dist-info/top_level.txt,sha256=_9YA7BgxpkmdLs-5V_UQILxClcMRgPyG1a3qaE-Bkcs,10
+je_editor-0.0.187.dist-info/RECORD,,

{je_editor-0.0.184.dist-info → je_editor-0.0.187.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any