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

Better error for missing identifier after : in selector

Browse Source
This commit is contained in:
ConnorSkees 2020-02-17 09:40:30 -05:00
parent bb16060ddb
commit 85a2c8eaeb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/selector.rs
View File

@ -212,7 +212,10 @@ impl<'a> SelectorParser<'a> {
Ok(Selector(self.selectors)) Ok(Selector(self.selectors))
} }
fn consume_pseudo_selector(&mut self, tokens: &'_ mut Peekable<IntoIter<Token>>) { fn consume_pseudo_selector(
&mut self,
tokens: &'_ mut Peekable<IntoIter<Token>>,
) -> SassResult<()> {
if let Some(tok) = tokens.next() { if let Some(tok) = tokens.next() {
match tok.kind { match tok.kind {
TokenKind::Ident(s) => { TokenKind::Ident(s) => {
@ -250,9 +253,10 @@ impl<'a> SelectorParser<'a> {
self.selectors.push(SelectorKind::PseudoElement(s)) self.selectors.push(SelectorKind::PseudoElement(s))
} }
} }
_ => todo!("expected ident or `:` after `:` in selector"), _ => return Err("Expected identifier.".into()),
} }
} }
Ok(())
} }
fn tokens_to_selectors(&mut self, tokens: &'_ mut Peekable<IntoIter<Token>>) -> SassResult<()> { fn tokens_to_selectors(&mut self, tokens: &'_ mut Peekable<IntoIter<Token>>) -> SassResult<()> {
@ -283,7 +287,7 @@ impl<'a> SelectorParser<'a> {
} }
TokenKind::Symbol(Symbol::Period) => self.selectors.push(SelectorKind::Class), TokenKind::Symbol(Symbol::Period) => self.selectors.push(SelectorKind::Class),
TokenKind::Symbol(Symbol::Hash) => self.selectors.push(SelectorKind::Id), TokenKind::Symbol(Symbol::Hash) => self.selectors.push(SelectorKind::Id),
TokenKind::Symbol(Symbol::Colon) => self.consume_pseudo_selector(tokens), TokenKind::Symbol(Symbol::Colon) => self.consume_pseudo_selector(tokens)?,
TokenKind::Symbol(Symbol::Comma) => self.selectors.push(SelectorKind::Multiple), TokenKind::Symbol(Symbol::Comma) => self.selectors.push(SelectorKind::Multiple),
TokenKind::Symbol(Symbol::Gt) => self.selectors.push(SelectorKind::ImmediateChild), TokenKind::Symbol(Symbol::Gt) => self.selectors.push(SelectorKind::ImmediateChild),
TokenKind::Symbol(Symbol::Plus) => self.selectors.push(SelectorKind::Following), TokenKind::Symbol(Symbol::Plus) => self.selectors.push(SelectorKind::Following),