Partial trimming

src/Hakyll/Web/Template/Internal.hs

@@ -142,7 +142,7 @@ template = mconcat <$> P.many (P.choice [ lift chunk
                                         , lift escaped
                                         , conditional
                                         , for
-                                        , lift partial
+                                        , partial
                                         , lift expr
                                         ])
     where lift = fmap (Template . (:[]))
@@ -246,12 +246,18 @@ for = P.try $ do
 
 
 --------------------------------------------------------------------------------
-partial :: P.Parser TemplateElement
+partial :: P.Parser Template
 partial = P.try $ do
-    void $ P.string "$partial("
+    trimLPartial <- trimOpen
+    void $ P.string "partial("
     e <- expr'
-    void $ P.string ")$"
-    return $ Partial e
+    void $ P.char ')'
+    trimRPartial <- trimClose
+
+    pure $ Template $ mconcat [ [TrimL | trimLPartial]
+                              , [Partial e]
+                              , [TrimR | trimRPartial]
+                              ]
 
 
 --------------------------------------------------------------------------------

tests/Hakyll/Web/Template/Tests.hs

@@ -68,6 +68,13 @@ tests = testGroup "Hakyll.Core.Template.Tests" $ concat
             , TrimR
             ]
             @=? readTemplate "$-for(authors)-$\n   body   \n$-endfor-$"
+        -- 'Partial' trim check.
+        , Template
+            [ TrimL
+            , Partial (StringLiteral "path")
+            , TrimR
+            ]
+            @=? readTemplate "$-partial(\"path\")-$"
         ]
     ]