diff options
| author | Georg Brandl <georg@python.org> | 2012-08-19 11:38:13 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-08-19 11:38:13 +0200 |
| commit | 1b4226f749a68bc3f3db427f441ed2aa207d2f36 (patch) | |
| tree | 5b1733161df8ad42a5ebd83f01978c90f228c774 /pygments/lexers/jvm.py | |
| parent | 906042e7728e5be2826bb0aac106660975e3e7ab (diff) | |
| download | pygments-1b4226f749a68bc3f3db427f441ed2aa207d2f36.tar.gz | |
Closes #771: Java: allow generics <> characters in return argument type
Diffstat (limited to 'pygments/lexers/jvm.py')
| -rw-r--r-- | pygments/lexers/jvm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index e8e8ed7a..696bb1a1 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -39,9 +39,9 @@ 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 + (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), |