From 42f7b6025e32a6973ea8b3b024275f6f8b9dcec9 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Sun, 20 Jan 2019 11:15:18 +0800
Subject: [PATCH] fix(javascript): remove unnecessary linebreaks from html
 templates (#5771)

---
 src/language-js/embed.js                      | 12 +----------
 .../__snapshots__/jsfmt.spec.js.snap          | 20 +++++++++++++++++++
 tests/multiparser_js_html/lit-html.js         |  9 +++++++++
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/language-js/embed.js b/src/language-js/embed.js
index fa96ede4..97511443 100644
--- a/src/language-js/embed.js
+++ b/src/language-js/embed.js
@@ -610,18 +610,8 @@ function printHtmlTemplateLiteral(path, print, textToDoc, parser) {
         }
 
         const placeholderIndex = +component;
-
         parts.push(
-          concat([
-            "${",
-            group(
-              concat([
-                indent(concat([softline, expressionDocs[placeholderIndex]])),
-                softline
-              ])
-            ),
-            "}"
-          ])
+          concat(["${", group(expressionDocs[placeholderIndex]), "}"])
         );
       }
 
diff --git a/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap
index 0503fddd..3a7734fa 100644
--- a/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap
@@ -59,6 +59,15 @@ html\`  <\${Footer}  >footer      content<//     >  \`
 
 html\`  <div />  \`
 
+function HelloWorld() {
+  return html\`
+    <h3>Bar List</h3>
+    \${bars.map(bar => html\`
+       <p>\${bar}</p>
+    \`)}
+  \`;
+}
+
 =====================================output=====================================
 import { LitElement, html } from "@polymer/lit-element";
 
@@ -110,5 +119,16 @@ html\`
   <div />
 \`;
 
+function HelloWorld() {
+  return html\`
+    <h3>Bar List</h3>
+    \${bars.map(
+      bar => html\`
+        <p>\${bar}</p>
+      \`
+    )}
+  \`;
+}
+
 ================================================================================
 `;
diff --git a/tests/multiparser_js_html/lit-html.js b/tests/multiparser_js_html/lit-html.js
index 85e0dc4e..e5a511c3 100644
--- a/tests/multiparser_js_html/lit-html.js
+++ b/tests/multiparser_js_html/lit-html.js
@@ -50,3 +50,12 @@ html`<my-element obj=${obj}></my-element>`;
 html`  <${Footer}  >footer      content<//     >  `
 
 html`  <div />  `
+
+function HelloWorld() {
+  return html`
+    <h3>Bar List</h3>
+    ${bars.map(bar => html`
+       <p>${bar}</p>
+    `)}
+  `;
+}