From a188c8e389a433b7d7ffcefb4ef5e2c27f8d4489 Mon Sep 17 00:00:00 2001 From: Sebastian Engel Date: Sat, 1 Jan 2022 21:13:57 +0100 Subject: Ws token livescript lexer --- pygments/lexers/javascript.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pygments/lexers/javascript.py') diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py index e35af2f5..bf57f65a 100644 --- a/pygments/lexers/javascript.py +++ b/pygments/lexers/javascript.py @@ -324,9 +324,9 @@ class LiveScriptLexer(RegexLexer): flags = re.DOTALL tokens = { 'commentsandwhitespace': [ - (r'\s+', Text), + (r'\s+', Whitespace), (r'/\*.*?\*/', Comment.Multiline), - (r'#.*?\n', Comment.Single), + (r'(#.*?)(\n)', bygroups(Comment.Single, Whitespace)), ], 'multilineregex': [ include('commentsandwhitespace'), @@ -367,10 +367,13 @@ class LiveScriptLexer(RegexLexer): r'decodeURIComponent|encodeURI|encodeURIComponent|' r'eval|isFinite|isNaN|parseFloat|parseInt|document|window|' r'globalThis|Symbol|Symbol|BigInt)\b', Name.Builtin), - (r'[$a-zA-Z_][\w.\-:$]*\s*[:=]\s', Name.Variable, - 'slashstartsregex'), - (r'@[$a-zA-Z_][\w.\-:$]*\s*[:=]\s', Name.Variable.Instance, - 'slashstartsregex'), + (r'([$a-zA-Z_][\w.\-:$]*)(\s*)([:=])(\s+)', + bygroups(Name.Variable, Whitespace, Operator, Whitespace), + 'slashstartsregex'), + (r'(@[$a-zA-Z_][\w.\-:$]*)(\s*)([:=])(\s+)', + bygroups(Name.Variable.Instance, Whitespace, Operator, + Whitespace), + 'slashstartsregex'), (r'@', Name.Other, 'slashstartsregex'), (r'@?[$a-zA-Z_][\w-]*', Name.Other, 'slashstartsregex'), (r'[0-9]+\.[0-9]+([eE][0-9]+)?[fd]?(?:[a-zA-Z_]+)?', Number.Float), -- cgit v1.2.1