Trailing semicolons when embedding mixins #194

yesodweb · Sep 1, 2016 · 7e3bbf7 · 7e3bbf7
1 parent e79c4a0
commit 7e3bbf7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -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)

diff --git a/Text/Lucius.hs b/Text/Lucius.hs
@@ -158,6 +158,8 @@ parsePairsBlocks front = (char '}' >> return (front [])) <|> (do
         whiteSpace
         Right x <- parseCaret
         whiteSpace
+        (char ';' >> return ()) <|> return ()
+        whiteSpace
         return $ PBMixin x
     checkIfBlock = do
         skipMany $ noneOf "#@{};"

diff --git a/shakespeare.cabal b/shakespeare.cabal
@@ -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>

diff --git a/test/Text/CssSpec.hs b/test/Text/CssSpec.hs
@@ -496,6 +496,21 @@ foo { foo:X#{bar}Y; }
                     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