Basic fix for formatting DTD DocType to avoid breaking DTD content (see

#221)
eclipse · Dec 1, 2018 · d4bc755 · d4bc755
1 parent 3f1ef89
commit d4bc755
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/services/XMLFormatter.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/services/XMLFormatter.java
@@ -140,8 +140,8 @@ private void format(DOMNode node, int level, int end, XMLBuilder xml) {
 				xml.linefeed();
 			} else if (node.isDoctype()) {
 				DOMDocumentType documentType = (DOMDocumentType) node;
-				xml.startDoctype();
-				xml.addContentDoctype(documentType.getContent());
+				xml.startDoctype(documentType.getName());
+				xml.setDoctypeInternalSubset(documentType.getInternalSubset());
 				xml.endDoctype();
 				xml.linefeed();
 			} else if (node.isText()) {

diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/utils/XMLBuilder.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/utils/XMLBuilder.java
@@ -198,13 +198,21 @@ public XMLBuilder addContentComment(String content) {
 		return this;
 	}
 
-	public XMLBuilder startDoctype() {
+	public XMLBuilder startDoctype(String name) {
 		xml.append("<!DOCTYPE");
+		if (name != null) {
+			xml.append(" ");
+			xml.append(name);
+		}
 		return this;
 	}
 
-	public XMLBuilder addContentDoctype(String content) {
-		xml.append(content);
+	public XMLBuilder setDoctypeInternalSubset(String internalSubset) {
+		if (internalSubset != null) {
+			xml.append(" [");			
+			xml.append(internalSubset);
+			xml.append("]");
+		}
 		return this;
 	}