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

Fix css rendering bug where nested styles would get eaten

Browse Source
This commit is contained in:
ConnorSkees 2020-01-11 17:24:50 -05:00
parent 97958b01a7
commit d3620be4d8
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/css.rs
View File

@ -49,6 +49,8 @@ impl Toplevel {
pub struct Css {
blocks: Vec<Toplevel>,
idx: usize,
inner_rulesets: usize,
at_root: bool,
}
impl Css {
@ -56,6 +58,8 @@ impl Css {
Css {
blocks: Vec::new(),
idx: 0,
inner_rulesets: 0,
at_root: true,
}
}
@ -65,12 +69,20 @@ impl Css {
fn parse_stmt(&mut self, stmt: Stmt) {
match stmt {
Stmt::Style(s) => self.blocks[self.idx - 1].push_style(s),
Stmt::Style(s) => {
assert!(self.idx >= 1);
if self.at_root {
self.blocks[self.idx - 1].push_style(s)
} else {
self.blocks[self.idx + self.inner_rulesets - 1].push_style(s)
}
},
Stmt::MultilineComment(s) => {
assert!(self.idx >= 1);
if self.idx == 0 {
self.blocks.push(Toplevel::MultilineComment(s));
} else {
self.blocks[self.idx - 1].push_comment(s)
self.blocks[self.idx + self.inner_rulesets - 1].push_comment(s)
}
}
Stmt::RuleSet(RuleSet {
@ -80,19 +92,25 @@ impl Css {
}) => {
if self.idx == 0 {
self.idx = self.blocks.len() + 1;
self.inner_rulesets = 0;
self.blocks
.push(Toplevel::new_rule(super_selector.zip(selector)));
for rule in rules {
self.at_root = true;
self.parse_stmt(rule);
self.at_root = true;
}
self.idx = 0;
} else {
self.idx += 1;
self.at_root = false;
self.blocks
.push(Toplevel::new_rule(super_selector.zip(selector)));
for rule in rules {
self.parse_stmt(rule);
}
self.idx -= 1;
self.inner_rulesets += 1;
}
}
}

6
src/main.rs
View File

@ -464,7 +464,6 @@ mod test_css {
"a, b {\n a, b {\n color: red\n}\n}\n",
"a a, a b, b a, b b {\n color: red;\n}\n"
);
test!(selector_element, "a {\n color: red;\n}\n");
test!(selector_id, "#id {\n color: red;\n}\n");
test!(selector_class, ".class {\n color: red;\n}\n");
@ -558,6 +557,11 @@ mod test_css {
"a b {\n color: red;\n}\n"
);
test!(removes_empty_styles, "a {}\n", "");
test!(
doesnt_eat_style_after_ruleset,
"a {\n b {\n color: red;\n}\n color: blue;\n}\n",
"a {\n color: blue;\n}\na b {\n color: red;\n}\n"
);
test!(
removes_inner_comments,