pyqt-code-editor 0.0.20__tar.gz → 0.0.22__tar.gz

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqt_code_editor
-Version: 0.0.20
+Version: 0.0.22
 Summary: Fully featured code-editor widgets for PyQt
 Keywords: code editor,pyqt,ide
 Author-email: Sebastiaan Mathôt <s.mathot@cogsci.nl>

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/__init__.py

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.20'
+__version__ = '0.0.22'

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/_settings.py

@@ -80,9 +80,11 @@ class Settings(QObject):
     
     # Files and Folders
     current_folder = SettingProperty(os.path.expanduser('~'), "Files")
+    project_folders = SettingProperty(os.path.expanduser('~'), "Files")
     default_filename = SettingProperty('untitled.txt', "Files")
     default_language = SettingProperty('python', "Files")
     default_encoding = SettingProperty('utf-8', "Files")
+    max_file_size = SettingProperty(5 * 1024 ** 2, "Files")  # 5 MB)
     
     # Keyboard shortcuts
     shortcut_move_line_up = SettingProperty('Alt+Up', "Shortcuts")

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/app.py

@@ -26,9 +26,8 @@ class MainWindow(QMainWindow):
         super().__init__()
         logger.info("MainWindow initialized")
         # If no path is provided, fall back to current dir
-        if not root_path:
-            root_path = settings.current_folder
-
+        if root_path:
+            settings.project_folders = settings.current_folder = root_path
         self.setWindowTitle(f"Sigmund Analyst {__version__}")
         # The editor panel provides splittable editor tabs
         self._editor_panel = EditorPanel()
@@ -38,8 +37,9 @@ class MainWindow(QMainWindow):
         # Track if project explorers are hidden as a group
         self._project_explorers_hidden = False
         # Open initial project explorer
-        self._open_project_explorer(root_path)
-
+        for project_folder in str(settings.project_folders).split(':'):
+            if project_folder:
+                self._open_project_explorer(project_folder)
         # Set up the workspace explorer
         self._workspace_explorer = WorkspaceExplorer(parent=self)
         self.addDockWidget(Qt.RightDockWidgetArea, self._workspace_explorer)
@@ -442,7 +442,7 @@ class MainWindow(QMainWindow):
             open_file_callback=self._editor_panel.open_file,
         )
         dlg.exec_()
-        
+            
         
 def launch_app():
     app = QApplication(sys.argv)

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/code_editors/languages/python.py

@@ -6,7 +6,7 @@ from pyqt_code_editor.mixins import Complete, PythonAutoIndent, \
 
 
 class Editor(LineNumber, Zoom, SmartBackspaceDelete, PythonAutoPair, Complete,
-             PythonAutoIndent, Comment, SearchReplace, FileLink, Execute,
+             Comment, PythonAutoIndent, SearchReplace, FileLink, Execute,
              Theme, Check, Shortcuts, Symbols, Base,
              QPlainTextEdit):
                  

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/components/jupyter_console.py

@@ -5,12 +5,14 @@ from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtconsole.manager import QtKernelManager
 from jupyter_client.kernelspec import KernelSpecManager
 import qtawesome as qta
+import sys
 import os
 import logging
 import uuid
 import json
 from concurrent.futures import Future
 from .. import settings
+from ..environment_manager import environment_manager
 from ..themes import THEMES, OUTER_CONTENT_MARGINS, HORIZONTAL_SPACING
 from ..widgets import Dock
 from .. import watchdog
@@ -359,8 +361,8 @@ print(json.dumps({result_var}))
 class JupyterConsole(Dock):
     """Dockable widget containing tabbed Jupyter consoles"""
     
-    execution_complete = Signal(str, object)  # Signal for output interception
-    workspace_updated = Signal(dict)          # Signal for workspace updates
+    execution_complete = Signal(str, object)
+    workspace_updated = Signal(dict)
     
     def __init__(self, parent=None, default_kernel='python3'):
         super().__init__("Jupyter Console", parent)
@@ -370,7 +372,7 @@ class JupyterConsole(Dock):
         # ---------------------------------------------------------------------
         # Kernel cache
         # ---------------------------------------------------------------------
-        self.available_kernels = []  # will be filled by refresh_kernel_menu()
+        self.available_kernels = {}  # will be filled by refresh_kernel_menu()
         
         # ---------------------------------------------------------------------
         # UI setup
@@ -429,6 +431,14 @@ class JupyterConsole(Dock):
         console_tab = self.tab_widget.widget(index)
         if console_tab:
             console_tab.update_workspace()
+            spec = self.available_kernels.get(console_tab.kernel_name, None)
+            if spec:
+                python_executable = spec['spec']['argv'][0]
+            else:
+                python_executable = sys.executable
+            environment_manager.set_environment(console_tab.kernel_name,
+                                                python_executable,
+                                                'python')
     
     # -------------------------------------------------------------------------
     # Kernel handling
