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

properly handle interpolation in selectors

Browse Source
This commit is contained in:
ConnorSkees 2020-03-30 02:30:44 -04:00
parent 57a704172f
commit 31ec0cc7f8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib.rs
View File

@ -600,9 +600,8 @@ pub(crate) fn eat_expr<I: Iterator<Item = Token>>(
} }
'#' => { '#' => {
values.push(toks.next().unwrap()); values.push(toks.next().unwrap());
let next = toks.next().unwrap(); if toks.peek().unwrap().kind == '{' {
values.push(next); values.push(toks.next().unwrap());
if next.kind == '{' {
values.extend(eat_interpolation(toks)); values.extend(eat_interpolation(toks));
} }
} }

2
src/selector.rs
View File

@ -269,7 +269,7 @@ impl<'a> SelectorParser<'a> {
} }
'#' => { '#' => {
tokens.next(); tokens.next();
if tokens.peek().unwrap().kind == '{' { if tokens.peek().is_some() && tokens.peek().unwrap().kind == '{' {
tokens.next(); tokens.next();
self.is_interpolated = true; self.is_interpolated = true;
self.tokens_to_selectors( self.tokens_to_selectors(

5
tests/selectors.rs
View File

@ -305,3 +305,8 @@ test!(
// ); // );
test!(allows_id_start_with_number, "#2foo {\n color: red;\n}\n"); test!(allows_id_start_with_number, "#2foo {\n color: red;\n}\n");
test!(allows_id_only_number, "#2 {\n color: red;\n}\n"); test!(allows_id_only_number, "#2 {\n color: red;\n}\n");
test!(
id_interpolation,
"$zzz: zzz;\n##{$zzz} {\n a: b;\n}\n",
"#zzz {\n a: b;\n}\n"
);