Revert #998 + run normalize-whitespace and remove-initial-line-feed p…

…lugins in the before-sanity-check hook. Fix #1018 (see issue for discussion)
PrismJS · Sep 1, 2016 · 86aa3d2 · 86aa3d2
1 parent f138f8f
commit 86aa3d2
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 7 deletions.
diff --git a/components/prism-handlebars.js b/components/prism-handlebars.js
@@ -49,13 +49,22 @@
 
 		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,13 +63,22 @@ 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,6 +81,7 @@
 
 		env.tokenStack = [];
 
+		env.backupCode = env.code;
 		env.code = env.code.replace(smarty_pattern, function(match) {
 
 			// Smarty tags inside {literal} block are ignored
@@ -100,6 +101,14 @@
 		});
 	});
 
+	// 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
diff --git a/plugins/normalize-whitespace/prism-normalize-whitespace.js b/plugins/normalize-whitespace/prism-normalize-whitespace.js
@@ -126,7 +126,7 @@ Prism.plugins.NormalizeWhitespace = new NormalizeWhitespace({
 	'spaces-to-tabs': 4*/
 });
 
-Prism.hooks.add('before-highlight', function (env) {
+Prism.hooks.add('before-sanity-check', function (env) {
 	var pre = env.element.parentNode;
 	var clsReg = /\bno-whitespace-normalization\b/;
 	if (!env.code || !pre || pre.nodeName.toLowerCase() !== 'pre' ||

diff --git a/plugins/normalize-whitespace/prism-normalize-whitespace.min.js b/plugins/normalize-whitespace/prism-normalize-whitespace.min.js
diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js
@@ -4,7 +4,7 @@ if (typeof self === 'undefined' || !self.Prism || !self.document) {
 	return;
 }
 
-Prism.hooks.add('before-highlight', function (env) {
+Prism.hooks.add('before-sanity-check', function (env) {
 	if (env.code) {
 		var pre = env.element.parentNode;
 		var clsReg = /\s*\bkeep-initial-line-feed\b\s*/;

diff --git a/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js b/plugins/remove-initial-line-feed/prism-remove-initial-line-feed.min.js