summaryrefslogtreecommitdiff
path: root/pygments
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-06-18 10:28:37 +0200
committerGeorg Brandl <georg@python.org>2011-06-18 10:28:37 +0200
commit23c0e184ff920e6093035d39b8c4cb3af41a00c3 (patch)
treebbc27f4cd057dd960ddd04fc9241296b30f8cf3a /pygments
parenta87cf17e0fd30a09aba385ad4bda8cc866d34c97 (diff)
downloadpygments-23c0e184ff920e6093035d39b8c4cb3af41a00c3.tar.gz
Fix degenerate regex in Scala lexer (#671).
Diffstat (limited to 'pygments')
-rw-r--r--pygments/lexers/compiled.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py
index 2945be98..bb8327b9 100644
--- a/pygments/lexers/compiled.py
+++ b/pygments/lexers/compiled.py
@@ -1136,7 +1136,7 @@ class ScalaLexer(RegexLexer):
(r'(true|false|null)\b', Keyword.Constant),
(r'(import|package)(\s+)', bygroups(Keyword, Text), 'import'),
(r'(type)(\s+)', bygroups(Keyword, Text), 'type'),
- (r'"""(?:.|\n)*?"""', String),
+ (r'""".*?"""', String),
(r'"(\\\\|\\"|[^"])*"', String),
(ur"'\\.'|'[^\\]'|'\\u[0-9a-f]{4}'", String.Char),
# (ur'(\.)(%s|%s|`[^`]+`)' % (idrest, op), bygroups(Operator,