From 2549bba7b8ebdf56b95e2f2f06deb35d811b20ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Thu, 24 Sep 2015 04:49:49 +0200
Subject: [PATCH] Fix yesterday's fix

we were invoking cabal-helper too early
---
 Language/Haskell/GhcMod/CabalHelper.hs     | 38 ++++++++--------------
 Language/Haskell/GhcMod/CustomPackageDb.hs |  2 +-
 Language/Haskell/GhcMod/Target.hs          |  5 +--
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Language/Haskell/GhcMod/CabalHelper.hs b/Language/Haskell/GhcMod/CabalHelper.hs
index 0c07cda..8aa0f19 100644
--- a/Language/Haskell/GhcMod/CabalHelper.hs
+++ b/Language/Haskell/GhcMod/CabalHelper.hs
@@ -143,16 +143,10 @@ withAutogen :: (IOish m, GmEnv m, GmOut m, GmLog m) => m a -> m a
 withAutogen action = do
     gmLog GmDebug "" $ strDoc $ "making sure autogen files exist"
     crdl <- cradle
-    opts <- options
-    readProc <- gmReadProcess
     let projdir = cradleRootDir crdl
         distdir = projdir </> cradleDistDir crdl
 
-    let qe = (defaultQueryEnv projdir distdir) {
-                 qeReadProcess = readProc
-               , qePrograms = helperProgs $ optPrograms opts
-               }
-    (pkgName', _) <- runQuery qe packageId
+    (pkgName', _) <- runCHQuery packageId
 
     mCabalFile          <- liftIO $ timeFile `traverse` cradleCabalFile crdl
     mCabalMacroHeader   <- liftIO $ timeMaybe (distdir </> macrosHeaderPath)
@@ -174,24 +168,17 @@ withAutogen action = do
 withCabal :: (IOish m, GmEnv m, GmOut m, GmLog m) => m a -> m a
 withCabal action = do
     crdl <- cradle
-    opts <- options
-    readProc <- gmReadProcess
-
-    proj <- cradleProject <$> cradle
-    let projdir = cradleRootDir crdl
-        distdir = projdir </> cradleDistDir crdl
-
-    let qe = (defaultQueryEnv projdir distdir) {
-                 qeReadProcess = readProc
-               , qePrograms = helperProgs $ optPrograms opts
-               }
-    pkgDb <- runQuery qe $ map chPkgToGhcPkg <$> packageDbStack
-
     mCabalFile          <- liftIO $ timeFile `traverse` cradleCabalFile crdl
     mCabalConfig        <- liftIO $ timeMaybe (setupConfigFile crdl)
     mCabalSandboxConfig <- liftIO $ timeMaybe (sandboxConfigFile crdl)
 
-    pkgDbStackOutOfSync <- fromMaybe False . (fmap (pkgDb /=)) <$> getCustomPkgDbStack
+    cusPkgDb <- getCustomPkgDbStack
+    pkgDbStackOutOfSync <- do
+      if isJust mCabalConfig
+        then runCHQuery $ do
+          pkgDb <- map chPkgToGhcPkg <$> packageDbStack
+          return $ fromMaybe False $ (pkgDb /=) <$> cusPkgDb
+        else return False
 
     when (isSetupConfigOutOfDate mCabalFile mCabalConfig) $
       gmLog GmDebug "" $ strDoc $ "setup configuration is out of date"
@@ -204,11 +191,13 @@ withCabal action = do
 
     when ( isSetupConfigOutOfDate mCabalFile mCabalConfig
         || pkgDbStackOutOfSync
-        || isSetupConfigOutOfDate mCabalSandboxConfig mCabalConfig) $
+        || isSetupConfigOutOfDate mCabalSandboxConfig mCabalConfig) $ do
+          proj <- cradleProject <$> cradle
+          opts <- options
           case proj of
             CabalProject -> do
                 gmLog GmDebug "" $ strDoc "reconfiguring Cabal project"
-                cabalReconfigure readProc (optPrograms opts) crdl
+                cabalReconfigure (optPrograms opts) crdl
             StackProject {} -> do
                 gmLog GmDebug "" $ strDoc "reconfiguring Stack project"
                 stackReconfigure crdl (optPrograms opts)
@@ -218,7 +207,8 @@ withCabal action = do
     action
 
  where
-   cabalReconfigure readProc progs crdl = do
+   cabalReconfigure progs crdl = do
+     readProc <- gmReadProcess
      withDirectory_ (cradleRootDir crdl) $ do
         cusPkgStack <- maybe [] ((PackageDb "clear"):) <$> getCustomPkgDbStack
         let progOpts =
diff --git a/Language/Haskell/GhcMod/CustomPackageDb.hs b/Language/Haskell/GhcMod/CustomPackageDb.hs
index ce548eb..4b81e00 100644
--- a/Language/Haskell/GhcMod/CustomPackageDb.hs
+++ b/Language/Haskell/GhcMod/CustomPackageDb.hs
@@ -19,7 +19,7 @@ parseCustomPackageDb src = map parsePkgDb $ filter (not . null) $ lines src
    parsePkgDb "user" = UserDb
    parsePkgDb s = PackageDb s
 
-getCustomPkgDbStack :: (IOish m, GmEnv m) => m (Maybe [GhcPkgDb])
+getCustomPkgDbStack :: (MonadIO m, GmEnv m) => m (Maybe [GhcPkgDb])
 getCustomPkgDbStack = do
     mCusPkgDbFile <- liftIO . (traverse readFile <=< findCustomPackageDbFile) . cradleRootDir =<< cradle
     return $ parseCustomPackageDb <$> mCusPkgDbFile
diff --git a/Language/Haskell/GhcMod/Target.hs b/Language/Haskell/GhcMod/Target.hs
index 12f8b8a..431fc5d 100644
--- a/Language/Haskell/GhcMod/Target.hs
+++ b/Language/Haskell/GhcMod/Target.hs
@@ -489,7 +489,8 @@ needsFallback = any $ \ms ->
 
 cabalResolvedComponents :: (IOish m) =>
    GhcModT m (Map ChComponentName (GmComponent 'GMCResolved (Set ModulePath)))
-cabalResolvedComponents = withAutogen $ do
+cabalResolvedComponents = do
     crdl@(Cradle{..}) <- cradle
     comps <- mapM (resolveEntrypoint crdl) =<< getComponents
-    cached cradleRootDir (resolvedComponentsCache cradleDistDir) comps
+    withAutogen $
+      cached cradleRootDir (resolvedComponentsCache cradleDistDir) comps