summaryrefslogtreecommitdiff
path: root/pygments/lexers/javascript.py
diff options
context:
space:
mode:
authorSebastian Engel <dev@sebastianengel.eu>2022-01-01 20:23:31 +0100
committerSebastian Engel <dev@sebastianengel.eu>2022-01-06 18:21:32 +0100
commit0660dfd627879f46e5077417641bf646aa298111 (patch)
tree1d5a3ae844085672f6f2f1d81c7c7ac8801723f2 /pygments/lexers/javascript.py
parent88efc38bed60006222b3f1c11aca33fc2c07af18 (diff)
downloadpygments-git-0660dfd627879f46e5077417641bf646aa298111.tar.gz
Modernize Whitespace token in lexer javascript
Diffstat (limited to 'pygments/lexers/javascript.py')
-rw-r--r--pygments/lexers/javascript.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py
index 7ddd1148..5f359afe 100644
--- a/pygments/lexers/javascript.py
+++ b/pygments/lexers/javascript.py
@@ -13,7 +13,7 @@ import re
from pygments.lexer import bygroups, combined, default, do_insertions, include, \
inherit, Lexer, RegexLexer, this, using, words
from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
- Number, Punctuation, Other, Generic
+ Number, Punctuation, Other, Generic, Whitespace
from pygments.util import get_bool_opt
import pygments.unistring as uni
@@ -46,9 +46,9 @@ class JavascriptLexer(RegexLexer):
tokens = {
'commentsandwhitespace': [
- (r'\s+', Text),
+ (r'\s+', Whitespace),
(r'<!--', Comment),
- (r'//.*?\n', Comment.Single),
+ (r'//.*?$', Comment.Single),
(r'/\*.*?\*/', Comment.Multiline)
],
'slashstartsregex': [
@@ -59,10 +59,10 @@ class JavascriptLexer(RegexLexer):
default('#pop')
],
'badregex': [
- (r'\n', Text, '#pop')
+ (r'\n', Whitespace, '#pop')
],
'root': [
- (r'\A#! ?/.*?\n', Comment.Hashbang), # recognized by node.js
+ (r'\A#! ?/.*?$', Comment.Hashbang), # recognized by node.js
(r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
include('commentsandwhitespace'),
@@ -110,7 +110,7 @@ class JavascriptLexer(RegexLexer):
# Match stuff like: super(argument, list)
(r'(super)(\s*)(\([\w,?.$\s]+\s*\))',
- bygroups(Keyword, Text), 'slashstartsregex'),
+ bygroups(Keyword, Whitespace), 'slashstartsregex'),
# Match stuff like: function() {...}
(r'([a-zA-Z_?.$][\w?.$]*)(?=\(\) \{)', Name.Other, 'slashstartsregex'),