From 2f14f1c30040bd84eb54f9f887ae641361df8228 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Thu, 8 Nov 2018 20:22:03 +0800
Subject: [PATCH 1/2] test: add tests

---
 .../html_vue/__snapshots__/jsfmt.spec.js.snap | 52 +++++++++++++++++++
 tests/html_vue/pre-child.vue                  | 13 +++++
 2 files changed, 65 insertions(+)

diff --git a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
index cfb1254a31cb..3f7a96b33957 100644
--- a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
@@ -833,6 +833,19 @@ exports[`pre-child.vue - vue-verify 1`] = `
     <code class="d-block">{{ code }}</code>
   </pre>
 </template>
+
+<template>
+<pre class='woot'>
+  {{ stuff }}
+  </pre>
+</template>
+
+<template>
+<pre class='woot'>
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+    </pre>
+</template>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <!--
   copied from https://github.com/gitlabhq/gitlabhq/blob/master/app/assets/javascripts/ide/components/jobs/detail.vue
@@ -867,6 +880,19 @@ exports[`pre-child.vue - vue-verify 1`] = `
   </pre>
 </template>
 
+<template>
+  <pre class='woot'>
+  {{ stuff }}
+  </pre>
+</template>
+
+<template>
+  <pre class='woot'>
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+    </pre>
+</template>
+
 `;
 
 exports[`pre-child.vue - vue-verify 2`] = `
@@ -898,6 +924,19 @@ exports[`pre-child.vue - vue-verify 2`] = `
     <code class="d-block">{{ code }}</code>
   </pre>
 </template>
+
+<template>
+<pre class='woot'>
+  {{ stuff }}
+  </pre>
+</template>
+
+<template>
+<pre class='woot'>
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+    </pre>
+</template>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <!--
   copied from https://github.com/gitlabhq/gitlabhq/blob/master/app/assets/javascripts/ide/components/jobs/detail.vue
@@ -932,6 +971,19 @@ exports[`pre-child.vue - vue-verify 2`] = `
   </pre>
 </template>
 
+<template>
+  <pre class='woot'>
+  {{ stuff }}
+  </pre>
+</template>
+
+<template>
+  <pre class='woot'>
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+    </pre>
+</template>
+
 `;
 
 exports[`script_src.vue - vue-verify 1`] = `
diff --git a/tests/html_vue/pre-child.vue b/tests/html_vue/pre-child.vue
index 5dc17348ce8c..e617e4f98b75 100644
--- a/tests/html_vue/pre-child.vue
+++ b/tests/html_vue/pre-child.vue
@@ -26,3 +26,16 @@
     <code class="d-block">{{ code }}</code>
   </pre>
 </template>
+
+<template>
+<pre class='woot'>
+  {{ stuff }}
+  </pre>
+</template>
+
+<template>
+<pre class='woot'>
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
+    </pre>
+</template>

From f25d9b488b752c2ae5162a362f275b73898f635b Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Thu, 8 Nov 2018 20:22:26 +0800
Subject: [PATCH 2/2] feat(html): handle pre with interpolation

---
 src/language-html/printer-html.js             |  6 ++-
 src/language-html/utils.js                    |  4 +-
 .../html_vue/__snapshots__/jsfmt.spec.js.snap | 42 ++++++++++++++-----
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index fb5f58c328ff..6dcf29609c5b 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -200,7 +200,11 @@ function genericPrint(path, options, print) {
                         : node.firstChild.type === "text" &&
                           node.firstChild.isWhitespaceSensitive &&
                           node.firstChild.isIndentationSensitive
-                        ? node.firstChild.value.indexOf("\n") === -1
+                        ? (node.children.length === 1 &&
+                            node.firstChild.type === "text" &&
+                            node.firstChild.value.indexOf("\n") === -1) ||
+                          node.firstChild.sourceSpan.start.line ===
+                            node.lastChild.sourceSpan.end.line
                           ? ""
                           : literalline
                         : node.firstChild.hasLeadingSpaces &&
diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index 9dd78fecf90c..7ad32b06cf1a 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -43,7 +43,9 @@ function hasPrettierIgnore(path) {
   // TODO: handle non-text children in <pre>
   if (
     isPreLikeNode(node) &&
-    node.children.some(child => child.type !== "text")
+    node.children.some(
+      child => child.type !== "text" && child.type !== "interpolation"
+    )
   ) {
     return true;
   }
diff --git a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
index 3f7a96b33957..cfd9da489fde 100644
--- a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
@@ -881,16 +881,27 @@ exports[`pre-child.vue - vue-verify 1`] = `
 </template>
 
 <template>
-  <pre class='woot'>
+  <pre class="woot">
   {{ stuff }}
   </pre>
 </template>
 
 <template>
-  <pre class='woot'>
-  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
-  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
-    </pre>
+  <pre class="woot">
+  123{{
+      wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq
+    }}123
+  123{{
+      wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq
+    }}123
+    </pre
+  >
 </template>
 
 `;
@@ -972,16 +983,27 @@ exports[`pre-child.vue - vue-verify 2`] = `
 </template>
 
 <template>
-  <pre class='woot'>
+  <pre class="woot">
   {{ stuff }}
   </pre>
 </template>
 
 <template>
-  <pre class='woot'>
-  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
-  123{{ wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq || wqeqwwqwqweqweqwewwq }}123
-    </pre>
+  <pre class="woot">
+  123{{
+      wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq
+    }}123
+  123{{
+      wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq ||
+        wqeqwwqwqweqweqwewwq
+    }}123
+    </pre
+  >
 </template>
 
 `;