Updated all String.propotype.replace calls for literal strings

PrismJS · Mar 26, 2020 · 5d7aab5 · 5d7aab5
1 parent 504a63b
commit 5d7aab5
Show file tree

Hide file tree

Showing 33 changed files with 60 additions and 56 deletions.
diff --git a/components/prism-csharp.js b/components/prism-csharp.js
@@ -34,7 +34,7 @@
 	 */
 	function nested(pattern, depthLog2) {
 		for (var i = 0; i < depthLog2; i++) {
-			pattern = pattern.replace(/<<self>>/g, '(?:' + pattern + ')');
+			pattern = pattern.replace(/<<self>>/g, function () { return '(?:' + pattern + ')'; });
 		}
 		return pattern.replace(/<<self>>/g, '[^\\s\\S]');
 	}

diff --git a/components/prism-csharp.min.js b/components/prism-csharp.min.js
diff --git a/components/prism-ftl.js b/components/prism-ftl.js
@@ -5,7 +5,7 @@
 	// FTL expression with 4 levels of nesting supported
 	var FTL_EXPR = /(?!<#--)[^()"']|\((?:<expr>)*\)|<#--[\s\S]*?-->|"(?:[^\\"]|\\.)*"|'(?:[^\\']|\\.)*'/.source;
 	for (var i = 0; i < 2; i++) {
-		FTL_EXPR = FTL_EXPR.replace(/<expr>/g, FTL_EXPR);
+		FTL_EXPR = FTL_EXPR.replace(/<expr>/g, function () { return FTL_EXPR; });
 	}
 	FTL_EXPR = FTL_EXPR.replace(/<expr>/g, '[^\s\S]');
 
@@ -18,11 +18,11 @@
 				greedy: true
 			},
 			{
-				pattern: RegExp(/("|')(?:(?!\1|\$\{)[^\\]|\\.|\$\{(?:<expr>)*?\})*\1/.source.replace(/<expr>/g, FTL_EXPR)),
+				pattern: RegExp(/("|')(?:(?!\1|\$\{)[^\\]|\\.|\$\{(?:<expr>)*?\})*\1/.source.replace(/<expr>/g, function () { return FTL_EXPR; })),
 				greedy: true,
 				inside: {
 					'interpolation': {
-						pattern: RegExp(/((?:^|[^\\])(?:\\\\)*)\$\{(?:<expr>)*?\}/.source.replace(/<expr>/g, FTL_EXPR)),
+						pattern: RegExp(/((?:^|[^\\])(?:\\\\)*)\$\{(?:<expr>)*?\}/.source.replace(/<expr>/g, function () { return FTL_EXPR; })),
 						lookbehind: true,
 						inside: {
 							'interpolation-punctuation': {
@@ -86,7 +86,7 @@
 	};
 
 	Prism.hooks.add('before-tokenize', function (env) {
-		var pattern = RegExp(/<#--[\s\S]*?-->|<\/?[#@][a-zA-Z](?:<expr>)*?>|\$\{(?:<expr>)*?\}/.source.replace(/<expr>/g, FTL_EXPR), 'gi');
+		var pattern = RegExp(/<#--[\s\S]*?-->|<\/?[#@][a-zA-Z](?:<expr>)*?>|\$\{(?:<expr>)*?\}/.source.replace(/<expr>/g, function () { return FTL_EXPR; }), 'gi');
 		Prism.languages['markup-templating'].buildPlaceholders(env, 'ftl', pattern);
 	});
 

diff --git a/components/prism-ftl.min.js b/components/prism-ftl.min.js
diff --git a/components/prism-haml.js b/components/prism-haml.js
@@ -124,7 +124,7 @@
 		filter = typeof filter === 'string' ? {filter: filter, language: filter} : filter;
 		if (Prism.languages[filter.language]) {
 			all_filters['filter-' + filter.filter] = {
-				pattern: RegExp(filter_pattern.replace('{{filter_name}}', filter.filter)),
+				pattern: RegExp(filter_pattern.replace('{{filter_name}}', function () { return filter.filter; })),
 				lookbehind: true,
 				inside: {
 					'filter-name': {