Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1723: Parsing of a compound selector made of only a pseudo-element

Browse source
This commit is contained in:
Simon Sapin 2014-02-20 13:13:38 +00:00
parent 1f90716bc1
commit 2b8abdd16c
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/components/style/selectors.rs
View file

@ -257,7 +257,7 @@ fn parse_simple_selectors(iter: &mut Iter, namespaces: &NamespaceMap)
InvalidSimpleSelector => return None, InvalidSimpleSelector => return None,
NotASimpleSelector => break, NotASimpleSelector => break,
SimpleSelectorResult(s) => { simple_selectors.push(s); empty = false }, SimpleSelectorResult(s) => { simple_selectors.push(s); empty = false },
PseudoElementResult(p) => { pseudo_element = Some(p); break }, PseudoElementResult(p) => { pseudo_element = Some(p); empty = false; break },
} }
} }
if empty { None } // An empty selector is invalid if empty { None } // An empty selector is invalid
@ -647,6 +647,7 @@ mod tests {
specificity: specificity(1, 1, 1), specificity: specificity(1, 1, 1),
}])) }]))
// Default namespace does not apply to attribute selectors // Default namespace does not apply to attribute selectors
// https://github.com/mozilla/servo/pull/1652
let mut namespaces = NamespaceMap::new(); let mut namespaces = NamespaceMap::new();
assert_eq!(parse_ns("[Foo]", &namespaces), Some(~[Selector{ assert_eq!(parse_ns("[Foo]", &namespaces), Some(~[Selector{
compound_selectors: Arc::new(CompoundSelector { compound_selectors: Arc::new(CompoundSelector {
@ -661,6 +662,7 @@ mod tests {
specificity: specificity(0, 1, 0), specificity: specificity(0, 1, 0),
}])) }]))
// Default namespace does not apply to attribute selectors // Default namespace does not apply to attribute selectors
// https://github.com/mozilla/servo/pull/1652
namespaces.default = Some(namespace::MathML); namespaces.default = Some(namespace::MathML);
assert_eq!(parse_ns("[Foo]", &namespaces), Some(~[Selector{ assert_eq!(parse_ns("[Foo]", &namespaces), Some(~[Selector{
compound_selectors: Arc::new(CompoundSelector { compound_selectors: Arc::new(CompoundSelector {
@ -686,6 +688,25 @@ mod tests {
pseudo_element: None, pseudo_element: None,
specificity: specificity(0, 0, 1), specificity: specificity(0, 0, 1),
}])) }]))
// https://github.com/mozilla/servo/issues/1723
assert_eq!(parse("::before"), Some(~[Selector{
compound_selectors: Arc::new(CompoundSelector {
simple_selectors: ~[],
next: None,
}),
pseudo_element: Some(Before),
specificity: specificity(0, 0, 1),
}]))
assert_eq!(parse("div :after"), Some(~[Selector{
compound_selectors: Arc::new(CompoundSelector {
simple_selectors: ~[],
next: Some((~CompoundSelector {
simple_selectors: ~[LocalNameSelector(~"div")],
next: None,
}, Descendant)),
}),
pseudo_element: Some(After),
specificity: specificity(0, 0, 2),
}]))
} }
} }