slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: cli: posting comment lines no longer disturb the error marker (fix #1927)

Browse Source
This commit is contained in:
Simon Michael 2023-04-26 22:40:41 -10:00
parent 8b3b63b495
commit f5c3bbcaf0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hledger-lib/Hledger/Data/Errors.hs
View File

@ -118,9 +118,17 @@ makePostingErrorExcerpt p findpostingerrorcolumns =
Just t -> (f, errabsline, merrcols, ex) Just t -> (f, errabsline, merrcols, ex)
where where
(SourcePos f tl _) = fst $ tsourcepos t (SourcePos f tl _) = fst $ tsourcepos t
tcommentlines = max 0 (length (T.lines $ tcomment t) - 1)
mpindex = transactionFindPostingIndex (==p) t mpindex = transactionFindPostingIndex (==p) t
errrelline = maybe 0 (tcommentlines+) mpindex -- XXX doesn't count posting coment lines errrelline = case mpindex of
Nothing -> 0
Just pindex ->
commentExtraLines (tcomment t) +
sum (map postingLines $ take pindex $ tpostings t)
where
postingLines p' = 1 + commentExtraLines (pcomment p')
-- How many extra lines does this possibly multi-line
-- transaction/posting comment add when rendered ?
commentExtraLines c = max 0 (length (T.lines c) - 1)
errabsline = unPos tl + errrelline errabsline = unPos tl + errrelline
txntxt = showTransaction t & textChomp & (<>"\n") txntxt = showTransaction t & textChomp & (<>"\n")
merrcols = findpostingerrorcolumns p t txntxt merrcols = findpostingerrorcolumns p t txntxt