diff options
author | picomancer <pico-bitbucketpub-4mcdxm39-onlyham@picomancer.com> | 2013-10-03 02:04:16 -0400 |
---|---|---|
committer | picomancer <pico-bitbucketpub-4mcdxm39-onlyham@picomancer.com> | 2013-10-03 02:04:16 -0400 |
commit | c3367abc2c16cfa1bea37c92a6fac51fa372265d (patch) | |
tree | c65e20607e6e0390e1d1f9f15216c1fe59a3ef46 | |
parent | 6e71ee49f98e5fd748749599c56879fc031c28b7 (diff) | |
download | pygments-c3367abc2c16cfa1bea37c92a6fac51fa372265d.tar.gz |
java: Decrease priority of method regex to avoid parsing 'else if (' as method
-rw-r--r-- | pygments/lexers/jvm.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index ed4d257c..8b5d5964 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -38,11 +38,6 @@ class JavaLexer(RegexLexer): tokens = { 'root': [ - # method names - (r'^(\s*(?:[a-zA-Z_][a-zA-Z0-9_\.\[\]<>]*\s+)+?)' # return arguments - r'([a-zA-Z_][a-zA-Z0-9_]*)' # method name - r'(\s*)(\()', # signature start - bygroups(using(this), Name.Function, Text, Operator)), (r'[^\S\n]+', Text), (r'//.*?\n', Comment.Single), (r'/\*.*?\*/', Comment.Multiline), @@ -55,6 +50,11 @@ class JavaLexer(RegexLexer): r'transient|volatile)\b', Keyword.Declaration), (r'(boolean|byte|char|double|float|int|long|short|void)\b', Keyword.Type), + # method names + (r'^(\s*(?:[a-zA-Z_][a-zA-Z0-9_\.\[\]<>]*\s+)+?)' # return arguments + r'([a-zA-Z_][a-zA-Z0-9_]*)' # method name + r'(\s*)(\()', # signature start + bygroups(using(this), Name.Function, Text, Operator)), (r'(package)(\s+)', bygroups(Keyword.Namespace, Text)), (r'(true|false|null)\b', Keyword.Constant), (r'(class|interface)(\s+)', bygroups(Keyword.Declaration, Text), 'class'), |