From d31e2d09882e1d9899ecd86a5f75d5dbd8030a9e Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 2 Oct 2014 20:28:55 +1000 Subject: [PATCH] yesod-test : Fix two more CssQuery parser problems. Closes #834 --- yesod-test/Yesod/Test/CssQuery.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yesod-test/Yesod/Test/CssQuery.hs b/yesod-test/Yesod/Test/CssQuery.hs index d41f2073..0618da7a 100644 --- a/yesod-test/Yesod/Test/CssQuery.hs +++ b/yesod-test/Yesod/Test/CssQuery.hs @@ -57,7 +57,8 @@ rules :: Parser [SelectorGroup] rules = many $ directChildren <|> deepChildren directChildren :: Parser SelectorGroup -directChildren = string "> " >> DirectChildren <$> parseSelectors +directChildren = + string "> " >> DirectChildren <$> pOptionalTrailingSpace parseSelectors deepChildren :: Parser SelectorGroup deepChildren = pOptionalTrailingSpace $ DeepChildren <$> parseSelectors @@ -90,7 +91,7 @@ pIdent :: Parser Text pIdent = do leadingMinus <- string "-" <|> pure "" nmstart <- T.singleton <$> satisfy (\c -> isAlpha c || c == '_') - nmchar <- takeWhile (\c -> isAlphaNum c || c == '_') + nmchar <- takeWhile (\c -> isAlphaNum c || c == '_' || c == '-') return $ T.concat [ leadingMinus, nmstart, nmchar ]