Skip to content

Commit f16f494

Browse files
committed
Improve U.formatXml(string, COMPACT).
1 parent 88a348f commit f16f494

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/java/com/github/underscore/lodash/Xml.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public String toString() {
115115
public static class XmlStringBuilderWithoutRoot extends XmlStringBuilder {
116116
public XmlStringBuilderWithoutRoot(XmlStringBuilder.Step identStep, String encoding) {
117117
super(new StringBuilder("<?xml version=\"1.0\" encoding=\""
118-
+ U.escape(encoding) + "\"?>\n"), identStep, 0);
118+
+ U.escape(encoding) + "\"?>" + (identStep == Step.COMPACT ? "" : "\n")), identStep, 0);
119119
}
120120

121121
public String toString() {

src/test/java/com/github/underscore/lodash/LodashTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public void formatXml() {
597597
U.formatXml("<a>\n <b>\n </b>\n <b>\n </b>\n</a>"));
598598
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a>\n <b></b>\n <b></b>\n</a>",
599599
U.formatXml("<a>\n <b>\n </b>\n <b>\n </b>\n</a>", Xml.XmlStringBuilder.Step.FOUR_SPACES));
600-
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a><b></b><b></b></a>",
600+
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><a><b></b><b></b></a>",
601601
U.formatXml("<a>\n <b>\n </b>\n <b>\n </b>\n</a>", Xml.XmlStringBuilder.Step.COMPACT));
602602
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a>\n\t<b></b>\n\t<b></b>\n</a>",
603603
U.formatXml("<a>\n <b>\n </b>\n <b>\n </b>\n</a>", Xml.XmlStringBuilder.Step.TABS));

0 commit comments

Comments
 (0)