Syntax highlighting: Fix language-name parsing

Author: smathot

pyqt_code_editor/syntax_highlighters/syntax_highlighter.py

@@ -4,20 +4,20 @@
 logging.basicConfig(level=logging.INFO, force=True)
 logger = logging.getLogger(__name__)
 module_cache = {}
-# Some lexers have names that are not recognized by get_lexer_by_name(), which
-# seems like an issue with pygments. To catch this, here we explicitly rename.
-LANGUAGE_MAP = {
-    'javascript+genshi text': 'javascript+genshi'
-}
 
+# Some lexers have weird names that are not recognized by get_lexer_by_name().
+# Often this seems to be a matter of discarding a suffix after a space or /
+# This may not be a foolproof solution.
+LANGUAGE_SEPARATORS = ' ', '/'
 
-def create_syntax_highlighter(language, *args, **kwargs):    
-    if language in LANGUAGE_MAP:
-        logger.info(f'mapping {language} to {LANGUAGE_MAP[language]}')
-        language = LANGUAGE_MAP[language]
+def create_syntax_highlighter(language, *args, **kwargs):
+    for ch in LANGUAGE_SEPARATORS:
+        if ch in language:
+            logger.info(f'mapping {language} to {language[:language.find(ch)]}')
+            language = language[:language.find(ch)]
     try:        
         lexer = get_lexer_by_name(language)
-    except:
+    except Exception:
         lexer = get_lexer_by_name('markdown')
     if language not in module_cache:
         try: