Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This completely rewrites the Django language definition. It's now based on markup-templating.
- Loading branch information
1 parent
af67c32
commit f246748
Showing
19 changed files
with
652 additions
and
111 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,60 @@ | ||
| // Django/Jinja2 syntax definition for Prism.js <http://prismjs.com> syntax highlighter. | ||
| // Mostly it works OK but can paint code incorrectly on complex html/template tag combinations. | ||
|
|
||
| var _django_template = { | ||
| 'property': { | ||
| pattern: /(?:{{|{%)[\s\S]*?(?:%}|}})/g, | ||
| greedy: true, | ||
| inside: { | ||
| 'string': { | ||
| pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/, | ||
| greedy: true | ||
| }, | ||
| 'keyword': /\b(?:\||load|verbatim|widthratio|ssi|firstof|for|url|ifchanged|csrf_token|lorem|ifnotequal|autoescape|now|templatetag|debug|cycle|ifequal|regroup|comment|filter|endfilter|if|spaceless|with|extends|block|include|else|empty|endif|endfor|as|endblock|endautoescape|endverbatim|trans|endtrans|[Tt]rue|[Ff]alse|[Nn]one|in|is|static|macro|endmacro|call|endcall|set|endset|raw|endraw)\b/, | ||
| 'operator' : /[-+=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/, | ||
| 'function': /\b(?:_|abs|add|addslashes|attr|batch|callable|capfirst|capitalize|center|count|cut|d|date|default|default_if_none|defined|dictsort|dictsortreversed|divisibleby|e|equalto|escape|escaped|escapejs|even|filesizeformat|first|float|floatformat|force_escape|forceescape|format|get_digit|groupby|indent|int|iriencode|iterable|join|last|length|length_is|linebreaks|linebreaksbr|linenumbers|list|ljust|lower|make_list|map|mapping|number|odd|phone2numeric|pluralize|pprint|random|reject|rejectattr|removetags|replace|reverse|rjust|round|safe|safeseq|sameas|select|selectattr|sequence|slice|slugify|sort|string|stringformat|striptags|sum|time|timesince|timeuntil|title|trim|truncate|truncatechars|truncatechars_html|truncatewords|truncatewords_html|undefined|unordered_list|upper|urlencode|urlize|urlizetrunc|wordcount|wordwrap|xmlattr|yesno)\b/, | ||
| 'important': /\b-?\d+(?:\.\d+)?\b/, | ||
| 'variable': /\b\w+?\b/, | ||
| 'punctuation' : /[[\];(),.:]/ | ||
| } | ||
| } | ||
| }; | ||
| (function (Prism) { | ||
|
|
||
| Prism.languages.django = Prism.languages.extend('markup', {'comment': /(?:<!--|{#)[\s\S]*?(?:#}|-->)/}); | ||
| // Updated html tag pattern to allow template tags inside html tags | ||
| Prism.languages.django.tag.pattern = /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|[^>=]+))?)*\s*\/?>/i; | ||
| Prism.languages.insertBefore('django', 'entity', _django_template); | ||
| Prism.languages.insertBefore('inside', 'tag', _django_template, Prism.languages.django.tag); | ||
| Prism.languages.django = { | ||
| 'comment': /^{#[\s\S]*?#}$/, | ||
| 'tag': { | ||
| pattern: /(^{%[+-]?\s*)\w+/, | ||
| lookbehind: true, | ||
| alias: 'keyword' | ||
| }, | ||
| 'delimiter': { | ||
| pattern: /^{[{%][+-]?|[+-]?[}%]}$/, | ||
| alias: 'punctuation' | ||
| }, | ||
| 'string': { | ||
| pattern: /("|')(?:\\.|(?!\1)[^\\\r\n])*\1/, | ||
| greedy: true | ||
| }, | ||
| 'filter': { | ||
| pattern: /(\|)\w+/, | ||
| lookbehind: true, | ||
| alias: 'function' | ||
| }, | ||
| 'test': { | ||
| pattern: /(\bis\s+(?:not\s+)?)(?!not\b)\w+/, | ||
| lookbehind: true, | ||
| alias: 'function' | ||
| }, | ||
| 'function': /\b[a-z_]\w+(?=\s*\()/i, | ||
| 'keyword': /\b(?:and|as|by|else|for|if|import|in|is|loop|not|or|recursive|with|without)\b/, | ||
| 'operator': /[-+*/%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]/, | ||
| 'number': /\b\d+(?:\.\d+)?\b/, | ||
| 'boolean': /[Tt]rue|[Ff]alse|[Nn]one/, | ||
| 'variable': /\b\w+?\b/, | ||
| 'punctuation': /[{}[\](),.:;]/ | ||
| }; | ||
|
|
||
| if (Prism.languages.javascript) { | ||
| // Combine js code and template tags painting inside <script> blocks | ||
| Prism.languages.insertBefore('inside', 'string', _django_template, Prism.languages.django.script); | ||
| Prism.languages.django.script.inside.string.inside = _django_template; | ||
| } | ||
| if (Prism.languages.css) { | ||
| // Combine css code and template tags painting inside <style> blocks | ||
| Prism.languages.insertBefore('inside', 'atrule', {'tag': _django_template.property}, Prism.languages.django.style); | ||
| Prism.languages.django.style.inside.string.inside = _django_template; | ||
| } | ||
|
|
||
| // Add an Jinja2 alias | ||
| Prism.languages.jinja2 = Prism.languages.django; | ||
| var pattern = /{{[\s\S]*?}}|{%[\s\S]*?%}|{#[\s\S]*?#}/g; | ||
| var markupTemplating = Prism.languages['markup-templating']; | ||
|
|
||
| Prism.hooks.add('before-tokenize', function (env) { | ||
| markupTemplating.buildPlaceholders(env, 'django', pattern); | ||
| }); | ||
| Prism.hooks.add('after-tokenize', function (env) { | ||
| markupTemplating.tokenizePlaceholders(env, 'django'); | ||
| }); | ||
|
|
||
| // Add an Jinja2 alias | ||
| Prism.languages.jinja2 = Prism.languages.django; | ||
| Prism.hooks.add('before-tokenize', function (env) { | ||
| markupTemplating.buildPlaceholders(env, 'jinja2', pattern); | ||
| }); | ||
| Prism.hooks.add('after-tokenize', function (env) { | ||
| markupTemplating.tokenizePlaceholders(env, 'jinja2'); | ||
| }); | ||
|
|
||
| })(Prism); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <style> | ||
| a { | ||
| {% if setColor %} | ||
| color: {{ bar }}; | ||
| {% endif %} | ||
| } | ||
| </style> | ||
|
|
||
| ---------------------------------------------------- | ||
|
|
||
| [ | ||
| ["tag", [ | ||
| ["tag", [ | ||
| ["punctuation", "<"], | ||
| "style" | ||
| ]], | ||
| ["punctuation", ">"] | ||
| ]], | ||
| ["style", [ | ||
| ["language-css", [ | ||
| ["selector", "a"], | ||
| ["punctuation", "{"], | ||
| ["django", [ | ||
| ["delimiter", "{%"], | ||
| ["tag", "if"], | ||
| ["variable", "setColor"], | ||
| ["delimiter", "%}"] | ||
| ]], | ||
| ["property", "color"], | ||
| ["punctuation", ":"], | ||
| ["django", [ | ||
| ["delimiter", "{{"], | ||
| ["variable", "bar"], | ||
| ["delimiter", "}}"] | ||
| ]], | ||
| ["punctuation", ";"], | ||
| ["django", [ | ||
| ["delimiter", "{%"], | ||
| ["tag", "endif"], | ||
| ["delimiter", "%}"] | ||
| ]], | ||
| ["punctuation", "}"] | ||
| ]] | ||
| ]], | ||
| ["tag", [ | ||
| ["tag", [ | ||
| ["punctuation", "</"], | ||
| "style" | ||
| ]], | ||
| ["punctuation", ">"] | ||
| ]] | ||
| ] | ||
|
|
||
| ---------------------------------------------------- | ||
|
|
||
| Checks for Django/Jinja2 code inside <style> elements. |
Oops, something went wrong.