Merge branch 'master' of github.com:digitallyinduced/ihp

Guide/hsx.markdown

@@ -151,3 +151,14 @@ In JSX you have the restriction that you always have to have a single root tag.
 #### Whitespace
 
 Spaces and newline characters are removed where possible at HSX parse time.
+
+#### Comments
+
+Html Comments are supported and can be used like this:
+
+```html
+<div>
+    <!-- Begin of Main Section -->
+    <h1>Hello</h1>
+</div>
+```

IHP/HtmlSupport/Parser.hs

@@ -29,6 +29,7 @@ data Node = Node !Text ![Attribute] ![Node]
     | PreEscapedTextNode !Text -- ^ Used in @script@ or @style@ bodies
     | SplicedNode !Text -- ^ Inline haskell expressions like @{myVar}@ or @{f "hello"}@
     | Children ![Node]
+    | CommentNode !Text
     deriving (Show)
 
 parseHsx position code = runParser (setPosition position *> parser) "" code
@@ -47,7 +48,7 @@ parser = do
     eof
     pure node
 
-hsxElement = try hsxSelfClosingElement <|> hsxNormalElement
+hsxElement = try hsxComment <|> try hsxSelfClosingElement <|> hsxNormalElement
 
 manyHsxElement = do
     children <- many hsxChild
@@ -94,6 +95,14 @@ hsxOpeningElement = do
     attributes <- hsxNodeAttributes (char '>')
     pure (name, attributes)
 
+hsxComment :: Parser Node
+hsxComment = do
+    string "<!--"
+    body :: String <- manyTill (satisfy (const True)) (string "-->")
+    space
+    pure (CommentNode (cs body))
+
+
 hsxNodeAttributes :: Parser a -> Parser [Attribute]
 hsxNodeAttributes end = staticAttributes
     where

IHP/HtmlSupport/QQ.hs

@@ -59,6 +59,7 @@ compileToHaskell (SplicedNode code) =
     case parseExp (cs code) of
         Right expression -> let patched = patchExpr expression in [| toHtml $(pure patched) |]
         Left error -> fail ("compileToHaskell(" <> (cs code) <> "): " <> show error)
+compileToHaskell (CommentNode value) = [| Html5.textComment value |]
 
 patchExpr :: TH.Exp -> TH.Exp
 patchExpr (TH.UInfixE (TH.VarE varName) (TH.VarE hash) (TH.VarE labelValue)) | hash == TH.mkName "#" = TH.AppE (TH.VarE varName) fromLabel