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

better html pretty-printer

This commit is contained in:
Adam D. Ruppe 2017-11-17 13:09:07 -05:00
parent 7005ec0edd
commit d8b40df352
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dom.d
View File

@ -3127,7 +3127,7 @@ class Element {
// 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(children.length == 1 && children[0].nodeType == NodeType.Text) if(children.length == 1 && children[0].nodeType == NodeType.Text && children[0].nodeValue.strip.length)
s ~= children[0].toString(); s ~= children[0].toString();
else else
foreach(child; children) { foreach(child; children) {
@ -3137,7 +3137,7 @@ class Element {
} }
// see comment above // see comment above
if(!(children.length == 1 && children[0].nodeType == NodeType.Text)) if(!(children.length == 1 && children[0].nodeType == NodeType.Text && children[0].nodeValue.strip.length))
s ~= toPrettyStringIndent(insertComments, indentationLevel); s ~= toPrettyStringIndent(insertComments, indentationLevel);
s ~= "</"; s ~= "</";
@ -4285,6 +4285,27 @@ class TextNode : Element {
override string toPrettyString(bool insertComments = false, int indentationLevel = 0) const { override string toPrettyString(bool insertComments = false, int indentationLevel = 0) const {
string s; string s;
string contents = this.contents;
// we will first collapse the whitespace per html
// sort of. note this can break stuff yo!!!!
if(this.parentNode is null || this.parentNode.tagName != "pre") {
string n = "";
bool lastWasWhitespace = indentationLevel > 0;
foreach(char c; contents) {
if(c == ' ' || c == '\n' || c == '\r' || c == '\t') {
if(!lastWasWhitespace)
n ~= ' ';
lastWasWhitespace = true;
} else {
n ~= c;
lastWasWhitespace = false;
}
}
contents = n;
}
auto e = htmlEntitiesEncode(contents); auto e = htmlEntitiesEncode(contents);
import std.algorithm.iteration : splitter; import std.algorithm.iteration : splitter;
bool first = true; bool first = true;