From 58bf5223c0622fde90ac08ed678e6bd7f812bcbc Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 1 Oct 2014 06:24:02 +1000 Subject: [PATCH] yesod-test : Fix parsing of descendent selector in CSS query parser. Closes #834 --- yesod-test/Yesod/Test/CssQuery.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yesod-test/Yesod/Test/CssQuery.hs b/yesod-test/Yesod/Test/CssQuery.hs index af9146c8..d41f2073 100644 --- a/yesod-test/Yesod/Test/CssQuery.hs +++ b/yesod-test/Yesod/Test/CssQuery.hs @@ -60,10 +60,10 @@ directChildren :: Parser SelectorGroup directChildren = string "> " >> DirectChildren <$> parseSelectors deepChildren :: Parser SelectorGroup -deepChildren = DeepChildren <$> parseSelectors +deepChildren = pOptionalTrailingSpace $ DeepChildren <$> parseSelectors parseSelectors :: Parser [Selector] -parseSelectors = pOptionalTrailingSpace . many1 $ +parseSelectors = many1 $ parseId <|> parseClass <|> parseTag <|> parseAttr parseId :: Parser Selector @@ -87,7 +87,7 @@ parseAttr = pSquare $ choice -- | pIdent : Parse an identifier (not yet supporting escapes and unicode as -- part of the identifier). Basically the regex: [-]?[_a-zA-Z][_a-zA-Z0-9]* pIdent :: Parser Text -pIdent = pOptionalTrailingSpace $ do +pIdent = do leadingMinus <- string "-" <|> pure "" nmstart <- T.singleton <$> satisfy (\c -> isAlpha c || c == '_') nmchar <- takeWhile (\c -> isAlphaNum c || c == '_')