Core: Fixed type error on null

components/prism-core.js

@@ -926,7 +926,7 @@ var Prism = (function (_self) {
 
 					if (greedy) {
 						match = matchPattern(pattern, pos, text, lookbehind);
-						if (!match) {
+						if (!match || match.index >= text.length) {
 							break;
 						}
 

docs/prism-core.js.html

@@ -979,7 +979,7 @@ <h1 class="page-title">prism-core.js</h1>
 
 					if (greedy) {
 						match = matchPattern(pattern, pos, text, lookbehind);
-						if (!match) {
+						if (!match || match.index >= text.length) {
 							break;
 						}
 

prism.js

@@ -931,7 +931,7 @@ var Prism = (function (_self) {
 
 					if (greedy) {
 						match = matchPattern(pattern, pos, text, lookbehind);
-						if (!match) {
+						if (!match || match.index >= text.length) {
 							break;
 						}
 

tests/core/greedy.js

@@ -105,4 +105,19 @@ describe('Greedy matching', function () {
 		});
 	});
 
+	it('issue3052', 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: {
+				'oh-no': {
+					pattern: /$/,
+					greedy: true
+				}
+			},
+			code: 'foo',
+			expected: ['foo']
+		});
+	});
+
 });