pyqt-code-editor 0.0.41__tar.gz → 0.0.43__tar.gz

{pyqt_code_editor-0.0.41 → pyqt_code_editor-0.0.43}/PKG-INFO

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

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.41'
+__version__ = '0.0.43'

{pyqt_code_editor-0.0.41 → pyqt_code_editor-0.0.43}/pyqt_code_editor/_settings.py

@@ -93,7 +93,7 @@ class Settings(QObject):
     shortcut_split_horizontally = SettingProperty('Ctrl+Shift+H', "Shortcuts")
     shortcut_split_vertically = SettingProperty('Ctrl+Shift+V', "Shortcuts")
     shortcut_quick_open_file = SettingProperty('Ctrl+P', "Shortcuts")
-    shortcut_symbols = SettingProperty('Ctrl+R', "Shortcuts")
+    shortcut_symbols = SettingProperty('Ctrl+L', "Shortcuts")
     shortcut_previous_tab = SettingProperty('Ctrl+Shift+Tab', "Shortcuts")
     shortcut_close_all_tabs = SettingProperty('Ctrl+Shift+W', "Shortcuts")
     shortcut_close_other_tabs = SettingProperty('Ctrl+Alt+W', "Shortcuts")

{pyqt_code_editor-0.0.41 → pyqt_code_editor-0.0.43}/pyqt_code_editor/code_editors/code_editors.py

@@ -18,18 +18,22 @@ def create_editor(path=None, language=None, *args, **kwargs):
         else:
             language = utils.guess_language_from_path(path)
             language = LANGUAGE_MAP.get(language, language)
+    # The language is determined by the pygment lexer, and can be something like
+    # javascript+genshi. This is useful for the highlighter, but for the editor
+    # module we only use the main language.
+    module_name = language.lower().split('+')[0]
     # Load the editor module depending on the language. We store the
     # imported module in a cache for efficiency
-    if language not in editor_module_cache:
+    if module_name not in editor_module_cache:
         try:
             editor_module = importlib.import_module(
-                f".languages.{language}", package=__package__)
+                f".languages.{module_name}", package=__package__)
         except ImportError:
             from .languages import generic as editor_module
-            logger.info(f'failed to load editor module for {language}, falling back to generic')
+            logger.info(f'failed to load editor module for {module_name}, falling back to generic')
         else:
-            logger.info(f'loaded editor module for {language}')
-        editor_module_cache[language] = editor_module
+            logger.info(f'loaded editor module for {module_name}')
+        editor_module_cache[module_name] = editor_module
     else:
         editor_module = editor_module_cache[language]
     editor = editor_module.Editor(*args, language=language, **kwargs)

pyqt_code_editor-0.0.43/pyqt_code_editor/code_editors/languages/javascript.py

@@ -0,0 +1,5 @@
+from .generic import Editor as GenericEditor
+
+
+class Editor(GenericEditor):    
+    code_editor_comment_string = '// '