If pretty-print is disabled, don't trim outer whitespace in Element.html()

jhy · jhy · commit c07ba8a34b6a · 2013-11-16T16:48:43.000-08:00
Fixes jhy#368
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@ jsoup changelog
 *** Release 1.7.4 [PENDING]
  * Improved the performance of Element.text() by 2.2x
 
+ * If pretty-print is disabled, don't trim outer whitespace in Element.html()
+
 *** Release 1.7.3 [2013-Nov-10]
  * Introduced FormElement, providing easy access to form controls and their data, and the ability to submit forms
    with Jsoup.Connect.
diff --git a/src/main/java/org/jsoup/nodes/Element.java b/src/main/java/org/jsoup/nodes/Element.java
@@ -1097,8 +1097,8 @@ void outerHtmlTail(StringBuilder accum, int depth, Document.OutputSettings out)
      */
     public String html() {
         StringBuilder accum = new StringBuilder();
-        html(accum); 
-        return accum.toString().trim();
+        html(accum);
+        return getOutputSettings().prettyPrint() ? accum.toString().trim() : accum.toString();
     }
 
     private void html(StringBuilder accum) {
diff --git a/src/main/java/org/jsoup/nodes/Node.java b/src/main/java/org/jsoup/nodes/Node.java
@@ -557,7 +557,7 @@ protected void outerHtml(StringBuilder accum) {
     }
 
     // if this node has no document (or parent), retrieve the default output settings
-    private Document.OutputSettings getOutputSettings() {
+    Document.OutputSettings getOutputSettings() {
         return ownerDocument() != null ? ownerDocument().outputSettings() : (new Document("")).outputSettings();
     }
 
diff --git a/src/test/java/org/jsoup/nodes/ElementTest.java b/src/test/java/org/jsoup/nodes/ElementTest.java
@@ -217,7 +217,7 @@ public class ElementTest {
     }
 
     @Test public void testInnerHtml() {
-        Document doc = Jsoup.parse("<div><p>Hello</p></div>");
+        Document doc = Jsoup.parse("<div>\n <p>Hello</p> </div>");
         assertEquals("<p>Hello</p>", doc.getElementsByTag("div").get(0).html());
     }
 
@@ -239,9 +239,12 @@ public class ElementTest {
     }
 
     @Test public void testNotPretty() {
-        Document doc = Jsoup.parse("<div>   \n<p>Hello\n there</p></div>");
+        Document doc = Jsoup.parse("<div>   \n<p>Hello\n there\n</p></div>");
         doc.outputSettings().prettyPrint(false);
-        assertEquals("<html><head></head><body><div>   \n<p>Hello\n there</p></div></body></html>", doc.html());
+        assertEquals("<html><head></head><body><div>   \n<p>Hello\n there\n</p></div></body></html>", doc.html());
+
+        Element div = doc.select("div").first();
+        assertEquals("   \n<p>Hello\n there\n</p>", div.html());
     }
     
     @Test public void testEmptyElementFormatHtml() {

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ protected void outerHtml(StringBuilder accum) {`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`// if this node has no document (or parent), retrieve the default output settings`
`560`		`- private Document.OutputSettings getOutputSettings() {`
	`560`	`+ Document.OutputSettings getOutputSettings() {`
`561`	`561`	`return ownerDocument() != null ? ownerDocument().outputSettings() : (new Document("")).outputSettings();`
`562`	`562`	`}`
`563`	`563`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public class ElementTest {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`@Test public void testInnerHtml() {`
`220`		`- Document doc = Jsoup.parse("<div><p>Hello</p></div>");`
	`220`	`+ Document doc = Jsoup.parse("<div>\n <p>Hello</p> </div>");`
`221`	`221`	`assertEquals("<p>Hello</p>", doc.getElementsByTag("div").get(0).html());`
`222`	`222`	`}`
`223`	`223`
`@@ -239,9 +239,12 @@ public class ElementTest {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`@Test public void testNotPretty() {`
`242`		`- Document doc = Jsoup.parse("<div> \n<p>Hello\n there</p></div>");`
	`242`	`+ Document doc = Jsoup.parse("<div> \n<p>Hello\n there\n</p></div>");`
`243`	`243`	`doc.outputSettings().prettyPrint(false);`
`244`		`- assertEquals("<html><head></head><body><div> \n<p>Hello\n there</p></div></body></html>", doc.html());`
	`244`	`+ assertEquals("<html><head></head><body><div> \n<p>Hello\n there\n</p></div></body></html>", doc.html());`
	`245`	`+`
	`246`	`+ Element div = doc.select("div").first();`
	`247`	`+ assertEquals(" \n<p>Hello\n there\n</p>", div.html());`
`245`	`248`	`}`
`246`	`249`
`247`	`250`	`@Test public void testEmptyElementFormatHtml() {`