Fix minor bug with new greedy-feature

This fixes a minor bug that causes invalid highlighting in some
edge cases, where two greedy patterns overlap each other.

components/prism-core.js

@@ -327,6 +327,9 @@ var _ = _self.Prism = {
 						delNum = 3;
 
 						if (to <= len) {
+							if (strarr[i + 1].greedy) {
+								continue;
+							}
 							delNum = 2;
 							combStr = combStr.slice(0, len);
 						}
@@ -353,7 +356,7 @@ var _ = _self.Prism = {
 						args.push(before);
 					}
 
-					var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias, match);
+					var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias, match, greedy);
 
 					args.push(wrapped);
 
@@ -394,12 +397,13 @@ var _ = _self.Prism = {
 	}
 };
 
-var Token = _.Token = function(type, content, alias, matchedStr) {
+var Token = _.Token = function(type, content, alias, matchedStr, greedy) {
 	this.type = type;
 	this.content = content;
 	this.alias = alias;
 	// Copy of the full string this token was created from
 	this.matchedStr = matchedStr || null;
+	this.greedy = !!greedy;
 };
 
 Token.stringify = function(o, language, parent) {

components/prism-javascript.js

@@ -16,6 +16,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 Prism.languages.insertBefore('javascript', 'class-name', {
 	'template-string': {
 		pattern: /`(?:\\\\|\\?[^\\])*?`/,
+		greedy: true,
 		inside: {
 			'interpolation': {
 				pattern: /\$\{[^}]+\}/,

prism.js

@@ -332,6 +332,9 @@ var _ = _self.Prism = {
 						delNum = 3;
 
 						if (to <= len) {
+							if (strarr[i + 1].greedy) {
+								continue;
+							}
 							delNum = 2;
 							combStr = combStr.slice(0, len);
 						}
@@ -358,7 +361,7 @@ var _ = _self.Prism = {
 						args.push(before);
 					}
 
-					var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias, match);
+					var wrapped = new Token(token, inside? _.tokenize(match, inside) : match, alias, match, greedy);
 
 					args.push(wrapped);
 
@@ -399,12 +402,13 @@ var _ = _self.Prism = {
 	}
 };
 
-var Token = _.Token = function(type, content, alias, matchedStr) {
+var Token = _.Token = function(type, content, alias, matchedStr, greedy) {
 	this.type = type;
 	this.content = content;
 	this.alias = alias;
 	// Copy of the full string this token was created from
 	this.matchedStr = matchedStr || null;
+	this.greedy = !!greedy;
 };
 
 Token.stringify = function(o, language, parent) {
@@ -657,6 +661,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 Prism.languages.insertBefore('javascript', 'class-name', {
 	'template-string': {
 		pattern: /`(?:\\\\|\\?[^\\])*?`/,
+		greedy: true,
 		inside: {
 			'interpolation': {
 				pattern: /\$\{[^}]+\}/,

tests/languages/javascript/regex_feature.test

@@ -3,6 +3,7 @@
 /[\[\]]{2,4}(?:foo)*/;
 /foo"test"bar/
 /foo\//
+1 / 4 + "/, not a regex";
 
 ----------------------------------------------------
 
@@ -11,7 +12,8 @@
 	["regex", "/foo/gimyu"], ["punctuation", ","],
 	["regex", "/[\\[\\]]{2,4}(?:foo)*/"], ["punctuation", ";"],
 	["regex", "/foo\"test\"bar/"],
-	["regex", "/foo\\//"]
+	["regex", "/foo\\//"],
+	["number", "1"], ["operator", "/"], ["number", "4"], ["operator", "+"], ["string", "\"/, not a regex\""], ["punctuation", ";"]
 ]
 
 ----------------------------------------------------