testea/test-repo
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes : #5915 HTML comments in pre tags causes bad formatting o… (#5959)

Browse Source
This commit is contained in:
Selvazhagan authored and Lipis committed 2020-01-06 21:00:09 +02:00
1 parent 1a18cf7fce
commit 024f51e5f8
4 files changed
+135
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

changelog_unreleased/html/pr-5959
+24
View File
@@ -0,0 +1,24 @@
#### Comments in `pre` tags caused bad formatting of following closing tag ([#5959](https://github.com/prettier/prettier/pull/5959) by [@selvazhagan](https://github.com/selvazhagan))
<!-- prettier-ignore -->
```
<!-- Input -->
<details>
<pre>
<!-- TEST -->
</pre></details>
<!-- Output (Prettier stable) -->
<details>
<pre>
<!-- TEST -->
</pre></details</details
>
<!-- Output (Prettier master) -->
<details>
<pre>
<!-- TEST -->
</pre>
</details>
```
src/language-html/utils.js
+2
View File
@@ -194,6 +194,7 @@ function isLeadingSpaceSensitiveNode(node) {
if (
!node.prev &&
(node.parent.type === "root" ||
(isPreLikeNode(node) && node.parent) ||
isScriptLikeTag(node.parent) ||
!isFirstChildLeadingSpaceSensitiveCssDisplay(node.parent.cssDisplay))
) {
@@ -235,6 +236,7 @@ function isTrailingSpaceSensitiveNode(node) {
if (
!node.next &&
(node.parent.type === "root" ||
(isPreLikeNode(node) && node.parent) ||
isScriptLikeTag(node.parent) ||
!isLastChildTrailingSpaceSensitiveCssDisplay(node.parent.cssDisplay))
) {
tests/html_tags/__snapshots__/jsfmt.spec.js.snap
+100
View File
@@ -806,6 +806,15 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre></details>
<details><pre>
<!--Comments-->
</pre>
</details>
=====================================output=====================================
<pre>
--------------------------------------------------------------------------------
@@ -896,6 +905,17 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre>
</details>
<details>
<pre>
<!--Comments-->
</pre>
</details>
================================================================================
`;
@@ -986,6 +1006,15 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre></details>
<details><pre>
<!--Comments-->
</pre>
</details>
=====================================output=====================================
<pre>
--------------------------------------------------------------------------------
@@ -1100,6 +1129,17 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre>
</details>
<details>
<pre>
<!--Comments-->
</pre>
</details>
================================================================================
`;
@@ -1189,6 +1229,15 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre></details>
<details><pre>
<!--Comments-->
</pre>
</details>
=====================================output=====================================
<pre>
--------------------------------------------------------------------------------
@@ -1271,6 +1320,17 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre>
</details>
<details>
<pre>
<!--Comments-->
</pre>
</details>
================================================================================
`;
@@ -1362,6 +1422,15 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre></details>
<details><pre>
<!--Comments-->
</pre>
</details>
=====================================output=====================================
<pre>
--------------------------------------------------------------------------------
@@ -1452,6 +1521,17 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre>
</details>
<details>
<pre>
<!--Comments-->
</pre>
</details>
================================================================================
`;
@@ -1543,6 +1623,15 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre></details>
<details><pre>
<!--Comments-->
</pre>
</details>
=====================================output=====================================
<pre>
--------------------------------------------------------------------------------
@@ -1633,6 +1722,17 @@ ___________________________
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre>
</details>
<details>
<pre>
<!--Comments-->
</pre>
</details>
================================================================================
`;
tests/html_tags/pre.html
+9
View File
@@ -78,3 +78,12 @@ ___________________________
<pre></pre>
<pre><code #foo></code></pre>
<details>
<pre><!--Comments-->
</pre></details>
<details><pre>
<!--Comments-->
</pre>
</details>