From 801a7adaa4e40a089aacc9f83b169e190752eb04 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 11 Jul 2025 12:13:52 -0700
Subject: [PATCH] imp:include: better errors, eg for missing argument; more
 debug output

---
 hledger-lib/Hledger/Read/JournalReader.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs
index 2b4264996..ad231377c 100644
--- a/hledger-lib/Hledger/Read/JournalReader.hs
+++ b/hledger-lib/Hledger/Read/JournalReader.hs
@@ -299,6 +299,8 @@ includedirectivep = do
   lift followingcommentp
   -- find file(s)
   let (mprefix,glb) = splitReaderPrefix prefixedglob
+  when (null $ dbg7 "glob pattern" glb) $
+    customFailure $ parseErrorAt off $ "include needs a file path or glob pattern argument"
   paths <- getFilePaths off pos glb
   let prefixedpaths = case mprefix of
         Nothing  -> paths
@@ -323,12 +325,11 @@ includedirectivep = do
       let parentfilepath = sourceName parserpos
       realparentfilepath <- liftIO $ canonicalizePath parentfilepath   -- Follow a symlink. If the path is already absolute, the operation never fails. 
       let curdir = takeDirectory realparentfilepath
-      -- Find all matched files, in lexicographic order mimicking the output of 'ls'.
-      filepaths <- liftIO $ sort <$> globDir1 fileglob curdir
+      -- Find all matched files, in lexicographic order (the order ls would normally show them)
+      filepaths <- liftIO $ (dbg7 "include: matched files" . sort) <$> globDir1 fileglob curdir
       if (not . null) filepaths
         then pure filepaths
-        else customFailure $ parseErrorAt parseroff $
-                "No existing files match pattern: " ++ fileglobpattern
+        else customFailure $ parseErrorAt parseroff $ "No files were matched by file pattern: " ++ fileglobpattern
 
     -- Parse the given included file (and any deeper includes, recursively)
     -- as if it was inlined in the current (parent) file.