summaryrefslogtreecommitdiff
path: root/pygments/lexers/javascript.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2015-10-13 11:34:10 -0700
committerTim Hatch <tim@timhatch.com>2015-10-13 11:34:10 -0700
commitfe5643e7d13809ca6eae7ec7e95c03bea6012226 (patch)
treeeb9cdcfe0a2dadff5a76f4bcc96acb2a72a1f160 /pygments/lexers/javascript.py
parent483deba6920adf5c56a318acffb88c890656bc70 (diff)
parent27e304015dc3882ddb59122e168765775fb0e014 (diff)
downloadpygments-fe5643e7d13809ca6eae7ec7e95c03bea6012226.tar.gz
Merged in hanachin/pygments-main/add-ruby-filename (pull request #450)
Add Gemfile to RubyLexer filenames
Diffstat (limited to 'pygments/lexers/javascript.py')
-rw-r--r--pygments/lexers/javascript.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py
index fa7dca41..7dcfbb4b 100644
--- a/pygments/lexers/javascript.py
+++ b/pygments/lexers/javascript.py
@@ -36,7 +36,7 @@ class JavascriptLexer(RegexLexer):
name = 'JavaScript'
aliases = ['js', 'javascript']
- filenames = ['*.js', ]
+ filenames = ['*.js', '*.jsm', ]
mimetypes = ['application/javascript', 'application/x-javascript',
'text/x-javascript', 'text/javascript', ]
@@ -60,7 +60,7 @@ class JavascriptLexer(RegexLexer):
(r'\n', Text, '#pop')
],
'root': [
- (r'\A#! ?/.*?\n', Comment), # shebang lines are recognized by node.js
+ (r'\A#! ?/.*?\n', Comment.Hashbang), # recognized by node.js
(r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
include('commentsandwhitespace'),
(r'\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|'