shakespeare 2.0.11 → 2.0.11.1

raw patch · 4 files changed

+22/−1 lines, 4 files

Files

• ChangeLog.md +4/−0
• Text/Lucius.hs +2/−0
• shakespeare.cabal +1/−1
• test/Text/CssSpec.hs +15/−0

@@ -1,3 +1,7 @@+### 2.0.11.1++* Handle parsing of trailing semicolon after mixins [#194](https://github.com/yesodweb/shakespeare/issues/194)+ ### 2.0.11  * Export hamletFromString [#191](https://github.com/yesodweb/shakespeare/pull/191)

@@ -158,6 +158,8 @@         whiteSpace         Right x <- parseCaret         whiteSpace+        (char ';' >> return ()) <|> return ()+        whiteSpace         return $ PBMixin x     checkIfBlock = do         skipMany $ noneOf "#@{};"

@@ -1,5 +1,5 @@ name:            shakespeare-version:         2.0.11+version:         2.0.11.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>

@@ -496,6 +496,21 @@                     src: url(sansation_light.woff)
             |]
 
+    describe "trailing semicolon in mixin" $ do
+        let someMixin = [luciusMixin|foo:bar|]
+        it "direct in lucius" $
+            celper "baz{foo:bar}" [lucius|
+                baz {
+                    ^{someMixin};
+                }
+            |]
+
+        it "implicit in cassius #194" $
+            celper "baz{foo:bar}" [cassius|
+                baz
+                    ^{someMixin}
+            |]
+
 data Url = Home | Sub SubUrl
 data SubUrl = SubUrl
 render :: Url -> [(Text, Text)] -> Text