diff options
| author | Georg Brandl <georg@python.org> | 2019-12-09 12:43:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 12:43:38 +0100 |
| commit | c63083d774bf9495aa2a98cd8e3329158b663072 (patch) | |
| tree | 0aac0ce5f71fdabe4e6cb89cf03533684a154857 /pygments/lexers/javascript.py | |
| parent | da310ba1bf547202dcc8224a9f2ce102aa926abf (diff) | |
| parent | 720e4928f40d83c4c1881ac3c5c6c888caa04bc5 (diff) | |
| download | pygments-git-c63083d774bf9495aa2a98cd8e3329158b663072.tar.gz | |
Merge pull request #1310 from pygments/815/MartijnBraam/dmesg
This commit adds a lexer for linux kernel logs as outputted by `dmesg`
Diffstat (limited to 'pygments/lexers/javascript.py')
| -rw-r--r-- | pygments/lexers/javascript.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py index e9cf6722..0e418535 100644 --- a/pygments/lexers/javascript.py +++ b/pygments/lexers/javascript.py @@ -259,11 +259,11 @@ class LiveScriptLexer(RegexLexer): (r'//', String.Regex, ('#pop', 'multilineregex')), (r'/(?! )(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/' r'([gim]+\b|\B)', String.Regex, '#pop'), + (r'/', Operator, '#pop'), default('#pop'), ], 'root': [ - # this next expr leads to infinite loops root -> slashstartsregex - # (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'), + (r'^(?=\s|/)', Text, 'slashstartsregex'), include('commentsandwhitespace'), (r'(?:\([^()]+\))?[ ]*[~-]{1,2}>|' r'(?:\(?[^()\n]+\)?)?[ ]*<[~-]{1,2}', Name.Function), @@ -1060,7 +1060,7 @@ class CoffeeScriptLexer(RegexLexer): # This isn't really guarding against mishighlighting well-formed # code, just the ability to infinite-loop between root and # slashstartsregex. - (r'/', Operator), + (r'/', Operator, '#pop'), default('#pop'), ], 'root': [ |