Merge branch 'master' into issue2546

PrismJS · Oct 4, 2021 · c641d0d · c641d0d
2 parents d6aebb3 + 5b7ce5e
commit c641d0d
Show file tree

Hide file tree

Showing 29 changed files with 1,160 additions and 13 deletions.
diff --git a/components.js b/components.js
diff --git a/components.json b/components.json
@@ -132,6 +132,7 @@
 		"arduino": {
 			"title": "Arduino",
 			"require": "cpp",
+			"alias": "ino",
 			"owner": "dkern"
 		},
 		"arff": {
@@ -713,6 +714,10 @@
 			"title": "Julia",
 			"owner": "cdagnino"
 		},
+		"keepalived": {
+			"title": "Keepalived Configure",
+			"owner": "dev-itsheng"
+		},
 		"keyman": {
 			"title": "Keyman",
 			"owner": "mcdurdin"

diff --git a/components/prism-arduino.js b/components/prism-arduino.js
diff --git a/components/prism-arduino.min.js b/components/prism-arduino.min.js
diff --git a/components/prism-core.js b/components/prism-core.js
@@ -947,7 +947,7 @@ var Prism = (function (_self) {
 
 					if (greedy) {
 						match = matchPattern(pattern, pos, text, lookbehind);
-						if (!match) {
+						if (!match || match.index >= text.length) {
 							break;
 						}