pyqt-code-editor 0.0.3__tar.gz → 0.0.5__tar.gz

{pyqt_code_editor-0.0.3 → pyqt_code_editor-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqt_code_editor
-Version: 0.0.3
+Version: 0.0.5
 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.3 → pyqt_code_editor-0.0.5}/pyqt_code_editor/__init__.py

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.3'
+__version__ = '0.0.5'

{pyqt_code_editor-0.0.3 → pyqt_code_editor-0.0.5}/pyqt_code_editor/_settings.py

@@ -57,23 +57,10 @@ class Settings(QObject):
     # Signal emitted when any setting changes: (setting_name, new_value)
     setting_changed = Signal(str, object)
     
-    # Singleton instance
-    _instance = None
-    
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super(Settings, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-    
-    def __init__(self):
-        if self._initialized:
-            return
-        
+    def __init__(self):        
         super().__init__()
         self._values = {}
         self._qsettings = QSettings("cogscinl", "Sigmund Analyst")
-        self._initialized = True
         logger.info("Initializing Settings manager")
         self._load_settings()
     

{pyqt_code_editor-0.0.3 → pyqt_code_editor-0.0.5}/pyqt_code_editor/app.py

@@ -3,7 +3,7 @@ import sys
 import logging
 from qtpy.QtWidgets import QMainWindow, QShortcut, QMessageBox, \
     QDockWidget, QToolBar, QAction, QApplication
-from qtpy.QtCore import Qt, QByteArray, QSize
+from qtpy.QtCore import Qt, QSize
 from qtpy.QtGui import QKeySequence
 import qtawesome as qta
 from .widgets import QuickOpenFileDialog

{pyqt_code_editor-0.0.3 → pyqt_code_editor-0.0.5}/pyqt_code_editor/components/sigmund.py

@@ -1,13 +1,40 @@
 from sigmund_qtwidget.sigmund_widget import SigmundWidget
 from ..widgets import Dock
 from .. import watchdog
+import textwrap
 import logging
-logging.basicConfig(level=logging.debug)
+logging.basicConfig(level=logging.INFO, force=True)
+logger = logging.getLogger(__name__)
 
 
 class EditorWorkspace:
     def __init__(self, editor_panel):
         self._editor_panel = editor_panel
+        self._indentation = ''
+        
+    def _get_indentation(self, content):
+        dedented = textwrap.dedent(content)
+        lines = content.splitlines()
+        dedented_lines = dedented.splitlines()
+    
+        for original_line, dedented_line in zip(lines, dedented_lines):
+            # Skip empty lines
+            if original_line.strip():
+                # Count leading whitespace
+                orig_leading = len(original_line) - len(original_line.lstrip(' \t'))
+                ded_leading = len(dedented_line) - len(dedented_line.lstrip(' \t'))
+                # The difference should be the indentation sequence
+                indentation_length = orig_leading - ded_leading
+                if indentation_length > 0:
+                    return original_line[:indentation_length]
+                return ""
+        # If no non-empty lines, return no indentation
+        return ""
+        
+    def prepare(self, content):
+        if content is None:
+            return content
+        return textwrap.indent(content, self._indentation)                
         
     @property
     def _editor(self):
@@ -33,8 +60,12 @@ class EditorWorkspace:
     def get(self):
         text_cursor = self._editor.textCursor()
         if text_cursor.hasSelection():
-            return self._normalize_line_breaks(text_cursor.selectedText()), self._editor.code_editor_language
-        return self._editor.toPlainText(), self._editor.code_editor_language
+            content = self._normalize_line_breaks(text_cursor.selectedText())
+        else:
+            content = self._editor.toPlainText()
+        self._indentation = self._get_indentation(content)
+        logger.info(f'content was indented by "{self._indentation}"')        
+        return content, self._editor.code_editor_language
     
     def set(self, content, language):
         text_cursor = self._editor.textCursor()
@@ -51,8 +82,6 @@ class EditorWorkspace:
         else:
             editor_content = self._editor.toPlainText()
         
-        if not content:
-            return False
         if content in (editor_content, self.strip_content(editor_content)):
             return False
         return True
@@ -70,13 +99,14 @@ class Sigmund(Dock):
         workspace = EditorWorkspace(editor_panel)
         self.sigmund_widget = SigmundWidget(self)
         self.sigmund_widget.set_workspace_manager(workspace)
-        self.sigmund_widget.start_server()
-        watchdog.register_subprocess(self.sigmund_widget.server_pid)
         self.setWidget(self.sigmund_widget)
-        self.visibilityChanged.connect(self._on_visibility_changed)
 
-    def _on_visibility_changed(self, visible):
+    def setVisible(self, visible):
         if visible:
+            logger.info('starting sigmund connector')
             self.sigmund_widget.start_server()
+            watchdog.register_subprocess(self.sigmund_widget.server_pid)
         else:
+            logger.info('stopping sigmund connector')
             self.sigmund_widget.stop_server()
+        super().setVisible(visible)