Core: Fixed bug with greedy matching (#2632)

components/prism-core.js

@@ -890,7 +890,7 @@ function matchGrammar(text, tokenList, grammar, startNode, startPos, rematch) {
 
 				var removeCount = 1; // this is the to parameter of removeBetween
 
-				if (greedy && currentNode != tokenList.tail.prev) {
+				if (greedy) {
 					pattern.lastIndex = pos;
 					var match = pattern.exec(text);
 					if (!match) {

docs/prism-core.js.html

@@ -943,7 +943,7 @@ <h1 class="page-title">prism-core.js</h1>
 
 				var removeCount = 1; // this is the to parameter of removeBetween
 
-				if (greedy &amp;&amp; currentNode != tokenList.tail.prev) {
+				if (greedy) {
 					pattern.lastIndex = pos;
 					var match = pattern.exec(text);
 					if (!match) {

prism.js

@@ -895,7 +895,7 @@ function matchGrammar(text, tokenList, grammar, startNode, startPos, rematch) {
 
 				var removeCount = 1; // this is the to parameter of removeBetween
 
-				if (greedy && currentNode != tokenList.tail.prev) {
+				if (greedy) {
 					pattern.lastIndex = pos;
 					var match = pattern.exec(text);
 					if (!match) {

tests/core/greedy.js

@@ -84,4 +84,25 @@ describe('Greedy matching', function () {
 			]
 		});
 	});
+
+	it('should always match tokens against the whole text', function () {
+		// this is to test for a bug where greedy tokens where matched like non-greedy ones if the token stream ended on
+		// a string
+		testTokens({
+			grammar: {
+				'a': /a/,
+				'b': {
+					pattern: /^b/,
+					greedy: true
+				}
+			},
+			code: 'bab',
+			expected: [
+				["b", "b"],
+				["a", "a"],
+				"b"
+			]
+		});
+	});
+
 });