Skip to content

Try to converge in one pass when formatting a style attr with malva #113

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

Open
UnknownPlatypus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Try to converge in one pass when formatting a style attr with malva #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dprint_plugin/tests/integration/biome/style-attr.html.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ source: dprint_plugin/tests/integration.rs

<ul style="display: grid; grid-template-columns: 50% 50%; justify-items: stretch; padding: 0">
</ul>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>
8 changes: 8 additions & 0 deletions dprint_plugin/tests/integration/dprint_ts/style-attr.html.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ source: dprint_plugin/tests/integration.rs

<ul style="display: grid; grid-template-columns: 50% 50%; justify-items: stretch; padding: 0">
</ul>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>
15 changes: 15 additions & 0 deletions dprint_plugin/tests/integration/style-attr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,18 @@

<ul style="display: grid; grid-template-columns: 50% 50%; justify-items: stretch; padding: 0">
</ul>

<p
style="
margin: 0;
font-size: 14px;
display: flex;
flex-direction: column-reverse;
"
>
aaaa
</p>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>
2 changes: 2 additions & 0 deletions markup_fmt/src/printer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,6 +1972,8 @@ fn is_all_ascii_whitespace(s: &str) -> bool {

fn is_multi_line_attr(attr: &Attribute) -> bool {
match attr {
// External formatter (Malva) always format style attr on a single line (see `singleLineTopLevelDeclarations`)
Attribute::Native(attr) if attr.name.eq_ignore_ascii_case("style") => false,
Attribute::Native(attr) => attr
.value
.map(|(value, _)| value.trim().contains('\n'))
Expand Down
17 changes: 16 additions & 1 deletion markup_fmt/tests/fmt/html/attributes/style.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,19 @@
></div>

<div style="color: red; {{ otherStyles }}"
></div>
></div>

<p
style="
margin: 0;
font-size: 14px;
display: flex;
flex-direction: column-reverse;
"
>
aaaa
</p>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>
17 changes: 13 additions & 4 deletions markup_fmt/tests/fmt/html/attributes/style.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ source: markup_fmt/tests/fmt.rs
<div style=""></div>
<div style></div>

<div
style="all: initial;display: block;
<div style="all: initial;display: block;
contain: content;text-align: center;



background: linear-gradient(to left, hotpink, #FFF00F, #ccc, hsla(240, 100%, 50%, .05), transparent);
background: linear-gradient(to left, hsla(240, 100%, 50%, .05), red);
max-width: 500px;margin: 0 auto;
border-radius: 8px;transition: transform .2s ease-out;"
>
border-radius: 8px;transition: transform .2s ease-out;">
</div>

<div style="background: linear-gradient(to left, hotpink, hsla(240, 100%, 50%, .05), transparent);">
Expand Down Expand Up @@ -52,3 +50,14 @@ display: inline"></div>
<div style="{{ ...styles }}"></div>

<div style="color: red; {{ otherStyles }}"></div>

<p style="margin: 0;
font-size: 14px;
display: flex;
flex-direction: column-reverse;">
aaaa
</p>

<p style="margin: 0; font-size: 14px; display: flex; flex-direction: column-reverse">
aaaa
</p>