do not emit newline between media query and ruleset
This commit is contained in:
parent
5c4f11e63d
commit
ec4fe9164d
@ -264,7 +264,9 @@ impl Css {
|
|||||||
last_toplevel = ToplevelKind::Other;
|
last_toplevel = ToplevelKind::Other;
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
if last_toplevel != ToplevelKind::Comment {
|
if last_toplevel != ToplevelKind::Comment
|
||||||
|
&& last_toplevel != ToplevelKind::Media
|
||||||
|
{
|
||||||
self.blocks.push(Toplevel::Newline);
|
self.blocks.push(Toplevel::Newline);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -624,7 +626,7 @@ impl Formatter for ExpandedFormatter {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if should_emit_newline {
|
if should_emit_newline && has_written {
|
||||||
should_emit_newline = false;
|
should_emit_newline = false;
|
||||||
writeln!(buf)?;
|
writeln!(buf)?;
|
||||||
}
|
}
|
||||||
|
@ -189,6 +189,36 @@ test!(
|
|||||||
}",
|
}",
|
||||||
"a {\n color: red;\n}\n\n@media (min-width: 0px) {\n a {\n color: red;\n }\n}\n@media (min-width: 0px) {\n a {\n color: red;\n }\n}\n"
|
"a {\n color: red;\n}\n\n@media (min-width: 0px) {\n a {\n color: red;\n }\n}\n@media (min-width: 0px) {\n a {\n color: red;\n }\n}\n"
|
||||||
);
|
);
|
||||||
|
test!(
|
||||||
|
no_newline_after_media_after_ruleset,
|
||||||
|
"a {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 0px) {
|
||||||
|
b {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
d {
|
||||||
|
color: red;
|
||||||
|
}",
|
||||||
|
"a {\n color: red;\n}\n\n@media (min-width: 0px) {\n b {\n color: red;\n }\n}\nd {\n color: red;\n}\n"
|
||||||
|
);
|
||||||
|
test!(
|
||||||
|
no_newline_after_media,
|
||||||
|
"@media (min-width: 0px) {
|
||||||
|
b {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
d {
|
||||||
|
color: red;
|
||||||
|
}",
|
||||||
|
"@media (min-width: 0px) {\n b {\n color: red;\n }\n}\nd {\n color: red;\n}\n"
|
||||||
|
);
|
||||||
|
|
||||||
error!(
|
error!(
|
||||||
media_feature_missing_closing_paren,
|
media_feature_missing_closing_paren,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user