@@ -439,12 +449,9 @@ class JupyterConsole(Dock):
         
         # Get available kernelspecs
         kernel_spec_manager = HomeAwareKernelSpecManager()
-        specs = kernel_spec_manager.get_all_specs()
-        
-        # Cache available kernels
-        self.available_kernels = list(specs.keys())
-        
-        for spec_name, spec in specs.items():
+        self.available_kernels = kernel_spec_manager.get_all_specs()
+        self.fallback_kernel = list(self.available_kernels.keys())[0]
+        for spec_name, spec in self.available_kernels.items():
             display_name = spec['spec']['display_name']
             action = QAction(display_name, self)
             action.setData(spec_name)
@@ -462,12 +469,11 @@ class JupyterConsole(Dock):
         """
         if kernel_name not in self.available_kernels:
             if self.available_kernels:
-                fallback = self.available_kernels[0]
                 logger.warning(
                     "Requested kernel '%s' not found. "
-                    "Falling back to '%s'.", kernel_name, fallback
+                    "Falling back to '%s'.", kernel_name, self.fallback_kernel
                 )
-                kernel_name = fallback
+                kernel_name = self.fallback_kernel
             else:
                 logger.error("No available kernels found. Cannot create console tab.")
                 return None

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/components/project_explorer.py

@@ -262,8 +262,12 @@ class ProjectExplorer(QDockWidget):
         if not selected_dir:
             return None
         settings.current_folder = selected_dir
+        # Add selected folder to project folders but make sure we don't 
+        # duplicate
+        settings.project_folders = ':'.join(
+            set(str(settings.project_folders).split(':')) | {selected_dir})
         explorer = cls(editor_panel, root_path=selected_dir, parent=parent)
-        return explorer        
+        return explorer
         
     def _toggle_gitignore(self, enabled):
         """Toggles the .gitignore filter on or off and refreshes the model.
@@ -514,6 +518,10 @@ class ProjectExplorer(QDockWidget):
         self._clipboard_operation = None
         self._clipboard_source_path = None
         
-    def closeEvent(self, event):
+    def closeEvent(self, event):        
+        # Add selected folder to project folders but make sure we don't 
+        # duplicate
+        settings.project_folders = ':'.join(
+            set(str(settings.project_folders).split(':')) - {self._display_root})
         super().closeEvent(event)
         self.closed.emit(self)

pyqt_code_editor-0.0.22/pyqt_code_editor/environment_manager.py

@@ -0,0 +1,29 @@
+from qtpy.QtCore import Signal, QObject
+
+
+class EnvironmentManager(QObject):
+    """Singleton class to share the current environment and language between all
+    components of the app.
+    """    
+    environment_changed = Signal(str, str, str)
+
+    def __init__(self):
+        super().__init__()
+        self.name = None
+        self.path = None
+        self.language = None
+
+    @property
+    def current_environment(self):
+        return self.name, self.path, self.language
+
+    def set_environment(self, name, path, language):
+        if path != self.path:
+            self.name = name
+            self.path = path
+            self.language = language
+            self.environment_changed.emit(name, path, language)
+
+
+# Singleton instance
+environment_manager = EnvironmentManager()

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/mixins/comment.py

