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

fix: don't reverse account display order with include files (#1909)

Browse Source
This commit is contained in:
Simon Michael 2022-08-05 13:44:56 +01:00
parent 09d66c5fc1
commit b46aa1330f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -307,7 +307,11 @@ includedirectivep = do
let r = fromMaybe reader $ findReader Nothing (Just prefixedpath) let r = fromMaybe reader $ findReader Nothing (Just prefixedpath)
parser = rParser r parser = rParser r
dbg6IO "trying reader" (rFormat r) dbg6IO "trying reader" (rFormat r)
updatedChildj <- journalAddFile (filepath, childInput) <$> -- Included files's lists are still reversed, because not yet journalFinalise'd,
-- which confuses the calculation of account declaration order across multiple files (#1909).
-- Unreverse just the acct declarations to fix that without disturbing anything else.
let reversedecls j = j{jdeclaredaccounts = reverse $ jdeclaredaccounts j}
updatedChildj <- (journalAddFile (filepath, childInput) . reversedecls) <$>
parseIncludeFile parser initChildj filepath childInput parseIncludeFile parser initChildj filepath childInput
-- discard child's parse info, combine other fields -- discard child's parse info, combine other fields