(ast/syntax) fix nested simpleblock parsing

crates/hdx_ast/src/css/stylerule.rs

@@ -113,6 +113,7 @@ mod tests {
 		assert_parse!(StyleRule, ".foo *{}", ".foo * {\n}");
 		assert_parse!(StyleRule, ":nth-child(1) {\n\topacity: 0;\n}");
 		assert_parse!(StyleRule, ".foo {\n\t--bar: (baz);\n}");
+		assert_parse!(StyleRule, ".foo {\n\twidth: calc(1px + (var(--foo)) + 1px);\n}");
 	}
 
 	#[test]

crates/hdx_ast/src/syntax.rs

@@ -185,21 +185,21 @@ pub struct SimpleBlock<'a> {
 // https://drafts.csswg.org/css-syntax-3/#consume-a-simple-block
 impl<'a> Parse<'a> for SimpleBlock<'a> {
 	fn parse(parser: &mut Parser<'a>) -> ParserResult<Self> {
-		let pair = parser.parse::<Token![PairWise]>()?;
+		let pair = parser.parse::<Token![PairWise]>()?.to_pairwise().unwrap();
 		let mut values = parser.new_vec();
 		loop {
 			if parser.at_end() {
 				break;
 			}
 			if let Some(token) = parser.peek::<Token![PairWise]>() {
-				if token.to_pairwise() == pair.to_pairwise() {
+				if token.to_pairwise() == Some(pair) && token.kind() == pair.end() {
 					parser.hop(token);
 					break;
 				}
 			}
 			values.push(parser.parse_spanned::<ComponentValue>()?);
 		}
-		Ok(Self { values, pairwise: pair.to_pairwise().unwrap() })
+		Ok(Self { values, pairwise: pair })
 	}
 }
 

crates/hdx_lexer/src/token.rs

@@ -652,7 +652,7 @@ impl serde::ser::Serialize for Token {
 	}
 }
 
-#[derive(Debug, Eq, PartialEq, Clone, Hash)]
+#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
 pub enum PairWise {
 	Paren,