Merge pull request #998 from Golmote/before-insert-code-restore

Don't restore env.code from backupCode in Handlebars, PHP and Smarty …
PrismJS · Jul 14, 2016 · 36739b3 · 36739b3
2 parents c1a0c1b + d8fefde
commit 36739b3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 30 deletions.
diff --git a/components/prism-handlebars.js b/components/prism-handlebars.js
@@ -49,22 +49,13 @@
 
 		env.tokenStack = [];
 
-		env.backupCode = env.code;
 		env.code = env.code.replace(handlebars_pattern, function(match) {
 			env.tokenStack.push(match);
 
 			return '___HANDLEBARS' + env.tokenStack.length + '___';
 		});
 	});
 
-	// Restore env.code for other plugins (e.g. line-numbers)
-	Prism.hooks.add('before-insert', function(env) {
-		if (env.language === 'handlebars') {
-			env.code = env.backupCode;
-			delete env.backupCode;
-		}
-	});
-
 	// Re-insert the tokens after highlighting
 	// and highlight them with defined grammar
 	Prism.hooks.add('after-highlight', function(env) {

diff --git a/components/prism-handlebars.min.js b/components/prism-handlebars.min.js
diff --git a/components/prism-php.js b/components/prism-php.js
@@ -63,22 +63,13 @@ if (Prism.languages.markup) {
 
 		env.tokenStack = [];
 
-		env.backupCode = env.code;
 		env.code = env.code.replace(/(?:<\?php|<\?)[\w\W]*?(?:\?>)/ig, function(match) {
 			env.tokenStack.push(match);
 
 			return '{{{PHP' + env.tokenStack.length + '}}}';
 		});
 	});
 
-	// Restore env.code for other plugins (e.g. line-numbers)
-	Prism.hooks.add('before-insert', function(env) {
-		if (env.language === 'php') {
-			env.code = env.backupCode;
-			delete env.backupCode;
-		}
-	});
-
 	// Re-insert the tokens after highlighting
 	Prism.hooks.add('after-highlight', function(env) {
 		if (env.language !== 'php') {

diff --git a/components/prism-php.min.js b/components/prism-php.min.js
diff --git a/components/prism-smarty.js b/components/prism-smarty.js
@@ -81,7 +81,6 @@
 
 		env.tokenStack = [];
 
-		env.backupCode = env.code;
 		env.code = env.code.replace(smarty_pattern, function(match) {
 
 			// Smarty tags inside {literal} block are ignored
@@ -101,14 +100,6 @@
 		});
 	});
 
-	// Restore env.code for other plugins (e.g. line-numbers)
-	Prism.hooks.add('before-insert', function(env) {
-		if (env.language === 'smarty') {
-			env.code = env.backupCode;
-			delete env.backupCode;
-		}
-	});
-
 	// Re-insert the tokens after highlighting
 	// and highlight them with defined grammar
 	Prism.hooks.add('after-highlight', function(env) {

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