Make ERB, Handlebars, PHP and Smarty highlight properly in NodeJS

components.json

@@ -230,7 +230,7 @@
 		},
 		"erb": {
 			"title": "ERB",
-			"require": ["markup", "ruby"],
+			"require": ["ruby", "markup-templating"],
 			"owner": "Golmote"
 		},
 		"erlang": {
@@ -285,7 +285,7 @@
 		},
 		"handlebars": {
 			"title": "Handlebars",
-			"require": "markup",
+			"require": "markup-templating",
 			"owner": "Golmote"
 		},
 		"haskell": {
@@ -394,6 +394,11 @@
 			"require": "markup",
 			"owner": "Golmote"
 		},
+		"markup-templating": {
+			"title": "Markup templating",
+			"require": "markup",
+			"owner": "Golmote"
+		},
 		"matlab": {
 			"title": "MATLAB",
 			"owner": "Golmote"
@@ -474,7 +479,7 @@
 		},
 		"php": {
 			"title": "PHP",
-			"require": "clike",
+			"require": ["clike", "markup-templating"],
 			"owner": "milesj"
 		},
 		"php-extras": {
@@ -607,7 +612,7 @@
 		},
 		"smarty": {
 			"title": "Smarty",
-			"require": "markup",
+			"require": "markup-templating",
 			"owner": "Golmote"
 		},
 		"sql": {

components/prism-core.js

@@ -273,13 +273,14 @@ var _ = _self.Prism = {
 
 	highlight: function (text, grammar, language) {
 		var env = {
-			text: text,
+			code: text,
 			grammar: grammar,
 			language: language
 		};
-		env.tokens = _.tokenize(text, grammar);
+		_.hooks.run('before-tokenize', env);
+		env.tokens = _.tokenize(env.code, env.grammar);
 		_.hooks.run('after-tokenize', env);
-		return Token.stringify(_.util.encode(env.tokens), language);
+		return Token.stringify(_.util.encode(env.tokens), env.language);
 	},
 
 	matchGrammar: function (text, strarr, grammar, index, startPos, oneshot, target) {

components/prism-erb.js

@@ -1,67 +1,20 @@
 (function (Prism) {
 
-	var erb_pattern = /<%=?[\s\S]+?%>/g;
-
-	Prism.languages.erb = Prism.languages.extend('markup', {
-		'erb': {
-			pattern: erb_pattern,
-			inside: {
-				'delimiter': {
-					pattern: /^<%=?|%>$/,
-					alias: 'punctuation'
-				},
-				rest: Prism.languages.ruby
-			}
-		}
-	});
-
-	// Tokenize all inline ERB expressions that are wrapped in <%= %>
-	// This allows for easy ERB + markup highlighting
-	Prism.hooks.add('before-highlight', function(env) {
-		if (env.language !== 'erb') {
-			return;
+	Prism.languages.erb = Prism.languages.extend('ruby', {});
+	Prism.languages.insertBefore('erb', 'comment', {
+		'delimiter': {
+			pattern: /^<%=?|%>$/,
+			alias: 'punctuation'
 		}
-
-		env.tokenStack = [];
-
-		env.backupCode = env.code;
-		env.code = env.code.replace(erb_pattern, function(match) {
-			var i = env.tokenStack.length;
-			// Check for existing strings
-			while (env.backupCode.indexOf('___ERB' + i + '___') !== -1)
-				++i;
-
-			// Create a sparse array
-			env.tokenStack[i] = match;
-
-			return '___ERB' + i + '___';
-		});
 	});
 
-	// Restore env.code for other plugins (e.g. line-numbers)
-	Prism.hooks.add('before-insert', function(env) {
-		if (env.language === 'erb') {
-			env.code = env.backupCode;
-			delete env.backupCode;
-		}
+	Prism.hooks.add('before-tokenize', function(env) {
+		var erbPattern = /<%=?[\s\S]+?%>/g;
+		Prism.languages['markup-templating'].buildPlaceholders(env, 'erb', erbPattern);
 	});
 
-	// Re-insert the tokens after highlighting
-	// and highlight them with defined grammar
-	Prism.hooks.add('after-highlight', function(env) {
-		if (env.language !== 'erb') {
-			return;
-		}
-
-		for (var i = 0, keys = Object.keys(env.tokenStack); i < keys.length; ++i) {
-			var k = keys[i];
-			var t = env.tokenStack[k];
-
-			// The replace prevents $$, $&, $`, $', $n, $nn from being interpreted as special patterns
-			env.highlightedCode = env.highlightedCode.replace('___ERB' + k + '___', Prism.highlight(t, env.grammar, 'erb').replace(/\$/g, '$$$$'));
-		}
-
-		env.element.innerHTML = env.highlightedCode;
+	Prism.hooks.add('after-tokenize', function(env) {
+		Prism.languages['markup-templating'].tokenizePlaceholders(env, 'erb');
 	});
 
 }(Prism));