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

allow id selectors to start with numbers

Browse Source
This commit is contained in:
ConnorSkees 2020-03-30 00:18:37 -04:00
parent 5e32225212
commit 8f96a821f7
2 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/selector.rs
View File

@ -257,14 +257,18 @@ impl<'a> SelectorParser<'a> {
self.selectors.push(SelectorKind::Whitespace);
return Ok(());
}
if let Some(Token { kind, .. }) = tokens.next() {
if let Some(Token { kind, .. }) = tokens.peek() {
match kind {
v @ 'a'..='z' | v @ 'A'..='Z' | v @ '-' | v @ '_' => {
let s = format!("{}{}", v, eat_ident_no_interpolation(tokens)?);
'a'..='z' | 'A'..='Z' | '-' | '_' | '0'..='9' | '\\' => {
let s = eat_ident_no_interpolation(tokens)?;
self.selectors.push(SelectorKind::Element(s))
}
'.' => self.selectors.push(SelectorKind::Class),
'.' => {
tokens.next();
self.selectors.push(SelectorKind::Class)
}
'#' => {
tokens.next();
if tokens.peek().unwrap().kind == '{' {
tokens.next();
self.is_interpolated = true;
@ -280,29 +284,53 @@ impl<'a> SelectorParser<'a> {
self.selectors.push(SelectorKind::Id)
}
}
':' => self.consume_pseudo_selector(tokens)?,
':' => {
tokens.next();
self.consume_pseudo_selector(tokens)?
}
',' => {
tokens.next();
self.selectors.push(SelectorKind::Multiple);
if tokens.peek().unwrap().kind == '\n' {
self.selectors.push(SelectorKind::Newline);
devour_whitespace(tokens);
}
}
'>' => self.selectors.push(SelectorKind::ImmediateChild),
'+' => self.selectors.push(SelectorKind::Following),
'~' => self.selectors.push(SelectorKind::Preceding),
'*' => self.selectors.push(SelectorKind::Universal),
'%' => self.selectors.push(SelectorKind::Placeholder),
'>' => {
tokens.next();
self.selectors.push(SelectorKind::ImmediateChild)
}
'+' => {
tokens.next();
self.selectors.push(SelectorKind::Following)
}
'~' => {
tokens.next();
self.selectors.push(SelectorKind::Preceding)
}
'*' => {
tokens.next();
self.selectors.push(SelectorKind::Universal)
}
'%' => {
tokens.next();
self.selectors.push(SelectorKind::Placeholder)
}
'&' => self.selectors.push(if self.is_interpolated {
tokens.next();
SelectorKind::InterpolatedSuper
} else {
tokens.next();
SelectorKind::Super
}),
'[' => self.selectors.push(Attribute::from_tokens(
tokens,
self.scope,
self.super_selector,
)?),
'[' => {
tokens.next();
self.selectors.push(Attribute::from_tokens(
tokens,
self.scope,
self.super_selector,
)?)
}
_ => todo!("unimplemented selector"),
};
}

2
tests/selectors.rs
View File

@ -303,3 +303,5 @@ test!(
// "#{&} a {\n color: red;\n}\n",
// "a {\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");