Fixes prettier#5

rart · Dec 16, 2019 · f230921 · f230921
1 parent 369ec70
commit f230921
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/parse.js b/src/parse.js
@@ -8,8 +8,9 @@ const endTagPattern = `((\\/)${tagNamePattern}\\s*>)`;
 
 const commentPattern = "(!--)([\\s\\S\\n]*?)-->";
 const declPattern = "((\\?xml)(-model)?)(.+)\\?>";
+const docTypePattern = "(!(doctype|DOCTYPE))";
 
-const tagPattern = `<(${cDataPattern}|${startTagPattern}|${endTagPattern}|${commentPattern}|${declPattern})([^<]*)`;
+const tagPattern = `<(${cDataPattern}|${startTagPattern}|${endTagPattern}|${commentPattern}|${declPattern}|${docTypePattern})([^<]*)`;
 
 class XMLNode {
   constructor(tagname, opts) {
@@ -72,6 +73,16 @@ const parse = (text, _parsers, _opts) => {
           locEnd: tag.index + tag[0].trim().length
         })
       );
+    } else if ((tag[21]||'').toLowerCase() === 'doctype') {
+      node.children.push(
+        new XMLNode(`!doctype`, {
+          parent: node,
+          value: tag[0].trim(),
+          attrs: tag[22].trim().replace(/>$/, ''),
+          locStart: tag.index,
+          locEnd: tag.index + tag[0].trim().length
+        })
+      );
     } else if (tag[4] === "]]>") {
       node.children.push(
         new XMLNode("!cdata", {

diff --git a/src/print.js b/src/print.js
@@ -47,7 +47,7 @@ const genericPrint = (path, opts, print) => {
     return concat([join(hardline, path.map(print, "children")), hardline]);
   }
 
-  if (tagname === "!comment") {
+  if (tagname === "!comment" || tagname === '!doctype') {
     return group(concat([value]));
   }
 

diff --git a/test/doctype.test.js b/test/doctype.test.js
@@ -5,6 +5,9 @@ describe("doctype", () => {
     const content = here(`
       <?xml version="1.0" encoding="UTF-8" ?>
       <?xml-model href="model.rnc" type="application/relax-ng-compact-sync-syntax" ?>
+      <!DOCTYPE foo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                               "http://docbook.org/xml/4.5/docbookx.dtd">
+      <!DOCTYPE foo PUBLIC "-//OASIS//DTD DITA Task//EN" "foo.dtd">
       <foo />
     `);