From f045e59248116228093bfebf03ce9f7f4f0cc4ce Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 28 Jun 2021 13:28:22 -0700 Subject: Text.Pandoc.Error: fix line calculations in reporting parsec errors. Also remove a spurious initial newline in the error report. --- src/Text/Pandoc/Error.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Text/Pandoc') diff --git a/src/Text/Pandoc/Error.hs b/src/Text/Pandoc/Error.hs index 81eb41f85..9dee8356b 100644 --- a/src/Text/Pandoc/Error.hs +++ b/src/Text/Pandoc/Error.hs @@ -97,13 +97,13 @@ renderError e = [] -> "" ((pos,txt):_) -> let ls = T.lines txt <> [""] - ln = errLine - sourceLine pos - in if length ls > ln - 1 + ln = (errLine - sourceLine pos) + 1 + in if length ls > ln && ln >= 1 then T.concat ["\n", ls !! (ln - 1) ,"\n", T.replicate (errColumn - 1) " " ,"^"] else "" - in "\nError at " <> tshow err' <> errorInFile + in "Error at " <> tshow err' <> errorInFile PandocMakePDFError s -> s PandocOptionError s -> s PandocSyntaxMapError s -> s -- cgit v1.2.3