hsx: Allow { ...values} spread, with a space in front

Fixes #1588
digitallyinduced · Jan 22, 2023 · 64f2f31 · 64f2f31
1 parent 77ed18b
commit 64f2f31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Test/HSX/ParserSpec.hs b/Test/HSX/ParserSpec.hs
@@ -64,6 +64,11 @@ tests = do
             -- We cannot easily construct the @VarE variables@ expression, therefore we use show here for comparison
             tshow p `shouldBe` "Right (Children [Node \"div\" [SpreadAttributes (VarE variables)] [] False])"
 
+        it "should parse spread values with a space" do
+            -- See https://github.com/digitallyinduced/ihp/issues/1588
+            let p = parseHsx position extensions "<div { ...variables }/>"
+            tshow p `shouldBe` "Right (Children [Node \"div\" [SpreadAttributes (VarE variables)] [] False])"
+
         it "should accept underscores in data attributes" do
             let p = parseHsx position extensions "<div data-client_id=\"test\"/>"
             p `shouldBe` (Right (Children [Node "div" [StaticAttribute "data-client_id" (TextValue "test")] [] False]))
diff --git a/ihp-hsx/IHP/HSX/Parser.hs b/ihp-hsx/IHP/HSX/Parser.hs
@@ -155,7 +155,7 @@ isStaticAttribute _ = False
 
 hsxSplicedAttributes :: Parser Attribute
 hsxSplicedAttributes = do
-    (pos, name) <- between (string "{...") (string "}") do
+    (pos, name) <- between (do char '{'; optional space; string "...") (string "}") do
             pos <- getSourcePos
             code <- takeWhile1P Nothing (\c -> c /= '}')
             pure (pos, code)