summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--pygments/lexers/compiled.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7d27fec7..77328c69 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,8 @@ Version 1.5
- Fix Lua "class" highlighting: it does not have classes (#665).
+- Fix degenerate regex in Scala lexer (#671).
+
Version 1.4
-----------
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,