diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-06-04 16:11:02 -0700 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-06-04 16:11:02 -0700 |
| commit | fa154d6c41ab291e63371399e9f5b48cf9b6a69a (patch) | |
| tree | a96e88968eac4244a40965db6f70311435dcb695 /pygments/lexers/_mapping.py | |
| parent | cd003d73b5ef77b8b00ccd240af64b724b12e1db (diff) | |
| parent | a8fa6daa37b247251dde54e40f8d8feb863eddfe (diff) | |
| download | pygments-fa154d6c41ab291e63371399e9f5b48cf9b6a69a.tar.gz | |
Merged in malept/pygments/yaml+jinja-lexer (pull request #365)
Add YAML+Jinja lexer
Diffstat (limited to 'pygments/lexers/_mapping.py')
| -rw-r--r-- | pygments/lexers/_mapping.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 505baf2c..70159bdb 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -352,6 +352,7 @@ LEXERS = { 'XmlSmartyLexer': ('pygments.lexers.templates', 'XML+Smarty', ('xml+smarty',), (), ('application/xml+smarty',)), 'XsltLexer': ('pygments.lexers.web', 'XSLT', ('xslt',), ('*.xsl', '*.xslt', '*.xpl'), ('application/xsl+xml', 'application/xslt+xml')), 'XtendLexer': ('pygments.lexers.jvm', 'Xtend', ('xtend',), ('*.xtend',), ('text/x-xtend',)), + 'YamlJinjaLexer': ('pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls',), ('text/x-yaml+jinja', 'text/x-sls')), 'YamlLexer': ('pygments.lexers.text', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)), 'ZephirLexer': ('pygments.lexers.web', 'Zephir', ('zephir',), ('*.zep',), ()), } |