diff options
| author | EricFromCanada <eric3knibbe@gmail.com> | 2013-02-10 22:34:43 -0500 |
|---|---|---|
| committer | EricFromCanada <eric3knibbe@gmail.com> | 2013-02-10 22:34:43 -0500 |
| commit | 9cb30b0fc7bc6330764734047a8619e2983c6e73 (patch) | |
| tree | 36837f08688b772ab715158556ef6caf597c2c97 | |
| parent | 63ba4d5e7b11340d9540d092c2cb2901e984b160 (diff) | |
| download | pygments-9cb30b0fc7bc6330764734047a8619e2983c6e73.tar.gz | |
better analyse_text methods to address issue #845
| -rw-r--r-- | pygments/lexers/templates.py | 12 | ||||
| -rw-r--r-- | pygments/lexers/web.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py index b3e70d05..ff4a0453 100644 --- a/pygments/lexers/templates.py +++ b/pygments/lexers/templates.py @@ -1657,7 +1657,7 @@ class LassoHtmlLexer(DelegatingLexer): super(LassoHtmlLexer, self).__init__(HtmlLexer, LassoLexer, **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) + rv = LassoLexer.analyse_text(text) - 0.01 if re.search(r'<\w+>', text, re.I): rv += 0.2 if html_doctype_matches(text): @@ -1683,9 +1683,9 @@ class LassoXmlLexer(DelegatingLexer): super(LassoXmlLexer, self).__init__(XmlLexer, LassoLexer, **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) + rv = LassoLexer.analyse_text(text) - 0.01 if looks_like_xml(text): - rv += 0.5 + rv += 0.4 return rv @@ -1707,8 +1707,8 @@ class LassoCssLexer(DelegatingLexer): super(LassoCssLexer, self).__init__(CssLexer, LassoLexer, **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) - if re.search(r'\w+:.+;', text): + rv = LassoLexer.analyse_text(text) - 0.05 + if re.search(r'\w+:.+?;', text): rv += 0.1 if 'padding:' in text: rv += 0.1 @@ -1736,7 +1736,7 @@ class LassoJavascriptLexer(DelegatingLexer): **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) + rv = LassoLexer.analyse_text(text) - 0.05 if 'function' in text: rv += 0.2 return rv diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index b3336cdd..38d61222 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -3340,12 +3340,12 @@ class LassoLexer(RegexLexer): rv = 0.0 if 'bin/lasso9' in text: rv += 0.8 - if re.search(r'<\?(=|lasso)', text, re.I): + if re.search(r'<\?(=|lasso)|\A\[', text, re.I): rv += 0.4 if re.search(r'local\(', text, re.I): rv += 0.4 - if re.search(r'\[\n|\?>', text): - rv += 0.4 + if '?>' in text: + rv += 0.1 return rv |