feature: A bit of a parsing incident

supki · Oct 8, 2024 · c10baab · c10baab
1 parent fb1972d
commit c10baab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/T/Parse.hs b/src/T/Parse.hs
@@ -69,7 +69,7 @@ parseBytes stdlib =
 
 parseDelta :: Stdlib -> Delta -> ByteString -> Either ParseError Tmpl
 parseDelta stdlib delta str =
-  case parseByteString (runReaderT parser stdlib) delta str of
+  case parseByteString (runReaderT (parser <* eof) stdlib) delta str of
     Failure err ->
       Left (ParseError err._errDoc)
     Success tmpl ->
@@ -383,7 +383,7 @@ parseRaw =
            -- Attempt to fish for a line block.
       , do _ <- lookAhead (try (spacesExceptNewline *> string "{%" *> manyTill anyChar (try (string "%}")) *> spacesExceptNewline *> newline))
            pure acc
-           -- Attempt to fish for a inline block.
+           -- Attempt to fish for an inline block.
       , do _ <- lookAhead (string "{{" <|> string "{%")
            pure acc
       , do x <- anyChar

diff --git a/test/T/ParseSpec.hs b/test/T/ParseSpec.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE OverloadedRecordDot #-}
 module T.ParseSpec (spec) where
 
+import Data.Either (isLeft)
 import Data.HashMap.Strict qualified as HashMap
 import Data.Vector qualified as Vector
 import Test.Hspec
@@ -192,6 +193,9 @@ spec =
             ]
             (Tmpl.Cat []))
 
+    it "fake block" $
+      parse "{% fake %}" `shouldSatisfy` isLeft
+
 var :: Name -> Exp
 var name =
   varE (noann name)
@@ -238,4 +242,8 @@ whenIf p thenTmpl =
 
 shouldParseTo :: HasCallStack => Text -> Tmpl -> Expectation
 tmpl `shouldParseTo` res =
-  first show (parseText Stdlib.def tmpl) `shouldBe` Right res
+  parse tmpl `shouldBe` Right res
+
+parse :: Text -> Either String Tmpl
+parse tmpl =
+  first show (parseText Stdlib.def tmpl)