Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(html): handle pre with interpolation #5400

Merged
merged 2 commits into from Nov 9, 2018
Merged

feat(html): handle pre with interpolation #5400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f14f1c
test: add tests
ikatyang Nov 8, 2018
f25d9b4
feat(html): handle pre with interpolation
ikatyang Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/language-html/printer-html.js
View file
Open in desktop
Expand Up @@ -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 &&
Expand Down
4 changes: 3 additions & 1 deletion src/language-html/utils.js
View file
Open in desktop
Expand Up @@ -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;
}
Expand Down
74 changes: 74 additions & 0 deletions tests/html_vue/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -867,6 +880,30 @@ 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`] = `
Expand Down Expand Up @@ -898,6 +935,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
Expand Down Expand Up @@ -932,6 +982,30 @@ 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`] = `
Expand Down
13 changes: 13 additions & 0 deletions tests/html_vue/pre-child.vue
View file
Open in desktop
Expand Up @@ -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>