Django: Regexp optimisation

PrismJS · Oct 22, 2017 · 33297c4 · 33297c4
1 parent d879f36
commit 33297c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/components/prism-django.js b/components/prism-django.js
@@ -7,7 +7,7 @@ var _django_template = {
 		greedy: true,
 		inside: {
 			'string': {
-				pattern: /("|')(?:\\\\|\\?[^\\\r\n])*?\1/,
+				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/,
@@ -22,7 +22,7 @@ var _django_template = {
 
 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>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\s\S])*\1|[^>=]+))?)*\s*\/?>/i;
+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);
 

diff --git a/components/prism-django.min.js b/components/prism-django.min.js