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

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

@@ -17,18 +17,17 @@
 
  // Tokenize all inline ERB expressions that are wrapped in <%= %>
  // This allows for easy ERB + markup highlighting
- Prism.hooks.add('before-highlight', function(env) {
+ Prism.hooks.add('before-tokenize', function(env) {
  if (env.language !== 'erb') {
  return;
  }
 
  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)
+ while (env.code.indexOf('___ERB' + i + '___') !== -1)
  ++i;
 
  // Create a sparse array
@@ -38,30 +37,55 @@
  });
  });
 
- // 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;
- }
- });
-
- // Re-insert the tokens after highlighting
- // and highlight them with defined grammar
- Prism.hooks.add('after-highlight', function(env) {
- if (env.language !== 'erb') {
+ // Re-insert the tokens after tokenizing
+ Prism.hooks.add('after-tokenize', function(env) {
+ if (env.language !== 'erb' || !env.tokenStack) {
  return;
  }
 
- for (var i = 0, keys = Object.keys(env.tokenStack); i < keys.length; ++i) {
- var k = keys[i];
- var t = env.tokenStack[k];
+ var j = 0;
+ var keys = Object.keys(env.tokenStack);
+ var walkTokens = function (tokens) {
+ if (j >= keys.length) {
+ return;
+ }
+ for (var i = 0; i < tokens.length; i++) {
+ var token = tokens[i];
+ if (typeof token === 'string' || (token.content && typeof token.content === 'string')) {
+ var k = keys[j];
+ var t = env.tokenStack[k];
+ var s = typeof token === 'string' ? token : token.content;
 
- // 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, '$$$$'));
- }
+ var index = s.indexOf('___ERB' + k + '___');
+ if (index > -1) {
+ ++j;
+ var before = s.substring(0, index);
+ var middle = Prism.tokenize(t, env.grammar, 'erb');
+ var after = s.substring(index + ('___ERB' + k + '___').length);
+ var replacement;
+ if (before || after) {
+ replacement = [before].concat(middle, after).filter(function (v) { return !!v; });
+ walkTokens(replacement);
+ } else {
+ replacement = middle;
+ }
+ if (typeof token === 'string') {
+ Array.prototype.splice.apply(tokens, [i, 1].concat(replacement));
+ } else {
+ token.content = replacement;
+ }
+
+ if (j >= keys.length) {
+ break;
+ }
+ }
+ } else if (token.content && typeof token.content !== 'string') {
+ walkTokens(token.content);
+ }
+ }
+ };
 
- env.element.innerHTML = env.highlightedCode;
+ walkTokens(env.tokens);
  });
 
 }(Prism));