@@ -17,12 +17,31 @@ class Comment:
                                (default "# " for Python).
         """
         super().__init__(*args, **kwargs)
-        # The text to prepend for a commented line
-        self.code_editor_comment_string
         self._comment_shortcut = QShortcut(
             QKeySequence(settings.shortcut_comment), self)
         self._comment_shortcut.setContext(Qt.WidgetWithChildrenShortcut)
         self._comment_shortcut.activated.connect(self._toggle_comment)
+        
+    def keyPressEvent(self, event):
+        # When a return is pressed on a commented line, the comment should
+        # continue on the next line
+        if event.key() in (Qt.Key_Enter, Qt.Key_Return):
+            cursor = self.textCursor()
+            block = cursor.block()
+            line_text = block.text()            
+            # Check if the current line is a comment
+            stripped = line_text.lstrip()
+            if stripped.startswith(self.code_editor_comment_string[0]):
+                # Extract the indentation from the current line
+                indentation = line_text[:len(line_text) - len(stripped)]                
+                # Insert newline with same indentation plus comment marker
+                cursor.beginEditBlock()
+                cursor.insertText(
+                    '\n' + indentation + self.code_editor_comment_string)
+                cursor.endEditBlock()
+                event.accept()
+                return
+        super().keyPressEvent(event)    
 
     def _toggle_comment(self):
         """Toggle comment on the current selection or current line."""

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/mixins/complete.py

@@ -1,9 +1,12 @@
+import os
+import sys
 import logging
 from qtpy.QtCore import QTimer, Qt
 from qtpy.QtGui import QTextCursor
 from qtpy.QtWidgets import QApplication
 from ..widgets.completion_popup import CompletionPopup
 from ..widgets.calltip_widget import CalltipWidget
+from ..environment_manager import environment_manager
 from .. import settings
 logging.basicConfig(level=logging.INFO, force=True)
 logger = logging.getLogger(__name__)
@@ -273,7 +276,8 @@ class Complete:
                                  cursor_pos=cursor_pos, full=full,
                                  multiline=multiline,
                                  path=self.code_editor_file_path,
-                                 language=self.code_editor_language)
+                                 language=self.code_editor_language,
+                                 env_path=environment_manager.path)
 
     def _cm_request_calltip(self):
         """Send a calltip request."""
@@ -284,7 +288,8 @@ class Complete:
         self.send_worker_request(action='calltip', code=code,
                                  cursor_pos=cursor_pos,
                                  path=self.code_editor_file_path,
-                                 language=self.code_editor_language)
+                                 language=self.code_editor_language,
+                                 env_path=environment_manager.path)
 
     def _cm_hide_calltip(self):
         """Hide the calltip widget."""
@@ -533,3 +538,6 @@ class Complete:
     def update_theme(self):
         super().update_theme()
         self._cm_calltip_widget.apply_stylesheet()
+
+    def _current_environment(self):
+        return os.environ.get('SIGMUND_PYENV', sys.executable)

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/mixins/file_link.py

@@ -40,7 +40,12 @@ class FileLink:
         if not path.is_file():
             raise FileNotFoundError(f"No such file: {path}")
 
+        # Check file size
+        file_size = path.stat().st_size
+        is_large = file_size > settings.max_file_size
+        
         raw_data = path.read_bytes()
+        encoding_unknown = False
 
         if encoding is None:
             # First see if everything is within ASCII range
@@ -51,14 +56,55 @@ class FileLink:
             except UnicodeDecodeError:
                 # Not pure ASCII; let chardet pick
                 detect_result = chardet.detect(raw_data)
-                # If detection fails or returns None, default to utf-8
-                used_encoding = detect_result["encoding"] or "utf-8"
+                # If detection fails or returns None, or confidence is low
+                if (detect_result is None or 
+                    detect_result.get("encoding") is None or
+                    detect_result.get("confidence", 0) < 0.7):
+                    used_encoding = "utf-8"
+                    encoding_unknown = True
+                else:
+                    used_encoding = detect_result["encoding"]
         else:
             used_encoding = encoding
+            
+        # Show warning if file is large or encoding is uncertain
+        if is_large or encoding_unknown:
+            warnings = []
+            if is_large:
+                size_mb = file_size / (1024 * 1024)
+                warnings.append(f"This file is {size_mb:.1f} MB, which exceeds the recommended maximum of {settings.max_file_size / (1024 * 1024):.1f} MB.")
+            if encoding_unknown:
+                warnings.append("The file encoding could not be reliably detected. It may not display correctly.")
+            
+            warning_message = "\n\n".join(warnings)
+            warning_message += "\n\nDo you want to continue opening this file?"
+            
+            reply = QMessageBox.warning(
+                self,
+                "File Warning",
+                warning_message,
+                QMessageBox.Yes | QMessageBox.No,
+                QMessageBox.No
+            )
+            
+            if reply != QMessageBox.Yes:
+                logger.info(f"User declined to open file: {path}")
+                return
+                
         logger.info(f'opening file as {used_encoding}')
         # Try reading with the chosen encoding
-        with path.open("r", encoding=used_encoding) as f:
-            content = f.read()
+        try:
+            with path.open("r", encoding=used_encoding) as f:
+                content = f.read()
+        except UnicodeDecodeError as e:
+            # If decoding fails, offer to try as binary or cancel
+            reply = QMessageBox.critical(
+                self,
+                "Encoding Error",
+                f"Failed to decode file with {used_encoding} encoding.\n{str(e)}\n\nThis may not be a text file.",
+                QMessageBox.Cancel
+            )
+            return
 
         # Store the content in the editor
         self.setPlainText(content)
@@ -181,4 +227,4 @@ class FileLink:
             # Re-add the file to watcher so we keep listening for future changes
             if self._file_watcher is not None:
                 self._file_watcher.addPath(changed_path)
-        self._watch_file_changes = True
+        self._watch_file_changes = True

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/worker/languages/python.py

@@ -1,14 +1,15 @@
 from ..providers import jedi, codestral, ruff
 
 
-def complete(code, cursor_pos, path, multiline, full):
+def complete(code, cursor_pos, path, multiline, full, env_path):
     if full or multiline:
         codestral_completions = codestral.codestral_complete(
             code, cursor_pos, path=path, multiline=multiline)
     else:
         codestral_completions = []
     if not multiline:
-        jedi_completions = jedi.jedi_complete(code, cursor_pos, path=path)
+        jedi_completions = jedi.jedi_complete(code, cursor_pos, path=path,
+                                              env_path=env_path)
     else:
         jedi_completions = []
     # If there is at least one jedi completion, it is always insert at first.

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/worker/process.py

@@ -68,9 +68,11 @@ def main_worker_process_function(request_queue, result_queue):
                 path = request.get('path', None)
                 multiline = request.get('multiline', False)
                 full = request.get('full', False)
-                logger.info(f"Performing code completion: language='{language}', multiline={multiline}, path={path}")
+                env_path = request.get('env_path', None)
+                logger.info(f"Performing code completion: language='{language}', multiline={multiline}, path={path}, env_path={env_path}")
                 completions = worker_functions.complete(
-                    code, cursor_pos, path=path, multiline=multiline, full=full)
+                    code, cursor_pos, path=path, multiline=multiline, full=full,
+                    env_path=env_path)
             if not completions:
                 logger.info("No completions")
             else:
@@ -90,9 +92,10 @@ def main_worker_process_function(request_queue, result_queue):
             else:
                 code = request.get('code', '')
                 path = request.get('path', None)
-                logger.info(f"Performing calltip: language='{language}', path={path}")
+                env_path = request.get('env_path', None)
+                logger.info(f"Performing calltip: language='{language}', path={path}, env_path={env_path}")
                 signatures = worker_functions.calltip(
-                    code, cursor_pos, path=path)
+                    code, cursor_pos, path=path, env_path=env_path)
             if signatures is None:
                 logger.info("No calltip signatures. Sending result back.")
             else:

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.22}/pyqt_code_editor/worker/providers/jedi.py

@@ -20,7 +20,8 @@ def _signature_to_html(signature) -> str:
     return f"({sig_line}){return_hint}"
 
 
-def _prepare_jedi_script(code: str, cursor_position: int, path: str | None):
+def _prepare_jedi_script(code: str, cursor_position: int, path: str | None,
+                         env_path: str | None):
     """
     Prepare a Jedi Script object and calculate line_no/column_no from the
     given code and cursor_position. Returns (script, line_no, column_no).
