update site-libs

krya · krya · commit 4e0c5bf54703 · 2012-06-24T19:42:42.000+03:00
diff --git a/libs/HTMLTreeParser.py b/libs/HTMLTreeParser.py
@@ -359,9 +359,10 @@ def finish_endtag(self, tag, loc):
         def handle_data(self, data):
             self._builder.data(data)
             
-        def handle_special(self, data, token_type):
+        def handle_special(self, data, token_type=None):
             # here's where we figure out if we've got a doctype
-            if token_type == 0x105: # from sgmlop.c
+            if (token_type == 0x105 or # from sgmlop.c
+                data and data.startswith("DOCTYPE")):
                 # we get everything inside <!...>
                 self.parse_doctype("<!%s>" % data)
 
diff --git a/libs/langinfo.py b/libs/langinfo.py
@@ -235,6 +235,17 @@ class TextLangInfo(LangInfo):
     filename_patterns = ["README", "COPYING", "LICENSE", "MANIFEST"]
 
 
+def _generateFallbackKoLangInfo(langinfo_db, koLangInst):
+    """Generate a LangInfo instance from the koILanguage instance."""
+    class FallbackKoLangInfo(LangInfo):
+        conforms_to_bases = ["Text"]
+        default_encoding = "utf-8"
+        def __init__(self, db, koLang):
+            LangInfo.__init__(self, db)
+            self.name = koLang.name
+            if koLang.defaultExtension:
+                self.exts = [koLang.defaultExtension]
+    return FallbackKoLangInfo(langinfo_db, koLangInst)
 
 #---- the Database
 
@@ -269,7 +280,7 @@ def langinfo_from_lang(self, lang):
             raise LangInfoError("no info on %r lang" % lang)
         return self._langinfo_from_norm_lang[norm_lang]
 
-    def langinfo_from_komodo_lang(self, komodo_lang):
+    def langinfo_from_komodo_lang(self, komodo_lang, tryFallback=True):
         """Return a langinfo for the given Komodo language name.
         
         There are some minor differences in Komodo language names and
@@ -283,6 +294,28 @@ def langinfo_from_komodo_lang(self, komodo_lang):
             return self._li_from_norm_komodo_lang[norm_komodo_lang]
         elif norm_komodo_lang in self._langinfo_from_norm_lang:
             return self._langinfo_from_norm_lang[norm_komodo_lang]
+        elif tryFallback:
+            # If a koILanguage exists for this lang, then create a fallback
+            # langinfo for it - this occurs when a user has defined an add-on or
+            # language, but they haven't made a langinfo.py for it.
+            try:
+                from xpcom import components
+            except ImportError:
+                pass # no xpcom
+            else:
+                langSvc = components.classes["@activestate.com/koLanguageRegistryService;1"] \
+                            .getService(components.interfaces.koILanguageRegistryService)
+                # Note: When the language does not exist, we get a fallback of
+                #       koILang.Text
+                koLang = langSvc.getLanguage(komodo_lang)
+                if koLang is not None and koLang.name in (komodo_lang, norm_komodo_lang):
+                    # Someone's defined a koILanguage for this lang - create
+                    # dummy langinfo for it.
+                    log.warn("no LangInfo class found for %r, creating a fallback for it",
+                             komodo_lang)
+                    self._langinfo_from_norm_lang[norm_komodo_lang] = _generateFallbackKoLangInfo(self, koLang)
+                    self._build_tables()
+                    return self.langinfo_from_komodo_lang(komodo_lang, tryFallback=False)
         raise LangInfoError("no info on %r komodo lang" % komodo_lang)
 
     def langinfo_from_emacs_mode(self, emacs_mode):
diff --git a/libs/langinfo_other.py b/libs/langinfo_other.py
@@ -112,6 +112,11 @@ class APDLLangInfo(LangInfo):
     conforms_to_bases = ["Text"]
     exts = [".mac"]
 
+class IniLangInfo(LangInfo):
+    name = "Ini"
+    conforms_to_bases = ["Text"]
+    exts = [".ini"]
+
 class POVRayLangInfo(LangInfo):
     """The "Persistence of Vision Raytracer"
     http://www.povray.org
diff --git a/libs/langinfo_prog.py b/libs/langinfo_prog.py
@@ -102,6 +102,10 @@ class PHPLangInfo(LangInfo):
     #      and the XML prolog encoding check.
 
     keywords = set([
+            # new to php 5.4
+            "insteadof", "trait",
+            # new to php 5.3
+            "e_deprecated", "e_user_deprecated", "php_maxpathlen",
             # existed in php4
             "bool", "boolean", "catch", "define", "double", "false", "float",
             "int", "integer", "null", "object", "parent", "real",
diff --git a/libs/langinfo_template.py b/libs/langinfo_template.py
@@ -55,6 +55,7 @@ class EJSLangInfo(LangInfo):
 class DjangoTemplateLangInfo(LangInfo):
     name = "Django Template"
     conforms_to_bases = ["Text"]
+    exts = [".django.html"]
     section_regexes = [
         ("import", re.compile(r'\{\%[ \t]+(load\b.*?)\%\}')),
         ("class", re.compile(r'\{\%[ \t]+(block\b.*?)\%\}')),
@@ -70,6 +71,10 @@ class DjangoHTMLTemplateLangInfo(DjangoTemplateLangInfo):
         ],
     }
 
+class TwigTemplateLangInfo(DjangoTemplateLangInfo):
+    name = "Twig"
+    exts = [".twig"]
+
 class DjangoXHTMLTemplateLangInfo(DjangoTemplateLangInfo):
     name = "Django XHTML Template"
     specialization_hints_from_lang = {
