Markup: Improved doctype pattern (#2094)

This changes Markup's `doctype` pattern to adhere to the XML spec more closely.
PrismJS · Oct 19, 2019 · 99994c5 · 99994c5
1 parent f460eaf
commit 99994c5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/components/prism-markup.js b/components/prism-markup.js
@@ -1,7 +1,10 @@
 Prism.languages.markup = {
 	'comment': /<!--[\s\S]*?-->/,
 	'prolog': /<\?[\s\S]+?\?>/,
-	'doctype': /<!DOCTYPE[\s\S]+?>/i,
+	'doctype': {
+		pattern: /<!DOCTYPE(?:[^>"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:(?!<!--)[^"'\]]|"[^"]*"|'[^']*'|<!--[\s\S]*?-->)*\]\s*)?>/i,
+		greedy: true
+	},
 	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 	'tag': {
 		pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/i,

diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
diff --git a/prism.js b/prism.js
@@ -582,7 +582,10 @@ if (typeof global !== 'undefined') {
 Prism.languages.markup = {
 	'comment': /<!--[\s\S]*?-->/,
 	'prolog': /<\?[\s\S]+?\?>/,
-	'doctype': /<!DOCTYPE[\s\S]+?>/i,
+	'doctype': {
+		pattern: /<!DOCTYPE(?:[^>"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:(?!<!--)[^"'\]]|"[^"]*"|'[^']*'|<!--[\s\S]*?-->)*\]\s*)?>/i,
+		greedy: true
+	},
 	'cdata': /<!\[CDATA\[[\s\S]*?]]>/i,
 	'tag': {
 		pattern: /<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/i,

diff --git a/tests/languages/markup/doctype_feature.test b/tests/languages/markup/doctype_feature.test
@@ -2,15 +2,27 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE greeting SYSTEM "hello.dtd">
+<!DOCTYPE greeting [
+	<!ELEMENT greeting (#PCDATA)>
+]>
+<!DOCTYPE greeting [
+	<!ELEMENT greeting (#PCDATA)>
+	<!ELEMENT subject (#PCDATA)>
+	<!-- comment ]> -->
+]>
 
 ----------------------------------------------------
 
 [
 	["doctype", "<!DOCTYPE html>"],
 	["doctype", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"],
-	["doctype", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\r\n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"]
+	["doctype", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\r\n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"],
+	["doctype", "<!DOCTYPE greeting SYSTEM \"hello.dtd\">"],
+	["doctype", "<!DOCTYPE greeting [\r\n\t<!ELEMENT greeting (#PCDATA)>\r\n]>"],
+	["doctype", "<!DOCTYPE greeting [\r\n\t<!ELEMENT greeting (#PCDATA)>\r\n\t<!ELEMENT subject (#PCDATA)>\r\n\t<!-- comment ]> -->\r\n]>"]
 ]
 
 ----------------------------------------------------
 
-Checks for different doctypes, single-line and multi-line.
+Checks for different doctypes, single-line and multi-line.