@@ -32,15 +33,17 @@ def _prepare_jedi_script(code: str, cursor_position: int, path: str | None):
         column_no = cursor_position
     else:
         column_no = cursor_position - (last_newline_idx + 1)
-
     logger.info("Creating Jedi Script for path=%r at line=%d, column=%d",
              path, line_no, column_no)
-
-    script = jedi.Script(code, path=path)
+    # We explicitly indicate that the environment is safe, because we know that
+    # they come from the app itself
+    env = jedi.create_environment(env_path, safe=False) if env_path else None
+    script = jedi.Script(code, path=path, environment=env)
     return script, line_no, column_no
 
 
-def jedi_complete(code: str, cursor_position: int, path: str | None) -> list[str]:
+def jedi_complete(code: str, cursor_position: int, path: str | None,
+                  env_path: str | None = None) -> list[str]:
     """
     Perform Python-specific completion using Jedi. Returns a list of possible completions
     for the text at the given cursor position, or None if no completion is found.
@@ -57,7 +60,8 @@ def jedi_complete(code: str, cursor_position: int, path: str | None) -> list[str
     if code_up_to_cursor.rfind('#') > code_up_to_cursor.rfind('\n'):
         return []
     # Go Jedi!
-    script, line_no, column_no = _prepare_jedi_script(code, cursor_position, path)
+    script, line_no, column_no = _prepare_jedi_script(code, cursor_position,
+                                                      path, env_path)
     completions = script.complete(line=line_no, column=column_no)
     if not completions:
         return []
@@ -70,7 +74,8 @@ def jedi_complete(code: str, cursor_position: int, path: str | None) -> list[str
 
 def jedi_signatures(code: str, cursor_position: int, path: str | None,
                     multiline: bool = False, max_width: int = 40,
-                    max_lines: int = 10):
+                    max_lines: int = 10,
+                    env_path: str | None = None):
     """
     Retrieve function signatures (calltips) from Jedi given the current cursor position.
     Returns a list of strings describing each signature, or None if none.
@@ -84,7 +89,8 @@ def jedi_signatures(code: str, cursor_position: int, path: str | None,
         return None
 
     logger.info("Starting Jedi calltip request (multiline=%r).", multiline)
-    script, line_no, column_no = _prepare_jedi_script(code, cursor_position, path)
+    script, line_no, column_no = _prepare_jedi_script(code, cursor_position,
+                                                      path, env_path)
 
     signatures = script.get_signatures(line=line_no, column=column_no)
     if not signatures: