shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

space between styles inside @supports

Browse Source
This commit is contained in:
Connor Skees 2021-07-24 00:58:12 -04:00
parent d81d368d8a
commit 36411e36d3
3 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib.rs
View File

@ -106,7 +106,7 @@ pub(crate) use crate::token::Token;
use crate::{ use crate::{
builtin::modules::{ModuleConfig, Modules}, builtin::modules::{ModuleConfig, Modules},
lexer::Lexer, lexer::Lexer,
output::Css, output::{AtRuleContext, Css},
parse::{ parse::{
common::{ContextFlags, NeverEmptyVec}, common::{ContextFlags, NeverEmptyVec},
Parser, Parser,
@ -295,7 +295,7 @@ fn from_string_with_file_name(input: String, file_name: &str, options: &Options)
.parse() .parse()
.map_err(|e| raw_to_parse_error(&map, *e, options.unicode_error_messages))?; .map_err(|e| raw_to_parse_error(&map, *e, options.unicode_error_messages))?;
Css::from_stmts(stmts, false, options.allows_charset) Css::from_stmts(stmts, AtRuleContext::None, options.allows_charset)
.map_err(|e| raw_to_parse_error(&map, *e, options.unicode_error_messages))? .map_err(|e| raw_to_parse_error(&map, *e, options.unicode_error_messages))?
.pretty_print(&map, options.style) .pretty_print(&map, options.style)
.map_err(|e| raw_to_parse_error(&map, *e, options.unicode_error_messages)) .map_err(|e| raw_to_parse_error(&map, *e, options.unicode_error_messages))

48
src/output.rs
View File

@ -125,16 +125,16 @@ impl Toplevel {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub(crate) struct Css { pub(crate) struct Css {
blocks: Vec<Toplevel>, blocks: Vec<Toplevel>,
in_at_rule: bool, at_rule_context: AtRuleContext,
allows_charset: bool, allows_charset: bool,
plain_imports: Vec<Toplevel>, plain_imports: Vec<Toplevel>,
} }
impl Css { impl Css {
pub const fn new(in_at_rule: bool, allows_charset: bool) -> Self { pub const fn new(at_rule_context: AtRuleContext, allows_charset: bool) -> Self {
Css { Css {
blocks: Vec::new(), blocks: Vec::new(),
in_at_rule, at_rule_context,
allows_charset, allows_charset,
plain_imports: Vec::new(), plain_imports: Vec::new(),
} }
@ -142,10 +142,10 @@ impl Css {
pub(crate) fn from_stmts( pub(crate) fn from_stmts(
s: Vec<Stmt>, s: Vec<Stmt>,
in_at_rule: bool, at_rule_context: AtRuleContext,
allows_charset: bool, allows_charset: bool,
) -> SassResult<Self> { ) -> SassResult<Self> {
Css::new(in_at_rule, allows_charset).parse_stylesheet(s) Css::new(at_rule_context, allows_charset).parse_stylesheet(s)
} }
fn parse_stmt(&mut self, stmt: Stmt) -> SassResult<Vec<Toplevel>> { fn parse_stmt(&mut self, stmt: Stmt) -> SassResult<Vec<Toplevel>> {
@ -381,7 +381,7 @@ impl Formatter for CompressedFormatter {
} }
write!(buf, "{{")?; write!(buf, "{{")?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Unknown, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "}}")?; write!(buf, "}}")?;
} }
@ -400,7 +400,7 @@ impl Formatter for CompressedFormatter {
} }
write!(buf, "{{")?; write!(buf, "{{")?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Keyframes, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "}}")?; write!(buf, "}}")?;
} }
@ -417,7 +417,7 @@ impl Formatter for CompressedFormatter {
} }
write!(buf, "{{")?; write!(buf, "{{")?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Supports, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "}}")?; write!(buf, "}}")?;
} }
@ -427,7 +427,7 @@ impl Formatter for CompressedFormatter {
} }
write!(buf, "@media {}{{", query)?; write!(buf, "@media {}{{", query)?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Media, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "}}")?; write!(buf, "}}")?;
} }
@ -495,6 +495,16 @@ struct Previous {
is_group_end: bool, is_group_end: bool,
} }
/// What kind of @-rule are we currently inside
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub(crate) enum AtRuleContext {
Media,
Supports,
Keyframes,
Unknown,
None,
}
impl Formatter for ExpandedFormatter { impl Formatter for ExpandedFormatter {
fn write_css(&mut self, buf: &mut Vec<u8>, css: Css, map: &CodeMap) -> SassResult<()> { fn write_css(&mut self, buf: &mut Vec<u8>, css: Css, map: &CodeMap) -> SassResult<()> {
let padding = " ".repeat(self.nesting); let padding = " ".repeat(self.nesting);
@ -512,7 +522,9 @@ impl Formatter for ExpandedFormatter {
if let Some(prev) = prev { if let Some(prev) = prev {
writeln!(buf)?; writeln!(buf)?;
if prev.is_group_end && !css.in_at_rule { if (prev.is_group_end && css.at_rule_context == AtRuleContext::None)
|| css.at_rule_context == AtRuleContext::Supports
{
writeln!(buf)?; writeln!(buf)?;
} }
} }
@ -570,7 +582,7 @@ impl Formatter for ExpandedFormatter {
} }
writeln!(buf, " {{")?; writeln!(buf, " {{")?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Unknown, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "\n{}}}", padding)?; write!(buf, "\n{}}}", padding)?;
} }
@ -590,7 +602,7 @@ impl Formatter for ExpandedFormatter {
} }
writeln!(buf, " {{")?; writeln!(buf, " {{")?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Keyframes, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "\n{}}}", padding)?; write!(buf, "\n{}}}", padding)?;
} }
@ -608,7 +620,7 @@ impl Formatter for ExpandedFormatter {
} }
writeln!(buf, " {{")?; writeln!(buf, " {{")?;
let css = Css::from_stmts(body, true, css.allows_charset)?; let css = Css::from_stmts(body, AtRuleContext::Supports, css.allows_charset)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "\n{}}}", padding)?; write!(buf, "\n{}}}", padding)?;
} }
@ -619,7 +631,15 @@ impl Formatter for ExpandedFormatter {
.. ..
} => { } => {
writeln!(buf, "{}@media {} {{", padding, query)?; writeln!(buf, "{}@media {} {{", padding, query)?;
let css = Css::from_stmts(body, inside_rule, css.allows_charset)?; let css = Css::from_stmts(
body,
if inside_rule {
AtRuleContext::Media
} else {
AtRuleContext::None
},
css.allows_charset,
)?;
self.write_css(buf, css, map)?; self.write_css(buf, css, map)?;
write!(buf, "\n{}}}", padding)?; write!(buf, "\n{}}}", padding)?;
} }

13
tests/supports.rs
View File

@ -14,3 +14,16 @@ test!(
}", }",
"@supports (a: b) {\n a {\n color: red;\n }\n}\na {\n color: green;\n}\n" "@supports (a: b) {\n a {\n color: red;\n }\n}\na {\n color: green;\n}\n"
); );
test!(
newline_between_styles_inside,
"@supports (-ms-ime-align: auto) {
a {
color: red;
}
b {
color: green;
}
}",
"@supports (-ms-ime-align: auto) {\n a {\n color: red;\n }\n\n b {\n color: green;\n }\n}\n"
);