From d660e7cd85dbf48063d97639b4ea28285b06895e Mon Sep 17 00:00:00 2001 From: scturtle Date: Tue, 18 Aug 2015 20:55:45 +0800 Subject: [PATCH] add 'StackProject' around --- Language/Haskell/GhcMod/CabalHelper.hs | 2 +- Language/Haskell/GhcMod/Debug.hs | 1 + src/GHCMod.hs | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Language/Haskell/GhcMod/CabalHelper.hs b/Language/Haskell/GhcMod/CabalHelper.hs index 478b9e8..d269bb4 100644 --- a/Language/Haskell/GhcMod/CabalHelper.hs +++ b/Language/Haskell/GhcMod/CabalHelper.hs @@ -119,7 +119,7 @@ prepareCabalHelper = do let projdir = cradleRootDir crdl distdir = projdir cradleDistDir crdl readProc <- gmReadProcess - when (cradleProjectType crdl == CabalProject) $ + when (cradleProjectType crdl == CabalProject || cradleProjectType crdl == StackProject) $ withCabal $ liftIO $ prepare readProc projdir distdir parseCustomPackageDb :: String -> [GhcPkgDb] diff --git a/Language/Haskell/GhcMod/Debug.hs b/Language/Haskell/GhcMod/Debug.hs index 54e85d2..2441ec9 100644 --- a/Language/Haskell/GhcMod/Debug.hs +++ b/Language/Haskell/GhcMod/Debug.hs @@ -27,6 +27,7 @@ debugInfo = do cabal <- case cradleProjectType of CabalProject -> cabalDebug + StackProject -> cabalDebug _ -> return [] pkgOpts <- packageGhcOptions diff --git a/src/GHCMod.hs b/src/GHCMod.hs index 8bb8934..0b97096 100644 --- a/src/GHCMod.hs +++ b/src/GHCMod.hs @@ -669,9 +669,10 @@ nukeCaches = do chdir <- liftIO $ ( "cabal-helper") <$> getAppUserDataDirectory "ghc-mod" c <- cradle - when (cradleProjectType c == CabalProject) $ do + when (cradleProjectType c == CabalProject || cradleProjectType c == StackProject) $ do let root = cradleRootDir c - liftIO $ (trySome . removeDirectoryRecursive) `mapM_` [chdir, root "dist"] + let dist = cradleDistDir c + liftIO $ (trySome . removeDirectoryRecursive) `mapM_` [chdir, root dist] trySome :: IO a -> IO (Either SomeException a) trySome = try