Merge pull request #4834 from jfdm/fix-literate

Fix subtle bug in `Text.Literate`.
idris-lang · Mar 28, 2020 · ecb49fa · ecb49fa
2 parents c6c928f + c80ef9f
commit ecb49fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libs/contrib/Text/Literate.idr b/libs/contrib/Text/Literate.idr
@@ -36,7 +36,7 @@ line : String -> Lexer
 line s = exact s <+> space <+> untilEOL
 
 block : String -> String -> Lexer
-block s e = exact s <+> manyUntil (exact e) any 
+block s e = surround (exact s) (exact e) any
 
 data Token = CodeBlock String String String
            | Any String
@@ -76,7 +76,7 @@ reduce (MkToken _ _ (CodeBlock l r src) :: rest) acc with (lines src) -- Strip t
   reduce (MkToken _ _ (CodeBlock l r src) :: rest) acc | (s :: ys) with (snocList ys)
     reduce (MkToken _ _ (CodeBlock l r src) :: rest) acc | (s :: []) | Empty = reduce rest acc -- 2
     reduce (MkToken _ _ (CodeBlock l r src) :: rest) acc | (s :: (srcs ++ [f])) | (Snoc rec) =
-        reduce rest (acc ++ "\n" ++ unlines srcs ++ "\n")
+        reduce rest (acc ++ unlines srcs)
 
 -- [ NOTE ] 1 & 2 shouldn't happen as code blocks are well formed i.e. have two deliminators.