forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a lil more pretty string tweaking for empty elements

This commit is contained in:
Adam D. Ruppe 2021-12-03 10:59:03 -05:00
parent 25f067544f
commit 333e1ebef8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom.d
View File

@ -3520,7 +3520,7 @@ class Element : DomParent {
// for simple `<collection><item>text</item><item>text</item></collection>`, let's // for simple `<collection><item>text</item><item>text</item></collection>`, let's
// just keep them on the same line // just keep them on the same line
if(tagName.isInArray(inlineElements) || allAreInlineHtml(children, inlineElements)) { if(isEmpty || tagName.isInArray(inlineElements) || allAreInlineHtml(children, inlineElements)) {
foreach(child; children) { foreach(child; children) {
s ~= child.toString();//toPrettyString(false, 0, null); s ~= child.toString();//toPrettyString(false, 0, null);
} }
@ -7827,7 +7827,7 @@ bool allAreInlineHtml(const(Element)[] children, const string[] inlineElements)
foreach(child; children) { foreach(child; children) {
if(child.nodeType == NodeType.Text && child.nodeValue.strip.length) { if(child.nodeType == NodeType.Text && child.nodeValue.strip.length) {
// cool // cool
} else if(child.tagName.isInArray(inlineElements) && allAreInlineHtml(child.children, inlineElements)) { } else if(child.isEmpty || child.tagName.isInArray(inlineElements) && allAreInlineHtml(child.children, inlineElements)) {
// cool // cool
} else { } else {
// prolly block // prolly block
@ -8003,6 +8003,7 @@ unittest {
// despite these being in a test, I might change these anyway! // despite these being in a test, I might change these anyway!
assert(Element.make("a").toPrettyString == "<a></a>"); assert(Element.make("a").toPrettyString == "<a></a>");
assert(Element.make("a", "").toPrettyString(false, 0, " ") == "<a></a>"); assert(Element.make("a", "").toPrettyString(false, 0, " ") == "<a></a>");
assert(Element.make("a", " ").toPrettyString(false, 0, " ") == "<a> </a>");//, Element.make("a", " ").toPrettyString(false, 0, " "));
assert(Element.make("a", "b").toPrettyString == "<a>b</a>"); assert(Element.make("a", "b").toPrettyString == "<a>b</a>");
assert(Element.make("a", "b").toPrettyString(false, 0, "") == "<a>b</a>"); assert(Element.make("a", "b").toPrettyString(false, 0, "") == "<a>b</a>");