Markup: Added alias for named entities (#2351)

PrismJS · May 18, 2020 · ab1e34a · ab1e34a
1 parent fdbc447
commit ab1e34a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/components/prism-markup.js b/components/prism-markup.js
@@ -39,7 +39,13 @@ Prism.languages.markup = {
 
 		}
 	},
-	'entity': /&#?[\da-z]{1,8};/i
+	'entity': [
+		{
+			pattern: /&[\da-z]{1,8};/i,
+			alias: 'named-entity'
+		},
+		/&#x?[\da-f]{1,8};/i
+	]
 };
 
 Prism.languages.markup['tag'].inside['attr-value'].inside['entity'] =

diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
diff --git a/prism.js b/prism.js
@@ -775,7 +775,13 @@ Prism.languages.markup = {
 
 		}
 	},
-	'entity': /&#?[\da-z]{1,8};/i
+	'entity': [
+		{
+			pattern: /&[\da-z]{1,8};/i,
+			alias: 'named-entity'
+		},
+		/&#x?[\da-f]{1,8};/i
+	]
 };
 
 Prism.languages.markup['tag'].inside['attr-value'].inside['entity'] =

diff --git a/tests/languages/markup/entity_feature.js b/tests/languages/markup/entity_feature.js
@@ -1,4 +1,6 @@
 module.exports = {
-	'&amp;': '<span class="token entity" title="&amp;">&amp;amp;</span>',
-	'&thetasym;': '<span class="token entity" title="&thetasym;">&amp;thetasym;</span>'
-};
+	'&amp;': '<span class="token entity named-entity" title="&amp;">&amp;amp;</span>',
+	'&thetasym;': '<span class="token entity named-entity" title="&thetasym;">&amp;thetasym;</span>',
+	'&#65;': '<span class="token entity" title="&#65;">&amp;#65;</span>',
+	'&#x41;': '<span class="token entity" title="&#x41;">&amp;#x41;</span>'
+};