From 86c157d1d2ec1294cc14d3d7435019e91a03a70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Wed, 2 Sep 2015 05:30:00 +0200
Subject: [PATCH] Add some more debug output

---
 Language/Haskell/GhcMod/Debug.hs  | 13 ++++++++++++-
 Language/Haskell/GhcMod/Target.hs |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Language/Haskell/GhcMod/Debug.hs b/Language/Haskell/GhcMod/Debug.hs
index 41f22b7..2d363a8 100644
--- a/Language/Haskell/GhcMod/Debug.hs
+++ b/Language/Haskell/GhcMod/Debug.hs
@@ -15,6 +15,7 @@ import Language.Haskell.GhcMod.Internal
 import Language.Haskell.GhcMod.Target
 import Language.Haskell.GhcMod.Pretty
 import Language.Haskell.GhcMod.Utils
+import Language.Haskell.GhcMod.PathsAndFiles
 
 ----------------------------------------------------------------
 
@@ -27,7 +28,7 @@ debugInfo = do
     cabal <-
         case cradleProjectType of
           CabalProject -> cabalDebug
-          StackProject -> cabalDebug
+          StackProject -> (++) <$> stackPaths <*> cabalDebug
           _ -> return []
 
     pkgOpts <- packageGhcOptions
@@ -42,6 +43,16 @@ debugInfo = do
               fsep $ map text optGhcUserOptions)
       ] ++ cabal
 
+stackPaths :: IOish m => GhcModT m [String]
+stackPaths = do
+    Cradle {..} <- cradle
+    Just ghc <- getStackGhcPath cradleRootDir
+    Just ghcPkg <- getStackGhcPkgPath cradleRootDir
+    return $
+         [ "Stack ghc executable:    " ++ show ghc
+         , "Stack ghc-pkg executable:" ++ show ghcPkg
+         ]
+
 cabalDebug :: IOish m => GhcModT m [String]
 cabalDebug = do
     Cradle {..} <- cradle
diff --git a/Language/Haskell/GhcMod/Target.hs b/Language/Haskell/GhcMod/Target.hs
index 5cc6405..f1072ca 100644
--- a/Language/Haskell/GhcMod/Target.hs
+++ b/Language/Haskell/GhcMod/Target.hs
@@ -288,6 +288,7 @@ resolveGmComponent :: (IOish m, Gm m)
     -> m (GmComponent 'GMCResolved (Set ModulePath))
 resolveGmComponent mums c@GmComponent {..} = do
   distDir <- cradleDistDir <$> cradle
+  gmLog GmDebug "resolveGmComponent" $ text $ show $ ghcOpts distDir
   withLightHscEnv (ghcOpts distDir) $ \env -> do
     let srcDirs = if null gmcSourceDirs then [""] else gmcSourceDirs
     let mg = gmcHomeModuleGraph
@@ -313,6 +314,7 @@ resolveEntrypoint :: (IOish m, Gm m)
     -> GmComponent 'GMCRaw ChEntrypoint
     -> m (GmComponent 'GMCRaw (Set ModulePath))
 resolveEntrypoint Cradle {..} c@GmComponent {..} = do
+    gmLog GmDebug "resolveEntrypoint" $ text $ show $ gmcGhcSrcOpts
     withLightHscEnv gmcGhcSrcOpts $ \env -> do
       let srcDirs = if null gmcSourceDirs then [""] else gmcSourceDirs
       eps <- liftIO $ resolveChEntrypoints cradleRootDir gmcEntrypoints