diff options
| author | MadcapJake <madcap.russo@gmail.com> | 2015-09-27 03:08:17 -0500 |
|---|---|---|
| committer | MadcapJake <madcap.russo@gmail.com> | 2015-09-27 03:08:17 -0500 |
| commit | 88627c9a5973f7b664448f0b166273dbf3b87db2 (patch) | |
| tree | 558f9b9a6d10e757e2f0c72ffafde9c7f390aef3 /pygments/lexers/javascript.py | |
| parent | 9be0fa902983bd68b31e82af641f364a32966277 (diff) | |
| download | pygments-88627c9a5973f7b664448f0b166273dbf3b87db2.tar.gz | |
Fix decrement op, op-assignment, and range op
Diffstat (limited to 'pygments/lexers/javascript.py')
| -rw-r--r-- | pygments/lexers/javascript.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py index 941b8d91..a800ae02 100644 --- a/pygments/lexers/javascript.py +++ b/pygments/lexers/javascript.py @@ -1229,6 +1229,8 @@ class EarlGreyLexer(RegexLexer): prefix=r'(?<=\s|\[)', suffix=r'(?![\w\$\-])'), Operator.Word), (r'[\*@]?->', Name.Function), + (r'[+\-*/~^<>%&|?!@#.]*=', Operator.Word), + (r'\.{2,3}', Operator.Word), # Range Operator (r'([+*/~^<>&|?!]+)|([#\-](?=\s))|@@+(?=\s)|=+', Operator), (r'(?<![\w\$\-])(var|let)(?:[^\w\$])', Keyword.Declaration), include('keywords'), @@ -1265,7 +1267,7 @@ class EarlGreyLexer(RegexLexer): bygroups(Text.Whitespace, Text)), ], 'assignment': [ - (r'(\.)?([a-zA-Z$_](?:[a-zA-Z$0-9_-]*[a-zA-Z$0-9_])?)(?=\s+\=\s)', + (r'(\.)?([a-zA-Z$_](?:[a-zA-Z$0-9_-]*[a-zA-Z$0-9_])?)(?=\s+[+\-*/~^<>%&|?!@#.]*\=\s)', bygroups(Punctuation, Name.Variable)) ], 'errors': [ @@ -1352,7 +1354,7 @@ class EarlGreyLexer(RegexLexer): ], 'name': [ (r'@([a-zA-Z$_](?:[a-zA-Z$0-9_-]*[a-zA-Z$0-9_])?)', Name.Variable.Instance), - (r'([a-zA-Z$_](?:[a-zA-Z$0-9_-]*[a-zA-Z$0-9_])?)', Name.Symbol) + (r'([a-zA-Z$_](?:[a-zA-Z$0-9_-]*[a-zA-Z$0-9_])?)(\+\+|\-\-)?', bygroups(Name.Symbol, Operator.Word)) ], 'tuple': [ (r'#[a-zA-Z_][a-zA-Z_\-0-9]*(?=[\s\{\(,;\n])', Name.Namespace) @@ -1398,7 +1400,7 @@ class EarlGreyLexer(RegexLexer): (r'[^\`]+', String.Backtick), ], 'numbers': [ - (r'\d+\.\d*([eE][+-]?[0-9]+)?', Number.Float), + (r'\d+\.(?!\.)\d*([eE][+-]?[0-9]+)?', Number.Float), (r'\d+[eE][+-]?[0-9]+', Number.Float), (r'8r[0-7]+', Number.Oct), (r'2r[01]+', Number.Bin), |