Diff
Modified: trunk/LayoutTests/ChangeLog (199555 => 199556)
--- trunk/LayoutTests/ChangeLog 2016-04-14 21:37:04 UTC (rev 199555)
+++ trunk/LayoutTests/ChangeLog 2016-04-14 21:46:20 UTC (rev 199556)
@@ -1,3 +1,15 @@
+2016-04-14 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Add a _javascript_ Formatting test for template strings
+ https://bugs.webkit.org/show_bug.cgi?id=156600
+
+ Reviewed by Brian Burg.
+
+ * inspector/formatting/formatting-_javascript_-expected.txt:
+ * inspector/formatting/formatting-_javascript_.html:
+ * inspector/formatting/resources/_javascript_-tests/template-strings-expected.js: Added.
+ * inspector/formatting/resources/_javascript_-tests/template-strings.js: Added.
+
2016-04-14 Antonio Gomes <[email protected]>
Allow listbox content and scrollbar to intrude padding area.
Modified: trunk/LayoutTests/inspector/formatting/formatting-_javascript_-expected.txt (199555 => 199556)
--- trunk/LayoutTests/inspector/formatting/formatting-_javascript_-expected.txt 2016-04-14 21:37:04 UTC (rev 199555)
+++ trunk/LayoutTests/inspector/formatting/formatting-_javascript_-expected.txt 2016-04-14 21:46:20 UTC (rev 199556)
@@ -56,6 +56,9 @@
-- Running test case: EsprimaFormatter._javascript_.switch-case-default.js
PASS
+-- Running test case: EsprimaFormatter._javascript_.template-strings.js
+PASS
+
-- Running test case: EsprimaFormatter._javascript_.ternary-expressions.js
PASS
Modified: trunk/LayoutTests/inspector/formatting/formatting-_javascript_.html (199555 => 199556)
--- trunk/LayoutTests/inspector/formatting/formatting-_javascript_.html 2016-04-14 21:37:04 UTC (rev 199555)
+++ trunk/LayoutTests/inspector/formatting/formatting-_javascript_.html 2016-04-14 21:46:20 UTC (rev 199556)
@@ -27,6 +27,7 @@
"resources/_javascript_-tests/sample-normal-utilities.js",
"resources/_javascript_-tests/sample-webinspector-object.js",
"resources/_javascript_-tests/switch-case-default.js",
+ "resources/_javascript_-tests/template-strings.js",
"resources/_javascript_-tests/ternary-expressions.js",
"resources/_javascript_-tests/throw-statement.js",
"resources/_javascript_-tests/try-catch-finally-statements.js",
Added: trunk/LayoutTests/inspector/formatting/resources/_javascript_-tests/template-strings-expected.js (0 => 199556)
--- trunk/LayoutTests/inspector/formatting/resources/_javascript_-tests/template-strings-expected.js (rev 0)
+++ trunk/LayoutTests/inspector/formatting/resources/_javascript_-tests/template-strings-expected.js 2016-04-14 21:46:20 UTC (rev 199556)
@@ -0,0 +1,10 @@
+`template string`
+`${1 + 1}`
+`${1 + 1}`
+`before ${1 + 1} after`
+`before ${`nested ${1 + 1}`} after`
+`before ${`nested ${1 + 1}`} after`
+
+tag`tagged template string`
+tag`tagged template string`
+tag`before ${1 + 1} after`
Added: trunk/LayoutTests/inspector/formatting/resources/_javascript_-tests/template-strings.js (0 => 199556)
--- trunk/LayoutTests/inspector/formatting/resources/_javascript_-tests/template-strings.js (rev 0)
+++ trunk/LayoutTests/inspector/formatting/resources/_javascript_-tests/template-strings.js 2016-04-14 21:46:20 UTC (rev 199556)
@@ -0,0 +1,10 @@
+`template string`
+`${1+1}`
+`${ 1 + 1 }`
+`before ${1+1} after`
+`before ${`nested ${1+1}`} after`
+`before ${`nested ${1+1}`} after`
+
+tag`tagged template string`
+tag `tagged template string`
+tag`before ${1+1} after`
Modified: trunk/Source/WebInspectorUI/ChangeLog (199555 => 199556)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-14 21:37:04 UTC (rev 199555)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-14 21:46:20 UTC (rev 199556)
@@ -1,3 +1,12 @@
+2016-04-14 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Add a _javascript_ Formatting test for template strings
+ https://bugs.webkit.org/show_bug.cgi?id=156600
+
+ Reviewed by Brian Burg.
+
+ * Tools/Formatting/index.html:
+
2016-04-14 Carlos Garcia Campos <[email protected]>
REGRESSION: Web Inspector: Remote inspector doesn't work
Modified: trunk/Source/WebInspectorUI/Tools/Formatting/index.html (199555 => 199556)
--- trunk/Source/WebInspectorUI/Tools/Formatting/index.html 2016-04-14 21:37:04 UTC (rev 199555)
+++ trunk/Source/WebInspectorUI/Tools/Formatting/index.html 2016-04-14 21:46:20 UTC (rev 199556)
@@ -61,6 +61,7 @@
"generators.js",
"comments-and-preserve-newlines.js",
"comments-only.js",
+ "template-strings.js",
"sample-webinspector-object.js",
"sample-normal-utilities.js",
"sample-jquery.js",
