From 93195cb7808f111bb8fd50b64c3d345fbb42f9d4 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alan.zimm@gmail.com>
Date: Sat, 21 Sep 2013 14:01:43 +0200
Subject: [PATCH] Return correct values for cabalAllTargets.

---
 Language/Haskell/GhcMod/CabalApi.hs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Language/Haskell/GhcMod/CabalApi.hs b/Language/Haskell/GhcMod/CabalApi.hs
index 2ea6523..f39a00c 100644
--- a/Language/Haskell/GhcMod/CabalApi.hs
+++ b/Language/Haskell/GhcMod/CabalApi.hs
@@ -13,7 +13,7 @@ import Control.Applicative ((<$>))
 import Control.Exception (throwIO)
 import Data.Maybe (maybeToList)
 import Data.Set (fromList, toList)
-import Distribution.ModuleName (toFilePath)
+import Distribution.ModuleName (ModuleName,toFilePath)
 import Distribution.Package (Dependency(Dependency)
                            , PackageName(PackageName)
                            , PackageIdentifier(pkgName))
@@ -165,14 +165,26 @@ getGHC = do
 
 -- | Extracting all 'Module' 'FilePath's for libraries, executables,
 -- tests and benchmarks.
-cabalAllTargets :: PackageDescription -> ([FilePath],[FilePath],[FilePath],[FilePath])
+cabalAllTargets :: PackageDescription -> ([String],[String],[String],[String])
 cabalAllTargets pd = targets
   where
     lib = case library pd of
             Nothing -> []
             Just l -> libModules l
 
-    targets = (map toFilePath $ lib,
-               map modulePath                              $ executables pd,
-               map toFilePath $ concatMap testModules      $ testSuites  pd,
-               map toFilePath $ concatMap benchmarkModules $ benchmarks  pd)
+    targets = (map toModuleString $ lib,
+               map (fromFilePath . modulePath)                 $ executables pd,
+               -- map toModuleString $ concatMap testModules      $ testSuites  pd,
+               concatMap getTestTargets $ map testInterface    $ testSuites  pd,
+               map toModuleString $ concatMap benchmarkModules $ benchmarks  pd)
+
+    toModuleString :: ModuleName -> String
+    toModuleString mn = fromFilePath $ toFilePath mn
+
+    fromFilePath :: FilePath -> String
+    fromFilePath fp = map (\c -> if c=='/' then '.' else c) fp
+
+    getTestTargets :: TestSuiteInterface -> [String]
+    getTestTargets (TestSuiteExeV10 _ filePath)   = [fromFilePath filePath]
+    getTestTargets (TestSuiteLibV09 _ moduleName) = [toModuleString moduleName]
+    getTestTargets (TestSuiteUnsupported _)       = []