Show the number of matches found matching query

haskell · Jan 4, 2025 · 7f1f5be · 7f1f5be
1 parent fa57e47
commit 7f1f5be
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 3 deletions.
diff --git a/cabal-install/src/Distribution/Client/CmdTarget.hs b/cabal-install/src/Distribution/Client/CmdTarget.hs
@@ -170,7 +170,7 @@ targetAction flags@NixStyleFlags{..} ts globalFlags = do
         Nothing
         targetSelectors
 
-  printTargetForms verbosity targets elaboratedPlan
+  printTargetForms verbosity targetStrings targets elaboratedPlan
   where
     verbosity = fromFlagOrDefault normal (configVerbosity configFlags)
     targetStrings = if null ts then ["all"] else ts
@@ -183,14 +183,21 @@ targetAction flags@NixStyleFlags{..} ts globalFlags = do
 reportBuildTargetProblems :: Verbosity -> [TargetProblem'] -> IO a
 reportBuildTargetProblems verbosity = reportTargetProblems verbosity "target"
 
-printTargetForms :: Verbosity -> TargetsMap -> ElaboratedInstallPlan -> IO ()
-printTargetForms verbosity targets elaboratedPlan =
+printTargetForms :: Verbosity -> [String] -> TargetsMap -> ElaboratedInstallPlan -> IO ()
+printTargetForms verbosity targetStrings targets elaboratedPlan =
   noticeDoc verbosity $
     vcat
       [ text "Fully qualified target forms" Pretty.<> colon
       , nest 1 $ vcat [text "-" <+> text tf | tf <- targetForms]
+      , found
       ]
   where
+    found =
+      let n = length targets
+          t = if n == 1 then "target" else "targets"
+          query = intercalate ", " targetStrings
+       in text "Found" <+> int n <+> text t <+> text "matching" <+> text query Pretty.<> char '.'
+
     localPkgs =
       [x | Configured x@ElaboratedConfiguredPackage{elabLocalToProject = True} <- InstallPlan.toList elaboratedPlan]
 

diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-benches.out b/cabal-testsuite/PackageTests/Target/cabal.all-benches.out
@@ -5,3 +5,4 @@ Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
  - b:bench:b-bench
+Found 2 targets matching all:benches.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out b/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out
@@ -12,3 +12,4 @@ Fully qualified target forms:
  - b:lib:b
  - b:lib:b-sublib
  - c:lib:c
+Found 9 targets matching all.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out b/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out
@@ -12,3 +12,4 @@ Fully qualified target forms:
  - b:lib:b-sublib
  - b:test:b-test
  - c:lib:c
+Found 9 targets matching all.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-exes.out b/cabal-testsuite/PackageTests/Target/cabal.all-exes.out
@@ -5,3 +5,4 @@ Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
  - b:exe:b-exe
+Found 2 targets matching all:exes.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-tests.out b/cabal-testsuite/PackageTests/Target/cabal.all-tests.out
@@ -5,3 +5,4 @@ Resolving dependencies...
 Fully qualified target forms:
  - a:test:a-test
  - b:test:b-test
+Found 2 targets matching all:tests.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out
@@ -4,13 +4,16 @@ Configuration is affected by the following files:
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
+Found 1 target matching a:bench:a-bench.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:bench:a-bench
+Found 1 target matching bench:a-bench.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:bench:a-bench
+Found 1 target matching a:a-bench.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out
@@ -4,13 +4,16 @@ Configuration is affected by the following files:
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
+Found 1 target matching a:exe:a-exe.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:exe:a-exe
+Found 1 target matching exe:a-exe.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:exe:a-exe
+Found 1 target matching a:a-exe.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out
@@ -4,13 +4,16 @@ Configuration is affected by the following files:
 Resolving dependencies...
 Fully qualified target forms:
  - a:lib:a
+Found 1 target matching a:lib:a.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:lib:a
+Found 1 target matching lib:a.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:lib:a
+Found 1 target matching a:a.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out
@@ -4,13 +4,16 @@ Configuration is affected by the following files:
 Resolving dependencies...
 Fully qualified target forms:
  - a:test:a-test
+Found 1 target matching a:test:a-test.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:test:a-test
+Found 1 target matching test:a-test.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:test:a-test
+Found 1 target matching a:a-test.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out b/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out
@@ -5,18 +5,22 @@ Resolving dependencies...
 Fully qualified target forms:
  - a:lib:a
  - a:lib:a-sublib
+Found 2 targets matching a:libs.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:exe:a-exe
+Found 1 target matching a:exes.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:test:a-test
+Found 1 target matching a:tests.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
 Fully qualified target forms:
  - a:bench:a-bench
+Found 1 target matching a:benches.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.default-all.out b/cabal-testsuite/PackageTests/Target/cabal.default-all.out
@@ -10,3 +10,4 @@ Fully qualified target forms:
  - b:lib:b
  - b:lib:b-sublib
  - c:lib:c
+Found 7 targets matching all.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.everything.out b/cabal-testsuite/PackageTests/Target/cabal.everything.out
@@ -14,3 +14,4 @@ Fully qualified target forms:
  - b:lib:b-sublib
  - b:test:b-test
  - c:lib:c
+Found 11 targets matching all.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out b/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out
@@ -10,3 +10,4 @@ Fully qualified target forms:
  - b:lib:b
  - b:lib:b-sublib
  - c:lib:c
+Found 7 targets matching all.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.package-target.out b/cabal-testsuite/PackageTests/Target/cabal.package-target.out
@@ -6,6 +6,7 @@ Fully qualified target forms:
  - a:exe:a-exe
  - a:lib:a
  - a:lib:a-sublib
+Found 3 targets matching a.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
@@ -16,3 +17,4 @@ Fully qualified target forms:
  - a:lib:a
  - a:lib:a-sublib
  - a:test:a-test
+Found 5 targets matching a.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.path-target.out b/cabal-testsuite/PackageTests/Target/cabal.path-target.out
@@ -6,6 +6,7 @@ Fully qualified target forms:
  - a:exe:a-exe
  - a:lib:a
  - a:lib:a-sublib
+Found 3 targets matching dir-a/.
 # cabal v2-target
 Configuration is affected by the following files:
 - cabal.project
@@ -16,3 +17,4 @@ Fully qualified target forms:
  - a:lib:a
  - a:lib:a-sublib
  - a:test:a-test
+Found 5 targets matching dir-a/.
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ Fully qualified target forms: @@
      - b:lib:b
      - b:lib:b-sublib
      - c:lib:c
+    Found 9 targets matching all.