diff options
| author | Tim Hatch <tim@timhatch.com> | 2015-10-16 19:01:32 -0700 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2015-10-16 19:01:32 -0700 |
| commit | a8a57c9257af61cffbc098701392b4f62c2f5c50 (patch) | |
| tree | 51648f63a088403cbfdbe2c78bf49a20f26f67ef | |
| parent | 1cf28f96951c1ac58353800840af45940b3952a9 (diff) | |
| download | pygments-a8a57c9257af61cffbc098701392b4f62c2f5c50.tar.gz | |
Fixes #1139: Correctly order symbol and char literals in ScalaLexer
| -rw-r--r-- | pygments/lexers/jvm.py | 2 | ||||
| -rw-r--r-- | tests/examplefiles/char.scala | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index 4d3c9159..2a4909c8 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -252,7 +252,6 @@ class ScalaLexer(RegexLexer): 'root': [ # method names (r'(class|trait|object)(\s+)', bygroups(Keyword, Text), 'class'), - (u"'%s" % idrest, Text.Symbol), (r'[^\S\n]+', Text), (r'//.*?\n', Comment.Single), (r'/\*', Comment.Multiline, 'comment'), @@ -271,6 +270,7 @@ class ScalaLexer(RegexLexer): (r'""".*?"""(?!")', String), (r'"(\\\\|\\"|[^"])*"', String), (r"'\\.'|'[^\\]'|'\\u[0-9a-fA-F]{4}'", String.Char), + (u"'%s" % idrest, Text.Symbol), (r'[fs]"""', String, 'interptriplestring'), # interpolated strings (r'[fs]"', String, 'interpstring'), # interpolated strings (r'raw"(\\\\|\\"|[^"])*"', String), # raw strings diff --git a/tests/examplefiles/char.scala b/tests/examplefiles/char.scala new file mode 100644 index 00000000..0032612f --- /dev/null +++ b/tests/examplefiles/char.scala @@ -0,0 +1,4 @@ +'symbol +'a' +'\u1234' +'\n' |