pyqt-code-editor 0.0.11__tar.gz → 0.0.13__tar.gz

{pyqt_code_editor-0.0.11 → pyqt_code_editor-0.0.13}/PKG-INFO

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

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.11'
+__version__ = '0.0.13'

{pyqt_code_editor-0.0.11 → pyqt_code_editor-0.0.13}/pyqt_code_editor/app.py

@@ -14,7 +14,7 @@ from .components.jupyter_console import JupyterConsole
 from .components.workspace_explorer import WorkspaceExplorer
 from .components.sigmund import Sigmund
 from .components.settings_panel import SettingsPanel
-from . import settings, watchdog
+from . import settings, watchdog, __version__
 from pyqt_code_editor.signal_router import signal_router
 
 logging.basicConfig(level=logging.INFO, force=True)
@@ -29,7 +29,7 @@ class MainWindow(QMainWindow):
         if not root_path:
             root_path = settings.current_folder
 
-        self.setWindowTitle("Sigmund Analyst")
+        self.setWindowTitle(f"Sigmund Analyst {__version__}")
         # The editor panel provides splittable editor tabs
         self._editor_panel = EditorPanel()
         self._editor_panel.open_folder_requested.connect(self._open_folder)

{pyqt_code_editor-0.0.11 → pyqt_code_editor-0.0.13}/pyqt_code_editor/components/find_in_files.py

@@ -1,10 +1,10 @@
 import os
 import multiprocessing
 from qtpy.QtWidgets import QDockWidget, QWidget, QVBoxLayout, QHBoxLayout, \
-    QLabel, QLineEdit, QCheckBox, QPushButton, QTreeWidget, QTreeWidgetItem, \
-    QAbstractItemView, QShortcut
+    QLineEdit, QCheckBox, QPushButton, QTreeWidget, QTreeWidgetItem, \
+    QAbstractItemView
 from qtpy.QtCore import Qt, QTimer, Signal
-from qtpy.QtGui import QKeySequence
+
 
 def search_in_files_worker(files, search_text, case_sensitive, whole_word, regex, output_queue):
     """

{pyqt_code_editor-0.0.11 → pyqt_code_editor-0.0.13}/pyqt_code_editor/mixins/base.py

@@ -128,12 +128,32 @@ class Base:
         self.modified = modified
         self.modification_changed.emit(self, modified)
         
-    def jump_to_line(self, line_number=0):
-        cursor = self.textCursor()
+    def jump_to_line(self, line_number: int = 0):
+        """
+        Jump to a specific line (0-based) in the QPlainTextEdit,
+        centre it in the viewport and select the whole line.
+        """
+        # Sanity-check the requested line number
+        if line_number < 0:
+            line_number = 0
+        max_line = self.document().blockCount() - 1
+        line_number = min(line_number, max_line)
+
+        cursor = QTextCursor(self.document())
+
+        # Move to the requested line
         cursor.movePosition(QTextCursor.Start)
-        cursor.movePosition(QTextCursor.Down, QTextCursor.MoveAnchor, line_number)
+        cursor.movePosition(QTextCursor.NextBlock, QTextCursor.MoveAnchor,
+                            line_number - 1)
+
+        # Select the whole line for visibility
+        cursor.select(QTextCursor.LineUnderCursor)
+
+        # Apply the cursor to the editor
         self.setTextCursor(cursor)
-        self.ensureCursorVisible()
+
+        # Scroll so the line sits roughly in the middle of the viewport
+        self.centerCursor()
 
     def update_theme(self):
         """Mixins can implement this to update the theme in response to font changes

{pyqt_code_editor-0.0.11 → pyqt_code_editor-0.0.13}/pyqt_code_editor/mixins/complete.py

@@ -1,6 +1,7 @@
 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 .. import settings
@@ -70,6 +71,8 @@ class Complete:
         pos = self.textCursor().position()
         if self._cm_paren_prefix is None or pos >= len(self._cm_paren_prefix):
             self._update_paren_prefix_cache()
+        if pos >= len(self._cm_paren_prefix):
+            return False
         return self._cm_paren_prefix[pos] > 0
     
     def _is_navigation_key(self, event):
@@ -445,6 +448,7 @@ class Complete:
         """
         Display the calltip as a small persistent widget below the cursor line,
         horizontally aligned with the cursor, so it doesn't obscure typed text.
+        If there's not enough space below, show it above the cursor instead.
         """
         if self._cm_calltip_widget.isVisible():
             logger.info("Calltip widget already visible, updating text.")
@@ -458,12 +462,33 @@ class Complete:
         # the text cursor relative to the editor's viewport.
         cr = self.cursorRect()
 
-        # Convert its bottom-left to global coordinates, then shift down
-        global_pos = self.mapToGlobal(cr.bottomLeft())
-        global_pos.setX(global_pos.x() + self.viewportMargins().left())
-        # global_pos.setY(global_pos.y() + cr.height())
-
+        # Get the screen geometry to check boundaries
+        screen = QApplication.primaryScreen()
+        screen_rect = screen.availableGeometry()
+    
+        # Calculate the calltip size
+        self._cm_calltip_widget.adjustSize()
+        calltip_height = self._cm_calltip_widget.height()
+    
+        # Convert cursor bottom-left to global coordinates
+        global_bottom_left = self.mapToGlobal(cr.bottomLeft())
+        global_bottom_left.setX(global_bottom_left.x() + self.viewportMargins().left())
+    
+        # Check if calltip would fit below the cursor
+        if global_bottom_left.y() + calltip_height > screen_rect.bottom():
+            # Not enough space below, show above cursor instead
+            global_pos = self.mapToGlobal(cr.topRight())
+            global_pos.setX(global_pos.x() + self.viewportMargins().left())
+            global_pos.setY(global_pos.y() - calltip_height)
+            logger.info("Positioning calltip above cursor due to screen boundaries.")
+        else:
+            # Enough space below, use bottom-left position
+            global_pos = global_bottom_left
+            logger.info("Positioning calltip below cursor.")
+    
+        print(f'intended position: {global_pos}')
         self._cm_calltip_widget.move(global_pos)
+        print(f'actual position: {self._cm_calltip_widget.pos()}')
         self._cm_calltip_widget.show()
 
     def closeEvent(self, event):