Title: [250152] trunk
- Revision
- 250152
- Author
- drou...@apple.com
- Date
- 2019-09-20 14:23:20 -0700 (Fri, 20 Sep 2019)
Log Message
Web Inspector: HTML Formatter - better indentation/newline handling for self closing tags
https://bugs.webkit.org/show_bug.cgi?id=202036
Reviewed by Joseph Pecoraro.
Source/WebInspectorUI:
* UserInterface/Workers/Formatter/HTMLFormatter.js:
(HTMLFormatter.prototype._before):
LayoutTests:
* inspector/formatting/formatting-xml.html:
* inspector/formatting/formatting-xml-expected.txt:
* inspector/formatting/resources/xml-tests/self-closing.xml: Added.
* inspector/formatting/resources/xml-tests/self-closing-expected.xml: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (250151 => 250152)
--- trunk/LayoutTests/ChangeLog 2019-09-20 21:06:26 UTC (rev 250151)
+++ trunk/LayoutTests/ChangeLog 2019-09-20 21:23:20 UTC (rev 250152)
@@ -1,3 +1,15 @@
+2019-09-20 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: HTML Formatter - better indentation/newline handling for self closing tags
+ https://bugs.webkit.org/show_bug.cgi?id=202036
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/formatting/formatting-xml.html:
+ * inspector/formatting/formatting-xml-expected.txt:
+ * inspector/formatting/resources/xml-tests/self-closing.xml: Added.
+ * inspector/formatting/resources/xml-tests/self-closing-expected.xml: Added.
+
2019-09-20 Truitt Savell <tsav...@apple.com>
Unreviewed, rolling out r250114.
Modified: trunk/LayoutTests/inspector/formatting/formatting-xml-expected.txt (250151 => 250152)
--- trunk/LayoutTests/inspector/formatting/formatting-xml-expected.txt 2019-09-20 21:06:26 UTC (rev 250151)
+++ trunk/LayoutTests/inspector/formatting/formatting-xml-expected.txt 2019-09-20 21:23:20 UTC (rev 250152)
@@ -6,6 +6,7 @@
PASS: atom.xml
PASS: basic.xml
PASS: rss.xml
+PASS: self-closing.xml
PASS: tag-case.xml
PASS: valid-html-invalid-xml.xml
PASS: xslt.xml
Modified: trunk/LayoutTests/inspector/formatting/formatting-xml.html (250151 => 250152)
--- trunk/LayoutTests/inspector/formatting/formatting-xml.html 2019-09-20 21:06:26 UTC (rev 250151)
+++ trunk/LayoutTests/inspector/formatting/formatting-xml.html 2019-09-20 21:23:20 UTC (rev 250152)
@@ -12,6 +12,7 @@
"resources/xml-tests/atom.xml",
"resources/xml-tests/basic.xml",
"resources/xml-tests/rss.xml",
+ "resources/xml-tests/self-closing.xml",
"resources/xml-tests/tag-case.xml",
"resources/xml-tests/valid-html-invalid-xml.xml",
"resources/xml-tests/xslt.xml",
Added: trunk/LayoutTests/inspector/formatting/resources/xml-tests/self-closing-expected.xml (0 => 250152)
--- trunk/LayoutTests/inspector/formatting/resources/xml-tests/self-closing-expected.xml (rev 0)
+++ trunk/LayoutTests/inspector/formatting/resources/xml-tests/self-closing-expected.xml 2019-09-20 21:23:20 UTC (rev 250152)
@@ -0,0 +1,11 @@
+<rect/>
+<circle/>
+<path/>
+<g>
+ <rect/>
+ <circle/>
+ <path/>
+</g>
+<rect/>
+<circle/>
+<path/>
Added: trunk/LayoutTests/inspector/formatting/resources/xml-tests/self-closing.xml (0 => 250152)
--- trunk/LayoutTests/inspector/formatting/resources/xml-tests/self-closing.xml (rev 0)
+++ trunk/LayoutTests/inspector/formatting/resources/xml-tests/self-closing.xml 2019-09-20 21:23:20 UTC (rev 250152)
@@ -0,0 +1 @@
+<rect/><circle/><path/><g><rect/><circle/><path/></g><rect/><circle/><path/>
\ No newline at end of file
Modified: trunk/Source/WebInspectorUI/ChangeLog (250151 => 250152)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-09-20 21:06:26 UTC (rev 250151)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-09-20 21:23:20 UTC (rev 250152)
@@ -1,3 +1,13 @@
+2019-09-20 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: HTML Formatter - better indentation/newline handling for self closing tags
+ https://bugs.webkit.org/show_bug.cgi?id=202036
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Workers/Formatter/HTMLFormatter.js:
+ (HTMLFormatter.prototype._before):
+
2019-09-20 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Remove BranchManager in favor of just using currentRevision
Modified: trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/HTMLFormatter.js (250151 => 250152)
--- trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/HTMLFormatter.js 2019-09-20 21:06:26 UTC (rev 250151)
+++ trunk/Source/WebInspectorUI/UserInterface/Workers/Formatter/HTMLFormatter.js 2019-09-20 21:23:20 UTC (rev 250152)
@@ -208,7 +208,7 @@
this._builder.appendNonToken("/");
this._builder.appendNonToken(">");
- if (node.__shouldHaveNoChildren)
+ if (node.selfClose || node.__shouldHaveNoChildren)
this._builder.appendNewline();
if (!node.__inlineContent) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
