From cf25ef5cf5b0dc0e30dc40047be16c4cae84c986 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 10 Oct 2018 20:32:19 -0700
Subject: [PATCH] accounts: filtering by anything other than account name was
 broken

---
 hledger/Hledger/Cli/Commands/Accounts.hs |  6 ++++--
 tests/accounts/accounts.test             | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 tests/accounts/accounts.test

diff --git a/hledger/Hledger/Cli/Commands/Accounts.hs b/hledger/Hledger/Cli/Commands/Accounts.hs
index e5d5e989c..ab57d5001 100644
--- a/hledger/Hledger/Cli/Commands/Accounts.hs
+++ b/hledger/Hledger/Cli/Commands/Accounts.hs
@@ -70,8 +70,10 @@ accounts CliOpts{rawopts_=rawopts, reportopts_=ropts} j = do
       declared = boolopt "declared" rawopts
       used     = boolopt "used"     rawopts
       q        = queryFromOpts d ropts
-      -- a depth limit will clip and exclude account names later, but should not exclude accounts at this stage
+      -- a depth limit will clip and exclude account names later, but we don't want to exclude accounts at this stage
       nodepthq = dbg1 "nodepthq" $ filterQuery (not . queryIsDepth) q
+      -- just the acct: part of the query will be reapplied later, after clipping
+      acctq    = dbg1 "acctq" $ filterQuery queryIsAcct q
       depth    = dbg1 "depth" $ queryDepth $ filterQuery queryIsDepth q
       matcheddeclaredaccts = dbg1 "matcheddeclaredaccts" $ filter (matchesAccount nodepthq) $ jdeclaredaccounts j
       matchedusedaccts     = dbg5 "matchedusedaccts" $ map paccount $ journalPostings $ filterJournalPostings nodepthq j
@@ -86,7 +88,7 @@ accounts CliOpts{rawopts_=rawopts, reportopts_=ropts} j = do
   -- 3. if there's a depth limit, depth-clip and remove any no longer useful items 
       clippedaccts =
         dbg1 "clippedaccts" $
-        filter (matchesAccount q) $    -- clipping can leave accounts that no longer visibly match the query
+        filter (matchesAccount acctq) $  -- clipping can leave accounts that no longer match the query, remove such
         nub $                          -- clipping can leave duplicates (adjacent, hopefully)
         filter (not . T.null) $        -- depth:0 can leave nulls
         map (clipAccountName depth) $  -- clip at depth if specified 
diff --git a/tests/accounts/accounts.test b/tests/accounts/accounts.test
new file mode 100644
index 000000000..55066e2d8
--- /dev/null
+++ b/tests/accounts/accounts.test
@@ -0,0 +1,24 @@
+# accounts command
+
+# basic accounts report
+<
+account a
+
+2018/1/1  ; foo:
+  (a:aa)  1
+
+$ hledger -f - accounts
+a
+a:aa
+>=
+
+# tree mode
+$ hledger -f - accounts --tree
+a
+  aa
+>=
+
+# filtering transactions by tag
+$ hledger -f - accounts tag:foo
+a:aa
+>=