summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEricFromCanada <eric3knibbe@gmail.com>2012-08-16 22:05:49 -0400
committerEricFromCanada <eric3knibbe@gmail.com>2012-08-16 22:05:49 -0400
commitca48c5207ba1e6b130112e86bd315cdd11084280 (patch)
tree9ca1ab8840aa3f72dd9d116e5c5eb046b9ce3910
parent98a0a953acd3f069975ee0b615b22daae2a16451 (diff)
downloadpygments-ca48c5207ba1e6b130112e86bd315cdd11084280.tar.gz
fixing up language autodetection (only seems to work on extensionless files)
-rw-r--r--pygments/lexers/templates.py18
-rw-r--r--pygments/lexers/web.py2
2 files changed, 14 insertions, 6 deletions
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
index 1f9effef..6c55edbf 100644
--- a/pygments/lexers/templates.py
+++ b/pygments/lexers/templates.py
@@ -1653,7 +1653,7 @@ class LassoHtmlLexer(DelegatingLexer):
super(LassoHtmlLexer, self).__init__(HtmlLexer, LassoLexer, **options)
def analyse_text(text):
- rv = LassoLexer.analyse_text(text) - 0.01
+ rv = LassoLexer.analyse_text(text)
if re.search(r'<\w+>', text, re.I):
rv += 0.2
if html_doctype_matches(text):
@@ -1678,9 +1678,9 @@ class LassoXmlLexer(DelegatingLexer):
super(LassoXmlLexer, self).__init__(XmlLexer, LassoLexer, **options)
def analyse_text(text):
- rv = LassoLexer.analyse_text(text) - 0.01
+ rv = LassoLexer.analyse_text(text)
if looks_like_xml(text):
- rv += 0.4
+ rv += 0.5
return rv
@@ -1700,7 +1700,12 @@ class LassoCssLexer(DelegatingLexer):
super(LassoCssLexer, self).__init__(CssLexer, LassoLexer, **options)
def analyse_text(text):
- return LassoLexer.analyse_text(text) - 0.05
+ rv = LassoLexer.analyse_text(text)
+ if re.search(r'\w+:.+;', text):
+ rv += 0.1
+ if 'padding:' in text:
+ rv += 0.1
+ return rv
class LassoJavascriptLexer(DelegatingLexer):
@@ -1722,4 +1727,7 @@ class LassoJavascriptLexer(DelegatingLexer):
**options)
def analyse_text(text):
- return LassoLexer.analyse_text(text) - 0.05
+ rv = LassoLexer.analyse_text(text)
+ if 'function' in text:
+ rv += 0.2
+ return rv
diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py
index fb44c48f..75210b16 100644
--- a/pygments/lexers/web.py
+++ b/pygments/lexers/web.py
@@ -3048,7 +3048,7 @@ class LassoLexer(RegexLexer):
def analyse_text(text):
rv = 0.0
- if re.search(r'^#!.+lasso9\b', text):
+ if 'bin/lasso9' in text:
rv += 0.8
if re.search(r'<\?(=|lasso)', text, re.I):
rv += 0.4