pyqt-code-editor 0.0.17__tar.gz → 0.0.19__tar.gz

{pyqt_code_editor-0.0.17 → pyqt_code_editor-0.0.19}/PKG-INFO

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

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.17'
+__version__ = '0.0.19'

{pyqt_code_editor-0.0.17 → pyqt_code_editor-0.0.19}/pyqt_code_editor/components/settings_panel.py

@@ -25,8 +25,9 @@ class SettingsWidget(QWidget):
     types are int, bool and str.    
     """
     
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, visible_categories=None):
         super().__init__(parent)
+        self._visible_categories = visible_categories
         self.setup_ui()
         self.load_settings()
         
@@ -45,7 +46,9 @@ class SettingsWidget(QWidget):
         self.scroll_area = QScrollArea()
         self.scroll_area.setWidgetResizable(True)
         self.scroll_widget = QWidget()
-        self.scroll_layout = QVBoxLayout(self.scroll_widget)
+        self.scroll_layout = QFormLayout(self.scroll_widget)
+        self.scroll_layout.setContentsMargins(0, 0, 0, 0)
+        self.scroll_area.setFrameStyle(QScrollArea.NoFrame)
         self.scroll_area.setWidget(self.scroll_widget)
         
         # Add scroll area to main layout
@@ -72,25 +75,24 @@ class SettingsWidget(QWidget):
         
         # Create a form for each category
         for category, setting_names in categories.items():
-            if not setting_names:
+            if self._visible_categories is not None and \
+                    category not in self._visible_categories:
                 continue
-                
+            if not setting_names:
+                continue                
             group_box = QGroupBox(category)
-            form_layout = QFormLayout(group_box)
-            form_layout.setContentsMargins(*themes.OUTER_CONTENT_MARGINS)
-            
+            form_layout = QFormLayout(group_box)            
             for setting_name in setting_names:
                 value = getattr(settings, setting_name)
                 widget = self.create_widget_for_setting(setting_name, value)
                 
                 if widget:
-                    form_layout.addRow(setting_name.replace('_', ' ').title() + ":", widget)
+                    form_layout.addRow(
+                        setting_name.replace('_', ' ').title() + ":", widget)
                     self.setting_widgets[setting_name] = widget
             
-            self.scroll_layout.addWidget(group_box)
+            self.scroll_layout.addRow(group_box, None)
         
-        self.scroll_layout.addStretch()
-    
     def create_widget_for_setting(self, setting_name, value):
         """Create appropriate widget based on setting type"""
         logger.debug(f"Creating widget for setting {setting_name} with value {value}")

{pyqt_code_editor-0.0.17 → pyqt_code_editor-0.0.19}/pyqt_code_editor/themes.py

@@ -31,6 +31,6 @@ THEMES = {
     }
 }
 
-OUTER_CONTENT_MARGINS = [6, 6, 6, 6]
+OUTER_CONTENT_MARGINS = [12, 12, 12, 12]
 HORIZONTAL_SPACING = 6
 VERTICAL_SPACING = 12

{pyqt_code_editor-0.0.17 → pyqt_code_editor-0.0.19}/pyqt_code_editor/utils/languages/python/_mask_str_in_code.py

@@ -40,10 +40,17 @@ def mask_str_in_code(code: str, mask_char: str = 'X') -> str:
     """
     # First handle f-strings separately using regex
     # This regex matches f-strings with their content
-    fstring_pattern = r'(f)(""".*?"""|\'\'\'.*?\'\'\'|".*?"|\'.*?\')'
+    # Make sure 'f' is preceded by something that indicates start of a new token
+    fstring_pattern = r'(?:^|[^a-zA-Z0-9_"\'])(f)(""".*?"""|\'\'\'.*?\'\'\'|".*?"|\'.*?\')'
     
     def mask_fstring(match):
-        prefix = match.group(1)
+        # Get the character before 'f' (if any)
+        full_match = match.group(0)
+        prefix_char = ''
+        if not full_match.startswith('f'):
+            prefix_char = full_match[0]
+            
+        prefix = match.group(1)  # 'f'
         full_string = match.group(2)
         quote = ''
         content = ''
@@ -57,7 +64,7 @@ def mask_str_in_code(code: str, mask_char: str = 'X') -> str:
         
         # Mask everything in f-string content
         masked_content = mask_char * len(content)
-        return prefix + quote + masked_content + quote
+        return prefix_char + prefix + quote + masked_content + quote
     
     # Apply f-string masking
     code = re.sub(fstring_pattern, mask_fstring, code, flags=re.DOTALL)
@@ -76,7 +83,6 @@ def mask_str_in_code(code: str, mask_char: str = 'X') -> str:
             if token.type == tokenize.STRING:
                 # Get the string content including quotes
                 string_value = token.string
-                
                 # Skip if it looks like an f-string (already handled)
                 if string_value.startswith(('f"', "f'", 'f"""', "f'''")):
                     # Add any code between last token and this one
@@ -182,4 +188,4 @@ def mask_str_in_code(code: str, mask_char: str = 'X') -> str:
             masked_parts.append('\n')
             masked_parts.extend('\n'.join(lines[end_line:]))
     
-    return ''.join(masked_parts)
+    return ''.join(masked_parts)